[Thunar-workers] CVS: design/ui ChangeLog, 1.10, 1.11 ThunarListView.py, 1.1, 1.2 ThunarPropertiesDialog.py, 1.5, 1.6 ThunarWindow.py, 1.6, 1.7
Benedikt Meurer
benny at xfce.org
Thu Mar 3 20:11:24 CET 2005
Update of /var/cvs/thunar/design/ui
In directory espresso.foo-projects.org:/tmp/cvs-serv5024
Modified Files:
ChangeLog ThunarListView.py ThunarPropertiesDialog.py
ThunarWindow.py
Log Message:
2005-03-03 Benedikt Meurer <benny at xfce.org>
* ThunarWindow.py: Remove the frames around the toolbar and the menubar.
We'll need to fix the Xfce theme instead.
* ThunarListView.py: Use ellipsized cell renderer if available. Get
the column sizing right.
* ThunarPropertiesDialog.py: Remove the advanced file attributes from
the user interface. Users who want to set this properties will
definetly know how to do it using the command line utitilies.
* ThunarPropertiesDialog.py: Remove the Permissions from the General
tab. Display the full location path (ellipsized).
Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog 3 Mar 2005 00:25:18 -0000 1.10
+++ ChangeLog 3 Mar 2005 19:11:22 -0000 1.11
@@ -1,3 +1,15 @@
+2005-03-03 Benedikt Meurer <benny at xfce.org>
+
+ * ThunarWindow.py: Remove the frames around the toolbar and the menubar.
+ We'll need to fix the Xfce theme instead.
+ * ThunarListView.py: Use ellipsized cell renderer if available. Get
+ the column sizing right.
+ * ThunarPropertiesDialog.py: Remove the advanced file attributes from
+ the user interface. Users who want to set this properties will
+ definetly know how to do it using the command line utitilies.
+ * ThunarPropertiesDialog.py: Remove the Permissions from the General
+ tab. Display the full location path (ellipsized).
+
2005-03-02 Benedikt Meurer <benny at xfce.org>
* ThunarWindow.py: Make sure the sidebar doesn't resize when the
Index: ThunarListView.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarListView.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ThunarListView.py 27 Feb 2005 18:13:49 -0000 1.1
+++ ThunarListView.py 3 Mar 2005 19:11:22 -0000 1.2
@@ -31,6 +31,14 @@
from ThunarModel import ThunarModel
from ThunarView import ThunarView
+try:
+ import pyexo
+ pyexo.require('0.3')
+ import exo
+ exo_supported = True
+except ImportError:
+ exo_supported = False
+
signals_registered = False
class ThunarListView(gtk.TreeView, ThunarView):
@@ -64,9 +72,17 @@
renderer = gtk.CellRendererPixbuf()
column.pack_start(renderer, False)
column.add_attribute(renderer, 'pixbuf', ThunarModel.COLUMN_ICON)
- renderer = gtk.CellRendererText()
+ if exo_supported:
+ renderer = exo.CellRendererEllipsizedText()
+ renderer.set_property('ellipsize', exo.PANGO_ELLIPSIZE_END)
+ renderer.set_property('ellipsize-set', True)
+ else:
+ renderer = gtk.CellRendererText()
column.pack_start(renderer, True)
column.add_attribute(renderer, 'text', ThunarModel.COLUMN_NAME)
+ column.set_resizable(True)
+ column.set_expand(True)
+ column.set_sizing(gtk.TREE_VIEW_COLUMN_AUTOSIZE)
self.append_column(column)
self.set_expander_column(column)
@@ -75,18 +91,24 @@
renderer.set_property('xalign', 1.0)
column.pack_start(renderer, True)
column.add_attribute(renderer, 'text', ThunarModel.COLUMN_SIZE)
+ column.set_resizable(True)
+ column.set_expand(False)
self.append_column(column)
column = gtk.TreeViewColumn('Modified')
renderer = gtk.CellRendererText()
column.pack_start(renderer, False)
column.add_attribute(renderer, 'text', ThunarModel.COLUMN_MTIME)
+ column.set_resizable(True)
+ column.set_expand(False)
self.append_column(column)
column = gtk.TreeViewColumn('Kind')
renderer = gtk.CellRendererText()
column.pack_start(renderer, False)
column.add_attribute(renderer, 'text', ThunarModel.COLUMN_KIND)
+ column.set_resizable(True)
+ column.set_expand(False)
self.append_column(column)
self.set_rules_hint(True)
Index: ThunarPropertiesDialog.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarPropertiesDialog.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ThunarPropertiesDialog.py 27 Feb 2005 18:13:49 -0000 1.5
+++ ThunarPropertiesDialog.py 3 Mar 2005 19:11:22 -0000 1.6
@@ -26,6 +26,15 @@
pygtk.require('2.0')
import gobject
import gtk
+import pango
+
+try:
+ import pyexo
+ pyexo.require('0.3')
+ import exo
+ exo_supported = True
+except ImportError:
+ exo_supported = False
from ThunarFileInfo import ThunarFileInfo
@@ -145,7 +154,15 @@
table.attach(label, 0, 1, row, row + 1, gtk.FILL, gtk.FILL)
label.show()
- label = gtk.Label(info.get_parent().get_visible_name())
+ if exo_supported:
+ label = exo.EllipsizedLabel(info.get_parent().get_path())
+ label.set_ellipsize(exo.PANGO_ELLIPSIZE_START)
+ else:
+ label = gtk.Label(info.get_parent().get_path())
+ try:
+ label.set_ellipsize(pango.ELLIPSIZE_START)
+ except:
+ pass
label.set_alignment(0.0, 0.5)
label.set_selectable(True)
table.attach(label, 1, 2, row, row + 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
@@ -168,20 +185,6 @@
row += 1 ### }
### {
- label = gtk.Label('<b>Permissions:</b>')
- label.set_use_markup(True)
- label.set_alignment(1.0, 0.5)
- table.attach(label, 0, 1, row, row + 1, gtk.FILL, gtk.FILL)
- label.show()
-
- label = gtk.Label(info.get_permissions())
- label.set_alignment(0.0, 0.5)
- label.set_selectable(True)
- table.attach(label, 1, 2, row, row + 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
- label.show()
- row += 1 ### }
-
- ### {
align = gtk.Alignment(1.0, 1.0, 1.0, 1.0)
align.set_size_request(-1, 12)
table.attach(align, 0, 1, row, row + 1, 0, 0)
@@ -338,35 +341,35 @@
sep.show()
row += 1 ### }
- ### {
- label = gtk.Label('<b>Special flags:</b>')
- label.set_use_markup(True)
- label.set_alignment(1.0, 0.5)
- table.attach(label, 0, 1, row, row + 1, gtk.FILL, gtk.FILL)
- label.show()
-
- button = gtk.CheckButton('Set user ID')
- table.attach(button, 1, 4, row, row + 1, gtk.FILL, gtk.FILL)
- button.show()
- row += 1 ### }
-
- ### {
- button = gtk.CheckButton('Set group ID')
- table.attach(button, 1, 4, row, row + 1, gtk.FILL, gtk.FILL)
- button.show()
- row += 1 ### }
-
- ### {
- button = gtk.CheckButton('Sticky')
- table.attach(button, 1, 4, row, row + 1, gtk.FILL, gtk.FILL)
- button.show()
- row += 1 ### }
-
- ### {
- sep = gtk.HSeparator()
- table.attach(sep, 0, 4, row, row + 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
- sep.show()
- row += 1 ### }
+# ### {
+# label = gtk.Label('<b>Special flags:</b>')
+# label.set_use_markup(True)
+# label.set_alignment(1.0, 0.5)
+# table.attach(label, 0, 1, row, row + 1, gtk.FILL, gtk.FILL)
+# label.show()
+#
+# button = gtk.CheckButton('Set user ID')
+# table.attach(button, 1, 4, row, row + 1, gtk.FILL, gtk.FILL)
+# button.show()
+# row += 1 ### }
+#
+# ### {
+# button = gtk.CheckButton('Set group ID')
+# table.attach(button, 1, 4, row, row + 1, gtk.FILL, gtk.FILL)
+# button.show()
+# row += 1 ### }
+#
+# ### {
+# button = gtk.CheckButton('Sticky')
+# table.attach(button, 1, 4, row, row + 1, gtk.FILL, gtk.FILL)
+# button.show()
+# row += 1 ### }
+#
+# ### {
+# sep = gtk.HSeparator()
+# table.attach(sep, 0, 4, row, row + 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+# sep.show()
+# row += 1 ### }
### {
label = gtk.Label('<b>Text view:</b>')
Index: ThunarWindow.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarWindow.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ThunarWindow.py 3 Mar 2005 00:25:18 -0000 1.6
+++ ThunarWindow.py 3 Mar 2005 19:11:22 -0000 1.7
@@ -44,7 +44,7 @@
class ThunarWindow(gtk.Window):
def __init__(self, info):
gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
- self.set_title('Thunar: ' + info.get_visible_name())
+ self.set_title(info.get_path())
self.set_icon(info.render_icon(48))
self.set_default_size(650,550)
@@ -132,25 +132,13 @@
self.add(self.main_vbox)
self.main_vbox.show()
- frame = gtk.Frame()
- frame.set_shadow_type(gtk.SHADOW_OUT)
- self.main_vbox.pack_start(frame, False, False, 0)
- frame.show()
-
menu_bar = self.ui_manager.get_widget('/main-menu')
- #self.main_vbox.pack_start(menu_bar, False, False, 0)
- frame.add(menu_bar)
+ self.main_vbox.pack_start(menu_bar, False, False, 0)
menu_bar.show()
- frame = gtk.Frame()
- frame.set_shadow_type(gtk.SHADOW_OUT)
- self.main_vbox.pack_start(frame, False, False, 0)
- frame.show()
-
tool_bar = self.ui_manager.get_widget('/main-toolbar')
tool_bar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
- #self.main_vbox.pack_start(tool_bar, False, False, 0)
- frame.add(tool_bar)
+ self.main_vbox.pack_start(tool_bar, False, False, 0)
tool_bar.show()
self.main_hbox = gtk.HPaned()
@@ -266,7 +254,7 @@
self.info = info
self.action_group.get_action('go-up').set_property('sensitive', (info.get_parent() != None))
self._selection_changed()
- self.set_title('Thunar: ' + info.get_visible_name())
+ self.set_title(info.get_path())
self.set_icon(info.render_icon(48))
self.sidepane.handler_block(self.sidepane_selection_id)
More information about the Thunar-workers
mailing list