[Thunar-workers] CVS: design/ui ChangeLog, 1.13, 1.14 ThunarIconView.py, 1.1, 1.2 ThunarListView.py, 1.2, 1.3 ThunarSidePane.py, 1.3, 1.4

Benedikt Meurer benny at xfce.org
Fri Mar 4 21:30:20 CET 2005


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

Modified Files:
	ChangeLog ThunarIconView.py ThunarListView.py 
	ThunarSidePane.py 
Log Message:
2005-03-04	Benedikt Meurer <benny at xfce.org>

	* ThunarSidePane.py: Use SHADOW_IN to be consistent with the main view.
	* ThunarListView.py, ThunarIconView.py: Get the GType handling right.




Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog	4 Mar 2005 19:14:17 -0000	1.13
+++ ChangeLog	4 Mar 2005 20:30:18 -0000	1.14
@@ -1,5 +1,10 @@
 2005-03-04	Benedikt Meurer <benny at xfce.org>
 
+	* ThunarSidePane.py: Use SHADOW_IN to be consistent with the main view.
+	* ThunarListView.py, ThunarIconView.py: Get the GType handling right.
+
+2005-03-04	Benedikt Meurer <benny at xfce.org>
+
 	* ThunarBookmarksPane.py: Do not include Desktop here, as its highly
 	  redundant and useless in the normal window view. Get the GType
 	  handling right.

Index: ThunarIconView.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarIconView.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ThunarIconView.py	27 Feb 2005 18:13:49 -0000	1.1
+++ ThunarIconView.py	4 Mar 2005 20:30:18 -0000	1.2
@@ -35,22 +35,11 @@
 from ThunarModel import ThunarModel
 from ThunarView import ThunarView
 
-signals_registered = False
-
 class ThunarIconView(exo.IconView, ThunarView):
     def __init__(self, dir_info):
         exo.IconView.__init__(self, ThunarModel(dir_info))
         ThunarView.__init__(self)
 
-        # register signals
-        global signals_registered
-        if not signals_registered:
-            gobject.signal_new('activated', self, gobject.SIGNAL_RUN_LAST, \
-                               gobject.TYPE_NONE, [ThunarFileInfo])
-            gobject.signal_new('context-menu', self, gobject.SIGNAL_RUN_LAST, \
-                               gobject.TYPE_NONE, [])
-            signals_registered = True
-
         self.set_text_column(ThunarModel.COLUMN_NAME)
         self.set_pixbuf_column(ThunarModel.COLUMN_ICONHUGE)
 
@@ -100,3 +89,12 @@
                     self.get_toplevel().destroy()
             return True
         return False
+
+
+
+gobject.type_register(ThunarIconView)
+gobject.signal_new('activated', ThunarIconView, gobject.SIGNAL_RUN_LAST, \
+                   gobject.TYPE_NONE, [ThunarFileInfo])
+gobject.signal_new('context-menu', ThunarIconView, gobject.SIGNAL_RUN_LAST, \
+                   gobject.TYPE_NONE, [])
+

Index: ThunarListView.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarListView.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ThunarListView.py	3 Mar 2005 19:11:22 -0000	1.2
+++ ThunarListView.py	4 Mar 2005 20:30:18 -0000	1.3
@@ -39,33 +39,11 @@
 except ImportError:
     exo_supported = False
 
-signals_registered = False
-
 class ThunarListView(gtk.TreeView, ThunarView):
     def __init__(self, dir_info):
         gtk.TreeView.__init__(self)
         ThunarView.__init__(self)
 
-        # register signals
-        global signals_registered
-        if not signals_registered:
-            try:
-                gobject.signal_new('activated', self, gobject.SIGNAL_RUN_LAST, \
-                                   gobject.TYPE_NONE, [ThunarFileInfo])
-            except:
-                pass
-            try:
-                gobject.signal_new('context-menu', self, gobject.SIGNAL_RUN_LAST, \
-                                   gobject.TYPE_NONE, [])
-            except:
-                pass
-            try:
-                gobject.signal_new('selection-changed', self, gobject.SIGNAL_RUN_LAST, \
-                                   gobject.TYPE_NONE, [])
-            except:
-                pass
-            signals_registered = True
-
         self.set_model(ThunarModel(dir_info))
 
         column = gtk.TreeViewColumn('Name')
@@ -168,3 +146,15 @@
                     self.get_toplevel().destroy()
             return True
         return False
+
+
+
+gobject.type_register(ThunarListView)
+gobject.signal_new('activated', ThunarListView, gobject.SIGNAL_RUN_LAST, \
+                   gobject.TYPE_NONE, [ThunarFileInfo])
+gobject.signal_new('context-menu', ThunarListView, \
+                   gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [])
+gobject.signal_new('selection-changed', ThunarListView, \
+                   gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [])
+
+

Index: ThunarSidePane.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarSidePane.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ThunarSidePane.py	4 Mar 2005 19:14:17 -0000	1.3
+++ ThunarSidePane.py	4 Mar 2005 20:30:18 -0000	1.4
@@ -83,7 +83,7 @@
     def set_gtkfilechooser_like(self, value):
         if value:
             self.frame.hide()
-            self.swin.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+            self.swin.set_shadow_type(gtk.SHADOW_IN)
         else:
             self.frame.show()
             self.swin.set_shadow_type(gtk.SHADOW_NONE)




More information about the Thunar-workers mailing list