[Thunar-workers] CVS: design/ui ChangeLog, 1.31, 1.32 ThunarWindow.py, 1.21, 1.22 thunar.ui, 1.10, 1.11

[Benedikt Meurer]

Update of /var/cvs/thunar/design/ui
In directory espresso.foo-projects.org:/tmp/cvs-serv23929

Modified Files:
	ChangeLog ThunarWindow.py thunar.ui 
Log Message:
2005-03-20	Benedikt Meurer <benny at xfce.org>

	* thunar.ui, ThunarWindow.py: Support various different layouts, with
	  two major layouts.
	* thunar.ui: Ditch the Tree/Shortcuts button from the default toolbar
	  as suggested by Jens.




Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ChangeLog	20 Mar 2005 01:18:56 -0000	1.31
+++ ChangeLog	20 Mar 2005 17:10:19 -0000	1.32
@@ -1,5 +1,12 @@
 2005-03-20	Benedikt Meurer <benny at xfce.org>
 
+	* thunar.ui, ThunarWindow.py: Support various different layouts, with
+	  two major layouts.
+	* thunar.ui: Ditch the Tree/Shortcuts button from the default toolbar
+	  as suggested by Jens.
+
+2005-03-20	Benedikt Meurer <benny at xfce.org>
+
 	* thunar.ui, ThunarWindow.py, ThunarLocationBar.py: Show either the
 	  path bar or the location bar in the UI (obsoletes the old non
 	  GtkFileChooser way). This should make the location bar addicts

Index: ThunarWindow.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarWindow.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ThunarWindow.py	20 Mar 2005 01:18:56 -0000	1.21
+++ ThunarWindow.py	20 Mar 2005 17:10:19 -0000	1.22
@@ -89,6 +89,7 @@
         self.action_group.add_actions([
             ('view-menu', None, '_View'),
             ('view-sidebar-menu', None, '_Sidebar'),
+            ('view-locationbar-menu', None, '_Locationbar'),
             ('reload', gtk.STOCK_REFRESH, '_Reload', '<Control>R', None, lambda ign, self: self._internal_open_dir(self.info)),
         ], self)
         self.action_group.add_radio_actions([
@@ -104,9 +105,10 @@
             ('view-as-list', None, 'View as _List'),
         ], 1, lambda action, whatever, self: self._action_view_toggled(), self)
         self.action_group.add_radio_actions([
-            ('view-pathbar', None, 'Path Bar', None, None, 1),
-            ('view-locationbar', None, 'Location Bar'),
-        ], 1, lambda action, whatever, self: self._action_bar_toggled(), self)
+            ('locationbar-pathbuttons', None, 'Path Buttons', None, None, 1),
+            ('locationbar-entry', None, 'Entry Widget'),
+            ('locationbar-hidden', None, 'Hidden'),
+        ], 1, lambda action, whatever, self: self._action_locationbar_toggled(), self)
         self.action_group.add_actions([
             ('go-menu', None, '_Go'),
             ('go-up', gtk.STOCK_GO_UP, '_Up', '<Alt>Up', None, lambda ign, self: self._action_open_dir(self.info.get_parent())),
@@ -178,8 +180,8 @@
         self.main_hbox.pack2(self.view_vbox, True, False)
         self.view_vbox.show()
 
-        # add the path bar
-        self._action_bar_toggled()
+        # add the location bar
+        self._action_locationbar_toggled()
 
         self.swin = gtk.ScrolledWindow(None, None)
         self.swin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
@@ -309,15 +311,18 @@
         self.view.show()
 
 
-    def _action_bar_toggled(self):
+    def _action_locationbar_toggled(self):
         try:
             if self.pathbar: self.pathbar.destroy()
         except:
             pass
-        if self.action_group.get_action('view-pathbar').get_active():
+        if self.action_group.get_action('locationbar-pathbuttons').get_active():
             self.pathbar = ThunarPathBar()
-        else:
+        elif self.action_group.get_action('locationbar-entry').get_active():
             self.pathbar = ThunarLocationBar()
+        else:
+            self.pathbar = None
+            return
         self.pathbar.set_info(self.info)
         self.pathbar.connect('directory-changed', lambda history, info: self._action_open_dir(info))
         self.view_vbox.pack_start(self.pathbar, False, False, 0)
@@ -395,7 +400,8 @@
         self.sidepane.select_by_info(info)
         self.sidepane.handler_unblock(self.sidepane_selection_id)
 
-        self.pathbar.set_info(info)
+        if self.pathbar:
+            self.pathbar.set_info(info)
 
         # scroll to (0,0)
         self.swin.get_hadjustment().set_value(0)
@@ -457,7 +463,7 @@
 
 
     def _action_open_location_other(self):
-        if self.pathbar.__class__ == ThunarLocationBar:
+        if self.pathbar and self.pathbar.__class__ == ThunarLocationBar:
             self.pathbar.focus()
             return
 

Index: thunar.ui
===================================================================
RCS file: /var/cvs/thunar/design/ui/thunar.ui,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- thunar.ui	20 Mar 2005 01:18:56 -0000	1.10
+++ thunar.ui	20 Mar 2005 17:10:19 -0000	1.11
@@ -63,11 +63,15 @@
         <menuitem action="sidebar-disabled" />
       </menu>
 
+      <menu action="view-locationbar-menu">
+        <menuitem action="locationbar-pathbuttons" />
+        <menuitem action="locationbar-entry" />
+        <menuitem action="locationbar-hidden" />
+      </menu>
+
       <separator />
 
       <menuitem action="view-toolbars" />
-      <menuitem action="view-pathbar" />
-      <menuitem action="view-locationbar" />
 
       <separator />
 
@@ -103,8 +107,10 @@
     <toolitem action="go-forward" />
     <separator />
     <toolitem action="reload" />
+    <!--
     <separator />
     <toolitem action="sidebar-tree" />
     <toolitem action="sidebar-shortcuts" />
+    -->
   </toolbar>
 </ui>