[Thunar-workers] CVS: design/ui ChangeLog, 1.27, 1.28 ThunarWindow.py, 1.17, 1.18 thunar.ui, 1.7, 1.8

[Benedikt Meurer]

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

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

	* thunar.ui, ThunarWindow.py: Rename 'Location...' to 'Open Location'
	  and move it to the 'File' menu.
	* ThunarWindow.py: Use different location bar style.



Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- ChangeLog	19 Mar 2005 00:03:08 -0000	1.27
+++ ChangeLog	19 Mar 2005 09:57:36 -0000	1.28
@@ -1,5 +1,11 @@
 2005-03-19	Benedikt Meurer <benny at xfce.org>
 
+	* thunar.ui, ThunarWindow.py: Rename 'Location...' to 'Open Location'
+	  and move it to the 'File' menu.
+	* ThunarWindow.py: Use different location bar style.
+
+2005-03-19	Benedikt Meurer <benny at xfce.org>
+
 	* ThunarBookmarksPane.py: Use 'Home' as well to be consistent with the
 	  path bar and the GtkFileChooser.
 

Index: ThunarWindow.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarWindow.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ThunarWindow.py	18 Mar 2005 19:06:29 -0000	1.17
+++ ThunarWindow.py	19 Mar 2005 09:57:36 -0000	1.18
@@ -62,6 +62,7 @@
         self.action_group = gtk.ActionGroup('thunar-window')
         self.action_group.add_actions([
             ('file-menu', None, '_File'),
+            ('open-location', None, 'Open _Location', '<Control>L', None, lambda ign, self: self._action_open_location()),
             ('get-info', gtk.STOCK_PROPERTIES, 'Get _Info...', '<Alt>Return', None, lambda ign, self: self._action_get_info()),
             ('close-window', gtk.STOCK_CLOSE, '_Close', '<Control>W', None, lambda ign, self: self.destroy()),
         ], self)
@@ -99,7 +100,6 @@
             ('go-back', gtk.STOCK_GO_BACK, '_Back', '<Alt>Left', None, lambda ign, self: self._action_go_back()),
             ('go-forward', gtk.STOCK_GO_FORWARD, '_Forward', '<Alt>Right', None, lambda ign, self: self._action_go_forward()),
             ('go-home', gtk.STOCK_HOME, '_Home Folder', None, None, lambda ign, self: self._action_open_dir(ThunarFileInfo(os.getenv('HOME')))),
-            ('go-location', None, '_Location...', '<Control>L', None, lambda ign, self: self._action_open_location()),
         ], self)
         self.action_group.add_actions([
             ('bookmarks-menu', None, '_Bookmarks'),
@@ -190,15 +190,30 @@
         self.view.grab_focus()
         self.view.show()
 
-        self.location_bar = gtk.HBox(False, 6)
-        vbox.pack_start(self.location_bar, False, False, 0)
-        self.location_bar.hide()
+        if False:
+            self.location_bar = gtk.Frame()
+            self.location_bar.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+            vbox.pack_start(self.location_bar, False, False, 0)
+            self.location_bar.hide()
+        else:
+            self.location_bar = gtk.VBox(False, 0)
+            self.main_vbox.pack_start(self.location_bar, False, False, 0)
+            self.location_bar.hide()
+
+            separator = gtk.HSeparator()
+            self.location_bar.pack_start(separator, False, False, 0)
+            separator.show()
+
+        lbox = gtk.HBox(False, 6)
+        lbox.set_border_width(0)
+        self.location_bar.add(lbox)
+        lbox.show()
 
         button = gtk.Button()
         button.set_relief(gtk.RELIEF_NONE)
         button.set_border_width(0)
         button.set_focus_on_click(False)
-        self.location_bar.pack_start(button, False, False, 0)
+        lbox.pack_start(button, False, False, 0)
         button.show()
 
         bbox = gtk.HBox(False, 0)
@@ -219,9 +234,21 @@
         self.location_entry.connect('focus-out-event', lambda entry, event: self._location_bar_focus_out())
         self.location_entry.connect('key-press-event', lambda entry, event: self._location_bar_key_press(event))
         self.location_entry.connect('activate', lambda entry: self._location_bar_activate())
-        self.location_bar.pack_start(self.location_entry, True, True, 0)
+        lbox.pack_start(self.location_entry, True, True, 0)
         self.location_entry.show()
 
+        close_button = gtk.Button()
+        close_button.set_relief(gtk.RELIEF_NONE)
+        close_button.set_border_width(0)
+        close_button.set_focus_on_click(False)
+        close_button.connect('clicked', lambda btn: self._location_bar_focus_out()) 
+        lbox.pack_start(close_button, False, False, 0)
+        close_button.show()
+
+        close_image = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_BUTTON)
+        close_button.add(close_image)
+        close_image.show()
+
         self.status_bar = gtk.Statusbar()
         self.status_id = self.status_bar.get_context_id('Selection state')
         self.main_vbox.pack_start(self.status_bar, False, False, 0)

Index: thunar.ui
===================================================================
RCS file: /var/cvs/thunar/design/ui/thunar.ui,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- thunar.ui	6 Mar 2005 18:12:50 -0000	1.7
+++ thunar.ui	19 Mar 2005 09:57:36 -0000	1.8
@@ -26,6 +26,8 @@
 <ui>
   <menubar name="main-menu">
     <menu action="file-menu">
+      <menuitem action="open-location" />
+      <separator />
       <menuitem action="get-info" />
       <separator />
       <menuitem action="close-window" />
@@ -78,7 +80,6 @@
       <menuitem action="go-forward" />
       <separator />
       <menuitem action="go-home" />
-      <menuitem action="go-location" />
     </menu>
 
     <!--