From ad7e1cc4bccc19de569a39818658fecfca945a5a Mon Sep 17 00:00:00 2001
From: Martijn Voncken <mvoncken@gmail.com>
Date: Mon, 25 Aug 2008 21:49:38 +0000
Subject: [PATCH] label-plugin:remove obsolete prefs

---
 .../plugins/label/label/data/label_pref.glade | 165 +-----------------
 .../plugins/label/label/gtkui/label_config.py |  14 +-
 .../plugins/label/label/gtkui/sidebar_menu.py |   9 -
 3 files changed, 7 insertions(+), 181 deletions(-)

diff --git a/deluge/plugins/label/label/data/label_pref.glade b/deluge/plugins/label/label/data/label_pref.glade
index 60ece9255..a25c613a5 100644
--- a/deluge/plugins/label/label/data/label_pref.glade
+++ b/deluge/plugins/label/label/data/label_pref.glade
@@ -1,172 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Aug  4 01:52:50 2008 -->
+<!--Generated with glade3 3.4.5 on Mon Aug 25 23:44:30 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="window1">
     <child>
       <widget class="GtkVBox" id="label_prefs_box">
         <property name="visible">True</property>
         <property name="spacing">5</property>
-        <child>
-          <widget class="GtkFrame" id="frame1">
-            <property name="visible">True</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_NONE</property>
-            <child>
-              <widget class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <widget class="GtkVBox" id="vbox2">
-                    <property name="visible">True</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox1">
-                        <property name="visible">True</property>
-                        <property name="spacing">5</property>
-                        <child>
-                          <widget class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="hide_zero_hits">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Hide zero hits</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="ypad">5</property>
-                <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkFrame" id="frame2">
-            <property name="visible">True</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">GTK_SHADOW_NONE</property>
-            <child>
-              <widget class="GtkAlignment" id="alignment2">
-                <property name="visible">True</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <widget class="GtkVBox" id="vbox1">
-                    <property name="visible">True</property>
-                    <property name="spacing">5</property>
-                    <child>
-                      <widget class="GtkHBox" id="hbox2">
-                        <property name="visible">True</property>
-                        <property name="spacing">5</property>
-                        <child>
-                          <widget class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkVBox" id="vbox3">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="show_states">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Show states</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="show_trackers">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Show trackers</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="show_labels">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="label" translatable="yes">Show labels</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </widget>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="ypad">5</property>
-                <property name="label" translatable="yes">&lt;b&gt;Sidebar&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </widget>
-              <packing>
-                <property name="type">label_item</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
         <child>
           <widget class="GtkFrame" id="frame3">
             <property name="visible">True</property>
@@ -197,9 +37,6 @@
               </packing>
             </child>
           </widget>
-          <packing>
-            <property name="position">2</property>
-          </packing>
         </child>
       </widget>
     </child>
diff --git a/deluge/plugins/label/label/gtkui/label_config.py b/deluge/plugins/label/label/gtkui/label_config.py
index 4f43909c8..c41b13a59 100644
--- a/deluge/plugins/label/label/gtkui/label_config.py
+++ b/deluge/plugins/label/label/gtkui/label_config.py
@@ -40,18 +40,16 @@ from deluge.log import LOG as log
 from deluge.ui.client import aclient
 
 
-
 class LabelConfig(object):
-    chk_ids = ["hide_zero_hits","show_labels","show_trackers","show_states"]
+    """
+    there used to be some options here...
+    """
 
     def __init__(self, plugin):
         self.plugin = plugin
-        self.labels = []
 
     def load(self):
-        #self.glade = gtk.glade.XML(self.get_resource("label_pref.glade"))
         log.debug('Adding Label Preferences page')
-
         self.glade = gtk.glade.XML(self.get_resource("label_pref.glade"))
 
 
@@ -74,13 +72,13 @@ class LabelConfig(object):
 
     def cb_global_options(self, options):
         log.debug("options=%s" % options)
+        """
         for id in self.chk_ids:
             self.glade.get_widget(id).set_active(bool(options[id]))
+        """
 
     def on_apply_prefs(self):
         options = {}
-        for id in self.chk_ids:
-            options[id] = self.glade.get_widget(id).get_active()
-
+        #update options dict here.
         aclient.label_set_global_options(None, options)
 
diff --git a/deluge/plugins/label/label/gtkui/sidebar_menu.py b/deluge/plugins/label/label/gtkui/sidebar_menu.py
index 0d6a2f789..1ba4b6898 100644
--- a/deluge/plugins/label/label/gtkui/sidebar_menu.py
+++ b/deluge/plugins/label/label/gtkui/sidebar_menu.py
@@ -40,15 +40,6 @@ import deluge.common
 from deluge.log import LOG as log
 from deluge.ui.client import aclient
 
-STATE_PIX = {
-    "Downloading":"downloading",
-    "Seeding":"seeding",
-    "Paused":"inactive",
-    "Checking":"checking",
-    "Queued":"queued",
-    "Error":"alert"
-    }
-
 NO_LABEL = "No Label"
 
 #helpers: