From 47fa732873512507322d8907dc30d1c8257e67a7 Mon Sep 17 00:00:00 2001 From: necoro <> Date: Fri, 26 Jan 2007 18:58:34 +0000 Subject: - fixed oneshot-bug - added accelerators - enabled copying out of the console --- portato/gui/gtk/glade/portato.glade | 2220 ++++++++++++++++++----------------- portato/gui/gtk/windows.py | 17 +- 2 files changed, 1135 insertions(+), 1102 deletions(-) (limited to 'portato/gui') diff --git a/portato/gui/gtk/glade/portato.glade b/portato/gui/gtk/glade/portato.glade index 8956a2d..e8c7dad 100644 --- a/portato/gui/gtk/glade/portato.glade +++ b/portato/gui/gtk/glade/portato.glade @@ -2,1121 +2,1145 @@ - - 2 - GTK_WIN_POS_CENTER - - - - True - - - True - - - True - _File - True - - - True - - - True - _Preferences - True - - - + + 2 + GTK_WIN_POS_CENTER + + + + True + + + True + + + True + _File + True + + + True + + + True + _Preferences + True + + + + + True + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + True + Re_load Portage + True + + + + True + gtk-refresh + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + True + + + + + True + _Close + True + + + + True + gtk-quit + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + True + _Emerge + True + + + True + + + True + E_merge + True + + + + + + True + _Unmerge + True + + + + + + True + Update _World + True + + + + + + True + + + + + True + _Sync + True + + + + + + True + Save _Flags + True + + + + + + True + + + + + True + _Kill Emerge + True + + + + + True + gtk-stop + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + True + _? + True + + + True + + + True + _About + True + + + + True + gtk-about + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + + + + + + False + + + + + True + 3 + + + True + + + + 5 + + + + + True + _Search + True + + + + False + 1 + + + + + False + False + 1 + + + + + True + 300 + + True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 + 0 + 0 + GTK_SHADOW_IN + + + True + 5 + True + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + 0 + + + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + 0 + + + + + + 1 + + + + + + + + label_item + + + + False + - - - - - True - Re_load Portage - True - - - + + True - gtk-refresh - 1 - 0.5 - 0.5 - 0 - 0 + + + True + 4 + 2 + + + True + 1 + True + + + True + True + Installed + True + + + + False + + + + + True + True + Masked + True + + + + False + 1 + + + + + True + True + Testing + True + + + + False + 2 + + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 5 + GTK_BUTTONBOX_SPREAD + + + True + _Emerge + True + + + + + + True + _Unmerge + True + + + + 1 + + + + + True + Re_vert + True + + + + 2 + + + + + 2 + 3 + 4 + + + + + + True + True + <b>Installed, but not in portage anymore</b> + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + True + <span foreground='red'><b>MISSING KEYWORD</b></span> + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + GTK_JUSTIFY_CENTER + True + + + 2 + GTK_FILL + + 10 + + + + + True + + + + + + 1 + 2 + GTK_FILL + 5 + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + + + + + 2 + 2 + 3 + 5 + 5 + + + + + False + False + + + + + True + Package + + + tab + False + False + + + + + True + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + False + False + + + + + + + + + True + True + GTK_BUTTONBOX_SPREAD + + + True + E_merge + True + + + + + + True + _Unmerge + True + + + + 1 + + + + + True + Update _World + True + + + + 2 + + + + + True + _Remove + True + + + + 3 + + + + + False + False + 5 + 1 + + + + + 1 + False + + + + + True + Queue + True + + + tab + 1 + False + False + + + + + True + + + + + + + + + 2 + False + + + + + True + Console + True + + + tab + 2 + False + False + + - - - - - True - - - - - True - _Close - True - - - + + + 2 + + + + + True + 5 + + + True + 0 + 0 + Portato - A Portage GUI + True + + + + + False + False + 3 + + + + + + + About + False + True + GTK_WIN_POS_CENTER_ON_PARENT + 1 + 1 + True + True + + + True + + + True + True + GTK_JUSTIFY_CENTER + True + + + + + True + _OK + True + + + + False + False + 1 + + + + + + + Search + False + True + GTK_WIN_POS_CENTER_ON_PARENT + 1 + 1 + True + True + + + + + + 5 + Preferences + True + GTK_WIN_POS_CENTER_ON_PARENT + True + True + + + True + 5 + + + True + 0 + + True - gtk-quit - 1 - 0.5 - 0.5 - 0 - 0 + 12 + + + True + Debug + True + + - - - - - - - - - True - _Emerge - True - - - True - - - True - _Emerge - True - - - - - - True - _Unmerge - True - - - - - - True - Update _World - True - - - - - - True - - - - - True - _Sync - True - - - - - - True - Save _Flags - True - - - - - - True - - - - - True - _Kill Emerge - True - - - + + True - gtk-stop - 1 - 0.5 - 0.5 - 0 - 0 + <b>General Options</b> + True + + label_item + - - - - - - - - - True - _? - True - - - True - - - True - _About - True - - - + + + + + True + 0 + + True - gtk-about - 1 - 0.5 - 0.5 - 0 - 0 + 5 + 12 + 5 + + + True + + + True + Sync command: + + + False + + + + + True + + + 1 + + + + - - - - - - - - - False - - - - - True - 3 - - - True - - - - 5 - - - - - True - _Search - True - - - - False - 1 - - - - - False - False - 1 - - - - - True - 300 - - - True - 0 - 0 - GTK_SHADOW_IN - - - True - 5 - True - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - 0 - - - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - 0 - - - - - - 1 - - - - - - - - label_item - - - - - False - - - - - True - - - True - 4 - 2 - - - True - 1 - True - - - True - True - Installed - True - - - - False - - - - - True - True - Masked - True - - - - False - 1 - - - - - True - True - Testing - True - - - - False - 2 - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - 5 - GTK_BUTTONBOX_SPREAD - - - True - _Emerge - True - - - - - - True - _Unmerge - True - - - - 1 - - - - - True - Re_vert - True - - - - 2 - - - - - 2 - 3 - 4 - - - - - - True - True - <b>Installed, but not in portage anymore</b> - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - <span foreground='red'><b>MISSING KEYWORD</b></span> - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - GTK_JUSTIFY_CENTER - True - - - 2 - GTK_FILL - - 10 - - - - - True - - - - - - 1 - 2 - GTK_FILL - 5 - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - - - - - 2 - 2 - 3 - 5 - 5 - - - - - False - False - - - - - True - Package - - - tab - False - False - - - - - True - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - - - True - False - False - - - - - - - - - True - True - GTK_BUTTONBOX_SPREAD - - - True - E_merge - True - - - - - - True - _Unmerge - True - - - - 1 - - - - - True - Update _World - True - - - - 2 - - - - - True - _Remove - True - - - - 3 - - - - - False - False - 5 - 1 - - - - - 1 - False - - - - - True - Queue - True - - - tab - 1 - False - False - - - - - True - - - - - - - - - 2 - False - - - - - True - Console - True - - - tab - 2 - False - False - - - - - - - 2 - - - - - True - 5 - - - True - 0 - 0 - Portato - A Portage GUI - True - - - - - False - False - 3 - - - - - - - About - False - True - GTK_WIN_POS_CENTER_ON_PARENT - 1 - 1 - True - True - - - True - - - True - True - GTK_JUSTIFY_CENTER - True - - - - - True - _OK - True - - - - False - False - 1 - - - - - - - Search - False - True - GTK_WIN_POS_CENTER_ON_PARENT - 1 - 1 - True - True - - - - - - 5 - Preferences - True - GTK_WIN_POS_CENTER_ON_PARENT - True - True - - - True - 5 - - - True - 0 - - - True - 12 - - - True - Debug - True - - - - - - - True - <b>General Options</b> - True - - - label_item - - - - - - - True - 0 - - - True - 5 - 12 - 5 - - - True - - - True - Sync command: - - - False - - - - - True - - - 1 - - - - - - - - - True - <b>Sync Options</b> - True - - - label_item - - - - - 1 - - - - - True - 0 - - - True - 12 - - - True - - - True - --deep - True - - - False - - - - - True - --newuse - True - - - False - 1 - - - - - - - - - True - <b>Update World Options</b> - True - - - label_item - - - - - 2 - - - - - True - 0 - - - True - 5 - 12 - 5 - - - True - 10 - 2 - - - - - - - - - - - - True - - - 1 - 2 - 3 - 4 - - - - - True - 0 - File name to use, if package.use is a directory: - True - - - 3 - 4 - - - - - True - Add only exact version to package.use - True - - - 2 - 2 - 3 - - - - - True - Add only exact version to package.keywords - True - - - 2 - 5 - 6 - - - - - True - 0 - File name to use, if package.keywords is a directory: - True - - - 6 - 7 - - - - - True - - - 1 - 2 - 6 - 7 - - - - - True - - - 1 - 2 - 9 - 10 - - - - - True - 0 - File name to use, if package.mask/package.unmask is a directory: - True - - - 9 - 10 - - - - - True - Add only exact version to package.mask/package.unmask - True - - - 2 - 8 - 9 - - - - - True - - - True - 0 - GTK_SHADOW_OUT - - - True - 0 - <u>You may use the following placeholders:</u> + + + True + <b>Sync Options</b> + True + + + label_item + + + + + 1 + + + + + True + 0 + + + True + 12 + + + True + + + True + --deep + True + + + False + + + + + True + --newuse + True + + + False + 1 + + + + + + + + + True + <b>Update World Options</b> + True + + + label_item + + + + + 2 + + + + + True + 0 + + + True + 5 + 12 + 5 + + + True + 10 + 2 + + + + + + + + + + + + True + + + 1 + 2 + 3 + 4 + + + + + True + 0 + File name to use, if package.use is a directory: + True + + + 3 + 4 + + + + + True + Add only exact version to package.use + True + + + 2 + 2 + 3 + + + + + True + Add only exact version to package.keywords + True + + + 2 + 5 + 6 + + + + + True + 0 + File name to use, if package.keywords is a directory: + True + + + 6 + 7 + + + + + True + + + 1 + 2 + 6 + 7 + + + + + True + + + 1 + 2 + 9 + 10 + + + + + True + 0 + File name to use, if package.mask/package.unmask is a directory: + True + + + 9 + 10 + + + + + True + Add only exact version to package.mask/package.unmask + True + + + 2 + 8 + 9 + + + + + True + + + True + 0 + GTK_SHADOW_OUT + + + True + 0 + <u>You may use the following placeholders:</u> -<i>$(cat)</i>: category -<i>$(pkg)</i>: package name -<i>$(cat-1)/$(cat-2)</i>: first/second part of the category - True - - - - - - label_item - - - - - - - 2 - - - - - True - 0 - 5 - <u><i>Use-Flags</i></u> - True - True - - - 1 - 2 - 6 - - - - - True - 0 - 5 - <u><i>Testing Keywords</i></u> - True - True - - - 4 - 5 - 5 - - - - - True - 0 - 5 - <u><i>Masking Keywords</i></u> - True - True - - - 7 - 8 - 5 - - - - - - - - - True - <b>Use Flag and Keyword Options</b> - True - - - label_item - - - - - 3 - - - - - True - True - GTK_BUTTONBOX_SPREAD - - - True - _OK - True - - - - - - True - _Cancel - True - - - - 1 - - - - - 4 - - - - - - - True - - - True - oneshot - - - - - - True - - - True - Kill Process - True - - - + <i>$(cat)</i>: category + <i>$(pkg)</i>: package name + <i>$(cat-1)/$(cat-2)</i>: first/second part of the category + True + + + + + + label_item + + + + + + + 2 + + + + + True + 0 + 5 + <u><i>Use-Flags</i></u> + True + True + + + 1 + 2 + 6 + + + + + True + 0 + 5 + <u><i>Testing Keywords</i></u> + True + True + + + 4 + 5 + 5 + + + + + True + 0 + 5 + <u><i>Masking Keywords</i></u> + True + True + + + 7 + 8 + 5 + + + + + + + + + True + <b>Use Flag and Keyword Options</b> + True + + + label_item + + + + + 3 + + + + + True + True + GTK_BUTTONBOX_SPREAD + + + True + _OK + True + + + + + + True + _Cancel + True + + + + 1 + + + + + 4 + + + + + + + True + + + True + oneshot + + + + + + + True + + + True + Copy + True + + + + + True + gtk-copy + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + True - gtk-stop - 1 - 0.5 - 0.5 - 0 - 0 + Kill Process + True + + + + + True + gtk-stop + 1 + 0.5 + 0.5 + 0 + 0 + + - - - + diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py index 3f6a55f..fb663e0 100644 --- a/portato/gui/gtk/windows.py +++ b/portato/gui/gtk/windows.py @@ -465,10 +465,10 @@ class PackageTable: if self.doEmerge: # set emerge-button-label if not self.actual_package().is_installed(): - self.emergeBtn.set_label("_Emerge") + self.emergeBtn.set_label("E_merge") self.unmergeBtn.set_sensitive(False) else: - self.emergeBtn.set_label("R_emerge") + self.emergeBtn.set_label("Re_merge") self.unmergeBtn.set_sensitive(True) self.table.show_all() @@ -590,6 +590,12 @@ class MainWindow (Window): self.cfg.modify_external_configs() + # accelerators - for whatever reason they are not automatically working for popups + self.accel_group = gtk.AccelGroup() + self.window.add_accel_group(self.accel_group) + self.accel_group.connect_group(ord("C"), gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE, lambda g, a, k, m: self.cb_copy_clicked(a)) + self.accel_group.connect_group(ord("1"), gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE, lambda g, a, k, m: self.cb_oneshot_clicked(a)) + # set vpaned position vpaned = self.tree.get_widget("vpaned") vpaned.set_position(mHeight/2) @@ -874,7 +880,7 @@ class MainWindow (Window): x = int(event.x) y = int(event.y) time = event.time - + if object == self.queueList: pthinfo = object.get_path_at_pos(x, y) if pthinfo is not None: @@ -906,7 +912,10 @@ class MainWindow (Window): def cb_kill_clicked (self, action): self.queue.kill_emerge() - + + def cb_copy_clicked (self, action): + self.console.copy_clipboard() + def cb_destroy (self, widget): """Calls main_quit().""" gtk.main_quit() -- cgit v1.2.3-54-g00ecf