remove system tray lefovers

diff --git a/gui.py b/gui.py
index f871970464cfbca3255013926f4cfefc40c5d67f..9b555e1c3cbd9e67b8da478301c1a69ff661902c 100644 (file)
--- a/gui.py
+++ b/gui.py
@@ -61,23 +61,18 @@ class Factory(GObject.GObject):
             self.use_custom_widgets = self.gconf_client.get_bool(
                             '/apps/jack_mixer/use_custom_widgets')
 
-            self.minimize_to_tray = self.gconf_client.get_bool(
-                            '/apps/jack_mixer/minimize_to_tray')
-
             self.gconf_client.add_dir("/apps/jack_mixer", GConf.ClientPreloadType.PRELOAD_NONE)
             self.gconf_client.notify_add("/apps/jack_mixer/default_meter_scale", self.on_gconf_default_meter_scale_changed)
             self.gconf_client.notify_add("/apps/jack_mixer/default_slider_scale", self.on_gconf_default_slider_scale_changed)
             self.gconf_client.notify_add('/apps/jack_mixer/vumeter_color', self.on_gconf_vumeter_color_change)
             self.gconf_client.notify_add('/apps/jack_mixer/vumeter_color_scheme', self.on_gconf_vumeter_color_scheme_change)
             self.gconf_client.notify_add('/apps/jack_mixer/use_custom_widgets', self.on_gconf_use_custom_widgets_change)
-            self.gconf_client.notify_add('/apps/jack_mixer/minimize_to_tray', self.on_gconf_minimize_to_tray_change)
         else:
             self.default_meter_scale = meter_scales[0]
             self.default_slider_scale = slider_scales[0]
             self.vumeter_color = '#ccb300'
             self.vumeter_color_scheme = 'default'
             self.use_custom_widgets = False
-            self.minimize_to_tray = True
 
     def on_gconf_default_meter_scale_changed(self, client, connection_id, entry):
         #print "GConf default_meter_scale changed"
@@ -144,17 +139,6 @@ class Factory(GObject.GObject):
         use_custom = entry.get_value().get_bool()
         self.set_use_custom_widgets(use_custom, from_gconf=True)
 
-    def set_minimize_to_tray(self, minimize_to_tray, from_gconf=False):
-        if GConf and not from_gconf:
-            self.gconf_client.set_bool('/apps/jack_mixer/minimize_to_tray', minimize_to_tray)
-        else:
-            self.minimize_to_tray = minimize_to_tray
-            self.emit('minimize-to-tray-changed', self.minimize_to_tray)
-
-    def on_gconf_minimize_to_tray_change(self, client, connection_id, entry):
-        minimize_to_tray = entry.get_value().get_bool()
-        self.set_minimize_to_tray(minimize_to_tray, from_gconf=True)
-
     def get_default_meter_scale(self):
         return self.default_meter_scale
 
@@ -170,8 +154,6 @@ class Factory(GObject.GObject):
     def get_use_custom_widgets(self):
         return self.use_custom_widgets
 
-    def get_minimize_to_tray(self):
-        return self.minimize_to_tray
 
 GObject.signal_new("default-meter-scale-changed", Factory,
                 GObject.SignalFlags.RUN_FIRST | GObject.SignalFlags.ACTION,
@@ -188,6 +170,3 @@ GObject.signal_new('vumeter-color-scheme-changed', Factory,
 GObject.signal_new('use-custom-widgets-changed', Factory,
                 GObject.SignalFlags.RUN_FIRST | GObject.SignalFlags.ACTION,
                 None, [bool])
-GObject.signal_new('minimize-to-tray-changed', Factory,
-                GObject.SignalFlags.RUN_FIRST | GObject.SignalFlags.ACTION,
-                None, [bool])

diff --git a/jack_mixer.py b/jack_mixer.py
index 3842b872ec2c8735a16a791f592749c2293ee66c..c435b3256d1dc654d4c354d8031cfb3c129693ba 100755 (executable)
--- a/jack_mixer.py
+++ b/jack_mixer.py
@@ -213,15 +213,8 @@ class JackMixer(SerializedObject):
 
         GLib.timeout_add(50, self.midi_events_check)
 
-
     def on_delete_event(self, widget, event):
-       if self.gui_factory.get_minimize_to_tray():
-            self.window.hide()
-            return True
-       else:
-           self.on_quit_cb()
-           return False
-
+        return False
 
     def sighandler(self, signum, frame):
         #print "Signal %d received" % signum

diff --git a/jack_mixer.schemas b/jack_mixer.schemas
index 5235214693df511a49bf6536a09eb0f154ae4545..30ea38d38b2f0f1bb55a6e49e0104ae9a756af7c 100644 (file)
--- a/jack_mixer.schemas
+++ b/jack_mixer.schemas
@@ -63,16 +63,5 @@
         <long>Whether to use custom widgets for the slider and balance.</long>
       </locale>
     </schema>
-    <schema>
-      <key>/schemas/apps/jack_mixer/minimize_to_tray</key>
-      <applyto>/apps/jack_mixer/minimize_to_tray</applyto>
-      <owner>jack_mixer</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Minimize to tray</short>
-        <long>Minimize main window to tray instead of closing the whole app.</long>
-      </locale>
-    </schema>
   </schemalist>
 </gconfschemafile>

diff --git a/preferences.py b/preferences.py
index 40d1d9fd288eeac47f40e5c47f561634b2d0763a..67c040b90d2f33d7d15629285f4905b8f5041aee 100644 (file)
--- a/preferences.py
+++ b/preferences.py
@@ -84,12 +84,6 @@ class PreferencesDialog(Gtk.Dialog):
                         self.on_vumeter_color_change)
         hbox.pack_start(self.vumeter_color_picker, True, True, 0)
 
-        self.minimize_to_tray_checkbutton = Gtk.CheckButton('Minimize to system tray')
-        self.minimize_to_tray_checkbutton.set_active(
-                        self.app.gui_factory.get_minimize_to_tray() )
-        self.minimize_to_tray_checkbutton.connect('toggled', self.on_minimize_to_tray_toggled)
-        interface_vbox.pack_start(self.minimize_to_tray_checkbutton, True, True, 0)
-
         vbox.pack_start(self.create_frame('Interface', interface_vbox), True, True, 0)
 
         table = Gtk.Table(2, 2, False)
@@ -177,7 +171,3 @@ class PreferencesDialog(Gtk.Dialog):
     def on_custom_widget_toggled(self, *args):
         self.app.gui_factory.set_use_custom_widgets(
                         self.custom_widgets_checkbutton.get_active())
-
-    def on_minimize_to_tray_toggled(self, *args):
-        self.app.gui_factory.set_minimize_to_tray(
-                        self.minimize_to_tray_checkbutton.get_active())