[Thunar-workers] CVS: design/ui ChangeLog, 1.23, 1.24 ThunarIconView.py, 1.2, 1.3 ThunarListView.py, 1.4, 1.5 ThunarView.py, 1.4, 1.5 ThunarWindow.py, 1.14, 1.15
Benedikt Meurer
benny at xfce.org
Wed Mar 16 11:49:08 CET 2005
Update of /var/cvs/thunar/design/ui
In directory espresso.foo-projects.org:/tmp/cvs-serv23730
Modified Files:
ChangeLog ThunarIconView.py ThunarListView.py ThunarView.py
ThunarWindow.py
Log Message:
2005-03-16 Benedikt Meurer <benny at xfce.org>
* ThunarIconView.py, ThunarListView.py, ThunarView.py, ThunarWindow.py:
Apply a modified version of the "middle-click opens new window" patch
by Brian Schott <brian-schott at cox.net>.
* ThunarWindow.py: Remove the view chooser from the location and put
a "Go" button in place, as suggested on thunar-dev.
Index: ChangeLog
===================================================================
RCS file: /var/cvs/thunar/design/ui/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ChangeLog 15 Mar 2005 22:35:22 -0000 1.23
+++ ChangeLog 16 Mar 2005 10:49:05 -0000 1.24
@@ -1,3 +1,11 @@
+2005-03-16 Benedikt Meurer <benny at xfce.org>
+
+ * ThunarIconView.py, ThunarListView.py, ThunarView.py, ThunarWindow.py:
+ Apply a modified version of the "middle-click opens new window" patch
+ by Brian Schott <brian-schott at cox.net>.
+ * ThunarWindow.py: Remove the view chooser from the location and put
+ a "Go" button in place, as suggested on thunar-dev.
+
2005-03-15 Benedikt Meurer <benny at xfce.org>
* ThunarWindow.py: Fix typos (toolbar -> tool_bar).
Index: ThunarIconView.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarIconView.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ThunarIconView.py 4 Mar 2005 20:30:18 -0000 1.2
+++ ThunarIconView.py 16 Mar 2005 10:49:05 -0000 1.3
@@ -75,7 +75,17 @@
self.grab_focus()
self.context_menu()
return True
- elif (event.button == 1 or event.button == 2) and event.type == gtk.gdk._2BUTTON_PRESS:
+ elif event.button == 2 and event.type == gtk.gdk.BUTTON_PRESS:
+ path = self.get_path_at_pos(int(event.x), int(event.y))
+ if path:
+ iter = self.get_model().get_iter(path)
+ info = self.get_model().get(iter, ThunarModel.COLUMN_FILEINFO)[0]
+ if info.is_directory():
+ self.unselect_all()
+ self.select_path(path)
+ self.activated(info, True)
+ return True
+ elif event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS:
path = self.get_path_at_pos(int(event.x), int(event.y))
if path:
iter = self.get_model().get_iter(path)
@@ -85,8 +95,6 @@
info = self.get_model().get(iter, ThunarModel.COLUMN_FILEINFO)[0]
if info.is_directory():
self.activated(info)
- if event.button == 2 or (event.state & gtk.gdk.SHIFT_MASK) != 0:
- self.get_toplevel().destroy()
return True
return False
@@ -94,7 +102,6 @@
gobject.type_register(ThunarIconView)
gobject.signal_new('activated', ThunarIconView, gobject.SIGNAL_RUN_LAST, \
- gobject.TYPE_NONE, [ThunarFileInfo])
+ gobject.TYPE_NONE, [ThunarFileInfo, gobject.TYPE_BOOLEAN])
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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ThunarListView.py 6 Mar 2005 15:53:55 -0000 1.4
+++ ThunarListView.py 16 Mar 2005 10:49:05 -0000 1.5
@@ -131,19 +131,27 @@
self.grab_focus()
self.context_menu()
return True
- elif (event.button == 1 or event.button == 2) and event.type == gtk.gdk._2BUTTON_PRESS:
+ elif event.button == 2 and event.type == gtk.gdk.BUTTON_PRESS:
path, column, x, y = self.get_path_at_pos(int(event.x), int(event.y))
if path:
iter = self.get_model().get_iter(path)
- if event.button == 1:
+ info = self.get_model().get(iter, ThunarModel.COLUMN_FILEINFO)[0]
+ if info.is_directory():
selection = self.get_selection()
selection.unselect_all()
selection.select_path(path)
+ self.activated(info, True)
+ return True
+ elif event.button == 1 and event.type == gtk.gdk._2BUTTON_PRESS:
+ path, column, x, y = self.get_path_at_pos(int(event.x), int(event.y))
+ if path:
+ iter = self.get_model().get_iter(path)
+ selection = self.get_selection()
+ selection.unselect_all()
+ selection.select_path(path)
info = self.get_model().get(iter, ThunarModel.COLUMN_FILEINFO)[0]
if info.is_directory():
self.activated(info)
- if event.button == 2 or (event.state & gtk.gdk.SHIFT_MASK) != 0:
- self.get_toplevel().destroy()
return True
return False
@@ -151,7 +159,7 @@
gobject.type_register(ThunarListView)
gobject.signal_new('activated', ThunarListView, gobject.SIGNAL_RUN_LAST, \
- gobject.TYPE_NONE, [ThunarFileInfo])
+ gobject.TYPE_NONE, [ThunarFileInfo, gobject.TYPE_BOOLEAN])
gobject.signal_new('context-menu', ThunarListView, \
gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, [])
gobject.signal_new('selection-changed', ThunarListView, \
Index: ThunarView.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarView.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ThunarView.py 15 Mar 2005 22:33:01 -0000 1.4
+++ ThunarView.py 16 Mar 2005 10:49:05 -0000 1.5
@@ -42,8 +42,8 @@
pass
- def activated(self, info):
- self.emit('activated', info)
+ def activated(self, info, new_window = False):
+ self.emit('activated', info, new_window)
def context_menu(self):
Index: ThunarWindow.py
===================================================================
RCS file: /var/cvs/thunar/design/ui/ThunarWindow.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ThunarWindow.py 15 Mar 2005 22:35:22 -0000 1.14
+++ ThunarWindow.py 16 Mar 2005 10:49:05 -0000 1.15
@@ -146,6 +146,7 @@
self.tool_bar.show()
self.location_bar = gtk.Toolbar()
+ self.location_bar.set_style(gtk.TOOLBAR_BOTH_HORIZ)
self.main_vbox.pack_start(self.location_bar, False, False, 0)
self.location_bar.show()
@@ -168,31 +169,26 @@
item.show()
item = gtk.ToolItem()
- item.set_border_width(6)
+ item.set_border_width(3)
item.set_expand(True)
self.location_bar.insert(item, -1)
item.show()
self.location_entry = gtk.Entry()
self.location_entry.set_text(info.get_path())
- self.location_entry.connect('activate', lambda entry: self._action_open_dir(ThunarFileInfo(entry.get_text())))
+ self.location_entry.connect('activate', lambda entry: self._action_open_dir(ThunarFileInfo(entry.get_text()), False))
item.add(self.location_entry)
self.location_entry.show()
- item = gtk.ToolItem()
- item.set_border_width(4)
+ item = gtk.ToolButton()
+ item.set_border_width(0)
+ item.set_stock_id(gtk.STOCK_JUMP_TO)
+ item.set_label('Go')
+ item.set_is_important(True)
+ item.connect('clicked', lambda ign: self.location_entry.activate())
self.location_bar.insert(item, -1)
item.show()
- self.view_combo = gtk.combo_box_new_text()
- self.view_combo.append_text('View as Icons')
- self.view_combo.append_text('View as List')
- self.view_combo.set_active(int(self.action_group.get_action('view-as-list').get_active()))
- self.view_combo.connect('changed', lambda combo: (self.action_group.get_action('view-as-icons').set_active(combo.get_active() == 0), self.action_group.get_action('view-as-list').set_active(combo.get_active() == 1)))
- self.action_group.get_action('view-as-list').connect('toggled', lambda action, combo: combo.set_active(int(action.get_active())), self.view_combo)
- item.add(self.view_combo)
- self.view_combo.show()
-
self.main_hbox = gtk.HPaned()
self.main_hbox.set_border_width(0)
self.main_vbox.pack_start(self.main_hbox, True, True, 0)
@@ -232,7 +228,7 @@
if not icon_view_support:
self.action_group.get_action('view-as-icons').set_property('sensitive', False)
self.view.connect('context-menu', lambda view: self._context_menu())
- self.view.connect('activated', lambda widget, info: self._action_open_dir(info))
+ self.view.connect('activated', lambda widget, info, new_window: self._action_open_dir(info, new_window))
self.view.connect('selection-changed', lambda widget: self._selection_changed())
self.swin.add(self.view)
self.view.grab_focus()
@@ -261,7 +257,7 @@
else:
self.view = ThunarListView(self.info)
self.view.connect('context-menu', lambda view: self._context_menu())
- self.view.connect('activated', lambda widget, info: self._action_open_dir(info))
+ self.view.connect('activated', lambda widget, info, new_window: self._action_open_dir(info, new_window))
self.view.connect('selection-changed', lambda widget: self._selection_changed())
self.swin.add(self.view)
self.view.show()
@@ -319,13 +315,16 @@
image = gtk.Image()
image.set_from_pixbuf(info.render_icon(16))
item.set_image(image)
- item.connect('activate', lambda ign: self._action_open_dir(info))
+ item.connect('activate', lambda ign: self._action_open_dir(info, False))
image.show()
menu.append(item)
item.show()
- def _action_open_dir(self, info):
+ def _action_open_dir(self, info, new_window = False):
+ if new_window:
+ self._action_open_in_new_window(info)
+ return
self.back_list.append(self.info)
self.forward_list = []
self.action_group.get_action('go-back').set_property('sensitive', True)
More information about the Thunar-workers
mailing list