meld r1124 - in trunk: . glade2

[kaiw svn gnome org]

Author: kaiw
Date: Thu Jan  8 23:16:51 2009
New Revision: 1124
URL: http://svn.gnome.org/viewvc/meld?rev=1124&view=rev

Log:
Remove preferences list-based navigation in favour of normal tabs

Modified:
   trunk/glade2/meldapp.glade
   trunk/meldapp.py

Modified: trunk/glade2/meldapp.glade
==============================================================================
--- trunk/glade2/meldapp.glade	(original)
+++ trunk/glade2/meldapp.glade	Thu Jan  8 23:16:51 2009
@@ -570,34 +570,6 @@
       <widget class="GtkVBox" id="dialog-vbox4">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkHBox" id="hbox8">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-            <child>
-              <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                <property name="width_request">150</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="has_default">True</property>
-                <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
-                <child>
-                  <widget class="GtkTreeView" id="treeview">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
-                    <property name="has_default">True</property>
-                    <property name="headers_visible">False</property>
-                    <signal name="cursor_changed" handler="on_treeview_cursor_changed"/>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="padding">5</property>
-              </packing>
-            </child>
-            <child>
               <widget class="GtkNotebook" id="notebook">
                 <property name="visible">True</property>
                 <property name="show_border">False</property>
@@ -1515,12 +1487,6 @@
                   </packing>
                 </child>
               </widget>
-              <packing>
-                <property name="padding">6</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
           <packing>
             <property name="padding">5</property>
             <property name="position">1</property>

Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py	(original)
+++ trunk/meldapp.py	Thu Jan  8 23:16:51 2009
@@ -207,19 +207,6 @@
     def __init__(self, parentapp):
         gnomeglade.Component.__init__(self, paths.share_dir("glade2/meldapp.glade"), "preferencesdialog")
         self.widget.set_transient_for(parentapp.widget)
-        self.notebook.set_show_tabs(0)
-        # tab selector
-        self.model = gtk.ListStore(type(""))
-        column = gtk.TreeViewColumn()
-        rentext = gtk.CellRendererText()
-        column.pack_start(rentext, expand=0)
-        column.set_attributes(rentext, text=0)
-        self.treeview.append_column(column)
-        self.treeview.set_model(self.model)
-        for c in self.notebook.get_children():
-            label = self.notebook.get_tab_label(c).get_text()
-            if not label.startswith("_"):
-                self.model.append( (label,) )
         self.prefs = parentapp.prefs
         # editor
         self.map_widgets_into_lists( ["editor_command"] )
@@ -254,13 +241,6 @@
         self.checkbutton_ignore_blank_lines.set_active( self.prefs.ignore_blank_lines )
         # encoding
         self.entry_text_codecs.set_text( self.prefs.text_codecs )
-        self.treeview.set_cursor(0)
-    #
-    # treeview
-    #
-    def on_treeview_cursor_changed(self, tree):
-        path, column = tree.get_cursor()
-        self.notebook.set_current_page(path[0])
     #
     # editor
     #