[Thunar-workers] CVS: design/ui ChangeLog, 1.29, 1.30 ThunarWindow.py, 1.19, 1.20 thunar.ui, 1.8, 1.9

[Benedikt Meurer]

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

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

	* ThunarWindow.py, thunar.ui: Add 'Trash' to the 'Go' menu.




Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog	19 Mar 2005 12:43:16 -0000	1.29
+++ ChangeLog	19 Mar 2005 13:52:40 -0000	1.30
@@ -1,5 +1,9 @@
 2005-03-19	Benedikt Meurer <benny at xfce.org>
 
+	* ThunarWindow.py, thunar.ui: Add 'Trash' to the 'Go' menu.
+
+2005-03-19	Benedikt Meurer <benny at xfce.org>
+
 	* ThunarWindow.py: Improve the location bar. Looks pretty similar to
 	  Firefox now.
 

Index: ThunarWindow.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarWindow.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ThunarWindow.py	19 Mar 2005 12:43:16 -0000	1.19
+++ ThunarWindow.py	19 Mar 2005 13:52:40 -0000	1.20
@@ -55,6 +55,15 @@
         factory.add('thunar-shortcuts', set)
         factory.add_default()
 
+        try:
+            theme = gtk.icon_theme_get_default()
+            set = gtk.IconSet(theme.load_icon('gnome-fs-trash-empty', 16, 0))
+        except:
+            set = gtk.IconSet()
+        factory = gtk.IconFactory()
+        factory.add('thunar-trash', set)
+        factory.add_default()
+
         self.bookmarks = []
 
         self.info = info
@@ -100,6 +109,7 @@
             ('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-trash', 'thunar-trash', '_Trash', None, None),
         ], self)
         self.action_group.add_actions([
             ('bookmarks-menu', None, '_Bookmarks'),
@@ -123,6 +133,7 @@
         self.action_group.get_action('preferences').set_property('sensitive', False)
         self.action_group.get_action('go-back').set_property('sensitive', False)
         self.action_group.get_action('go-forward').set_property('sensitive', False)
+        self.action_group.get_action('go-trash').set_property('sensitive', False)
         self.action_group.get_action('contents').set_property('sensitive', False)
         self.action_group.get_action('report-bug').set_property('sensitive', False)
         self.action_group.get_action('about').set_property('sensitive', False)
@@ -231,17 +242,18 @@
             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()
+            if True:
+                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()
+                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)
@@ -263,7 +275,7 @@
             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_image = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_MENU)
             close_button.add(close_image)
             close_image.show()
 

Index: thunar.ui
===================================================================
RCS file: /var/cvs/thunar/design/ui/thunar.ui,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- thunar.ui	19 Mar 2005 09:57:36 -0000	1.8
+++ thunar.ui	19 Mar 2005 13:52:40 -0000	1.9
@@ -80,6 +80,7 @@
       <menuitem action="go-forward" />
       <separator />
       <menuitem action="go-home" />
+      <menuitem action="go-trash" />
     </menu>
 
     <!--