[Thunar-workers] CVS: design/ui ChangeLog, 1.28, 1.29 ThunarWindow.py, 1.18, 1.19

[Benedikt Meurer]

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

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

	* ThunarWindow.py: Improve the location bar. Looks pretty similar to
	  Firefox now.




Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog	19 Mar 2005 09:57:36 -0000	1.28
+++ ChangeLog	19 Mar 2005 12:43:16 -0000	1.29
@@ -1,5 +1,10 @@
 2005-03-19	Benedikt Meurer <benny at xfce.org>
 
+	* ThunarWindow.py: Improve the location bar. Looks pretty similar to
+	  Firefox now.
+
+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: ThunarWindow.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarWindow.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ThunarWindow.py	19 Mar 2005 09:57:36 -0000	1.18
+++ ThunarWindow.py	19 Mar 2005 12:43:16 -0000	1.19
@@ -190,7 +190,7 @@
         self.view.grab_focus()
         self.view.show()
 
-        if False:
+        if True:
             self.location_bar = gtk.Frame()
             self.location_bar.set_shadow_type(gtk.SHADOW_ETCHED_IN)
             vbox.pack_start(self.location_bar, False, False, 0)
@@ -205,49 +205,67 @@
             separator.show()
 
         lbox = gtk.HBox(False, 6)
-        lbox.set_border_width(0)
+        lbox.set_border_width(2)
         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)
-        lbox.pack_start(button, False, False, 0)
-        button.show()
+        if False:
+            button = gtk.Button()
+            button.set_relief(gtk.RELIEF_NONE)
+            button.set_border_width(0)
+            button.set_focus_on_click(False)
+            button.connect('clicked', lambda btn: self._location_bar_activate())
+            lbox.pack_start(button, False, False, 0)
+            button.show()
 
-        bbox = gtk.HBox(False, 0)
-        bbox.set_border_width(0)
-        button.add(bbox)
-        bbox.show()
+            bbox = gtk.HBox(False, 0)
+            bbox.set_border_width(0)
+            button.add(bbox)
+            bbox.show()
 
-        image = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_BUTTON)
-        bbox.pack_start(image, False, False, 2)
-        image.show()
+            image = gtk.image_new_from_stock(gtk.STOCK_JUMP_TO, gtk.ICON_SIZE_BUTTON)
+            bbox.pack_start(image, False, False, 2)
+            image.show()
 
-        label = gtk.Label('Go')
-        bbox.pack_start(label, False, False, 2)
-        label.show()
+            label = gtk.Label('Go')
+            bbox.pack_start(label, False, False, 2)
+            label.show()
+        else:
+            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_MENU)
+            close_button.add(close_image)
+            close_image.show()
+
+            label = gtk.Label('Location:')
+            lbox.pack_start(label, False, False, 0)
+            label.show()
 
         self.location_entry = gtk.Entry()
-        button.connect('clicked', lambda btn: self.location_entry.activate())
         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())
         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()
+        if False:
+            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()
+            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')