Revert unfinished features

README.md

@@ -74,11 +74,11 @@ Then follow instructions from above, as if installing package from repos.
 
    **On Ubuntu:**
 
-        sudo apt-get install gnome-common intltool valac libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libgnome-desktop-3-dev libcanberra-dev libdbus-glib-1-dev libgstreamer1.0-dev fonts-droid libsqlite3-dev libgom-dev
+        sudo apt-get install gnome-common intltool valac libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libgnome-desktop-3-dev libcanberra-dev libdbus-glib-1-dev libgstreamer1.0-dev fonts-droid
 
    **On Fedora:**
 
-        sudo dnf install gnome-common intltool vala vala-tools glib2-devel gobject-introspection-devel gtk3-devel gnome-desktop3-devel libcanberra-devel dbus-glib-devel gstreamer1-devel google-droid-sans-fonts sqlite-devel gom-devel
+        sudo dnf install gnome-common intltool vala vala-tools glib2-devel gobject-introspection-devel gtk3-devel gnome-desktop3-devel libcanberra-devel dbus-glib-devel gstreamer1-devel google-droid-sans-fonts
 
 3. Build it and install
 

configure.ac

@@ -42,7 +42,6 @@ AC_ARG_ENABLE([more-warnings],
 GLIB_REQUIRED=2.36.0
 GTK_REQUIRED=3.13.0
 GNOME_REQUIRED=3.13.0
-GOM_REQUIRED=0.2
 TELEPATHY_GLIB_REQUIRED=0.17.5
 
 PKG_CHECK_MODULES(GNOME_POMODORO, [
@@ -55,8 +54,6 @@ PKG_CHECK_MODULES(GNOME_POMODORO, [
     gsettings-desktop-schemas >= $GTK_REQUIRED
     gnome-desktop-3.0 >= $GNOME_REQUIRED
     dbus-glib-1
-    gom-1.0 >= $GOM_REQUIRED
-    sqlite3
     libcanberra >= 0.30
     gstreamer-1.0 >= 1.0.10
     telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
@@ -141,7 +138,6 @@ AC_SUBST(WARNING_CFLAGS)
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
 AC_SUBST(GNOME_REQUIRED)
-AC_SUBST(GOM_REQUIRED)
 AC_SUBST(TELEPATHY_GLIB_REQUIRED)
 
 

data/gnome-pomodoro.gresource.xml

@@ -2,8 +2,6 @@
 <gresources>
   <gresource prefix="/org/gnome/pomodoro">
     <file alias="menu.ui" preprocess="xml-stripblanks">resources/menu.ui</file>
-    <file alias="bookmark-add-symbolic.svg">resources/bookmark-add-symbolic.svg</file>
-    <file alias="bookmark-symbolic.svg">resources/bookmark-symbolic.svg</file>
     <file alias="gtk-style.css">resources/gtk-style.css</file>
   </gresource>
 </gresources>

data/resources/menu.ui

@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 <interface>
   <menu id="app-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Manage Tasks</attribute>
-        <attribute name="action">app.main-window</attribute>
-      </item>
-    </section>
     <section>
       <item>
         <attribute name="label" translatable="yes">_Preferences</attribute>
@@ -25,26 +19,4 @@
       </item>
     </section>
   </menu>
-  <menu id="window-menu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Find</attribute>
-        <attribute name="action">win.find</attribute>
-        <attribute name="accel"><![CDATA[<Primary>F]]></attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="selection-menu">
-    <section>
-      <item>
-        <attribute name="action">win.select-all</attribute>
-        <attribute name="label" translatable="yes">Select All</attribute>
-        <attribute name="accel"><![CDATA[<Primary>A]]></attribute>
-      </item>
-      <item>
-        <attribute name="action">win.select-none</attribute>
-        <attribute name="label" translatable="yes">Select None</attribute>
-      </item>
-    </section>
-  </menu>
 </interface>

extension/Makefile.am

@@ -10,7 +10,6 @@ dist_extension_DATA = \
     presence.js \
     settings.js \
     stylesheet.css \
-    tasklist.js \
     timer.js \
     utils.js
 

extension/dbus.js

@@ -34,9 +34,6 @@ const PomodoroInterface = '<node> \
         <arg type="s" name="state" direction="in" /> \
         <arg type="d" name="duration" direction="in" /> \
     </method> \
-    <method name="ShowMainWindow"> \
-        <arg type="u" name="timestamp" direction="in" /> \
-    </method> \
     <method name="ShowPreferences"> \
         <arg type="s" name="view" direction="in" /> \
         <arg type="u" name="timestamp" direction="in" /> \

extension/indicator.js

@@ -42,7 +42,6 @@ const Tweener = imports.ui.tweener;
 const DBus = Extension.imports.dbus;
 const Config = Extension.imports.config;
 const Settings = Extension.imports.settings;
-const Tasklist = Extension.imports.tasklist;
 const Timer = Extension.imports.timer;
 
 const Gettext = imports.gettext.domain(Config.GETTEXT_PACKAGE);
@@ -86,23 +85,8 @@ const IndicatorMenu = new Lang.Class({
             }));
         this.addMenuItem(this._timerToggle);
 
-        /* Task list */
-        // this.entry = new Tasklist.TaskEntry();
-        // this.entry.connect('task-entered', Lang.bind(this, this._onTaskEntered));
-
-        /* TODO: Lock focus on the entry once active */
-        /* TODO: Add history manager, just as in runDialog */
-        /* TODO: More items could be added to context menu */
-
-        // this.tasklist = new Tasklist.TaskList();
-        // this.tasklist.connect('task-selected', Lang.bind(this, this._onTaskSelected));
-
         this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        this.addAction(_("Manage Tasks"), Lang.bind(this, this._showMainWindow));
         this.addAction(_("Preferences"), Lang.bind(this, this._showPreferences));
-        // this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-        // this.addMenuItem(this.tasklist);
-        // this.addMenuItem(this.entry);
 
         this.connect('destroy', Lang.bind(this,
             function() {
@@ -121,27 +105,11 @@ const IndicatorMenu = new Lang.Class({
         return this.indicator.timer.getState() != Timer.State.NULL;
     },
 
-    _showMainWindow: function() {
-        let timestamp = global.get_current_time();
-
-        this.indicator.timer.showMainWindow(timestamp);
-    },
-
     _showPreferences: function() {
         let view = 'timer';
         let timestamp = global.get_current_time();
 
         this.indicator.timer.showPreferences(view, timestamp);
-    },
-
-    _onTaskEntered: function(entry, text) {
-        this.tasklist.addTask(new Tasklist.Task(text), {
-            animate: true
-        });
-    },
-
-    _onTaskSelected: function(tasklist, task) {
-        global.log("Selected task: " + (task ? task.name : '-'));
     }
 });