diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2009-02-20 01:03:21 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2009-02-20 01:03:21 +0100 |
| commit | 2455dc6f3ac1b4187d33173eb3d5f061a53aac9f (patch) | |
| tree | a417fbbc2861be171d7843311a2fa3b435e7db95 /portato/gui | |
| parent | 0235295d89cf6f8f1a9e9c4005505d41690f97cb (diff) | |
| parent | 9756f5649fc17b4be9b8f3f9a537ee027faabca2 (diff) | |
| download | portato-2455dc6f3ac1b4187d33173eb3d5f061a53aac9f.tar.gz portato-2455dc6f3ac1b4187d33173eb3d5f061a53aac9f.tar.bz2 portato-2455dc6f3ac1b4187d33173eb3d5f061a53aac9f.zip | |
Moved from libglade to GtkBuilder.
Overhauled the preference dialog. - Still no user-configs though :(
Diffstat (limited to 'portato/gui')
| -rw-r--r-- | portato/gui/templates/AboutWindow.ui (renamed from portato/gui/templates/AboutWindow.glade) | 33 | ||||
| -rw-r--r-- | portato/gui/templates/MailInfoWindow.ui (renamed from portato/gui/templates/MailInfoWindow.glade) | 88 | ||||
| -rw-r--r-- | portato/gui/templates/MainWindow.ui (renamed from portato/gui/templates/MainWindow.glade) | 985 | ||||
| -rw-r--r-- | portato/gui/templates/PluginWindow.ui (renamed from portato/gui/templates/PluginWindow.glade) | 122 | ||||
| -rw-r--r-- | portato/gui/templates/PreferenceWindow.ui (renamed from portato/gui/templates/PreferenceWindow.glade) | 899 | ||||
| -rw-r--r-- | portato/gui/templates/SearchWindow.ui (renamed from portato/gui/templates/SearchWindow.glade) | 50 | ||||
| -rw-r--r-- | portato/gui/templates/SplashScreen.ui (renamed from portato/gui/templates/SplashScreen.glade) | 31 | ||||
| -rw-r--r-- | portato/gui/templates/UpdateWindow.ui (renamed from portato/gui/templates/UpdateWindow.glade) | 52 | ||||
| -rw-r--r-- | portato/gui/templates/popups.glade | 44 | ||||
| -rw-r--r-- | portato/gui/windows/basic.py | 72 | ||||
| -rw-r--r-- | portato/gui/windows/main.py | 120 | ||||
| -rw-r--r-- | portato/gui/windows/preference.py | 76 |
12 files changed, 1317 insertions, 1255 deletions
diff --git a/portato/gui/templates/AboutWindow.glade b/portato/gui/templates/AboutWindow.ui index 9c966b2..20abe2e 100644 --- a/portato/gui/templates/AboutWindow.glade +++ b/portato/gui/templates/AboutWindow.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--*- mode: xml -*--> -<glade-interface> - <widget class="GtkAboutDialog" id="AboutWindow"> +<interface> + <object class="GtkAboutDialog" id="AboutWindow"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> <property name="title" translatable="yes">About Portato</property> @@ -16,23 +15,23 @@ <property name="has_separator">False</property> <property name="program_name">Portato</property> <property name="copyright">This software is licensed under the terms of the GPLv2. -Copyright (C) 2006-2009 René 'Necoro' Neumann <necoro@necoro.net></property> +Copyright (C) 2006-2009 René 'Necoro' Neumann <necoro@necoro.net></property> <property name="comments">A Portage GUI</property> <property name="website">http://portato.necoro.net</property> - <property name="authors">René 'Necoro' Neumann + <property name="authors">René 'Necoro' Neumann Thanks goto: - The Porthole team, which often inspired me and gave me hints :) - franzf, who often tested and gave comments - the Sabayon-Distro for making Portato the default Portage-GUI</property> - <property name="translator_credits">Catalan - Roger Calvó -German - René 'Necoro' Neumann -Polish - Tomasz Osiński -Turkish - Gürkan 'seqizz' Gür</property> + <property name="translator_credits">Catalan - Roger Calvó +German - René 'Necoro' Neumann +Polish - Tomasz Osiński +Turkish - Gürkan 'seqizz' Gür</property> <property name="artists">p4r4d0x (inspired by wolfden)</property> - <signal name="response" handler="close"/> + <signal handler="close" name="response"/> <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> + <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">2</property> @@ -40,17 +39,17 @@ Turkish - Gürkan 'seqizz' Gür</property> <placeholder/> </child> <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> + <object class="GtkHButtonBox" id="dialog-action_area1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="layout_style">GTK_BUTTONBOX_END</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="pack_type">GTK_PACK_END</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/MailInfoWindow.glade b/portato/gui/templates/MailInfoWindow.ui index 11ef33a..e0aad5c 100644 --- a/portato/gui/templates/MailInfoWindow.glade +++ b/portato/gui/templates/MailInfoWindow.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.5 on Mon Sep 15 20:20:19 2008 --> -<glade-interface> - <widget class="GtkWindow" id="MailInfoWindow"> +<interface> + <object class="GtkWindow" id="MailInfoWindow"> <property name="title" translatable="yes">Send Bug Mail ...</property> <property name="modal">True</property> <property name="window_position">GTK_WIN_POS_CENTER</property> @@ -14,10 +13,10 @@ <property name="skip_pager_hint">True</property> <property name="urgency_hint">True</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="n_rows">5</property> <property name="n_columns">2</property> @@ -26,24 +25,24 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="label" translatable="yes"><b><u>Additional Information</u></b> (all optional)</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_CENTER</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="nameEntry"> + <object class="GtkEntry" id="nameEntry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -54,10 +53,10 @@ </packing> </child> <child> - <widget class="GtkEntry" id="mailEntry"> + <object class="GtkEntry" id="mailEntry"> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -69,12 +68,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Email address:</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -84,12 +83,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Name:</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -99,12 +98,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Comments / what did you do to hit the bug?</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> @@ -113,20 +112,20 @@ what did you do to hit the bug?</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkTextView" id="commentEntry"> + <object class="GtkTextView" id="commentEntry"> <property name="height_request">50</property> <property name="visible">True</property> <property name="can_focus">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -136,81 +135,78 @@ what did you do to hit the bug?</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="logCheck"> + <object class="GtkCheckButton" id="logCheck"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Attaches the logfile to the mail. This log only contains debug information.</property> + <property name="tooltip-text" translatable="yes">Attaches the logfile to the mail. This log only contains debug information.</property> <property name="label" translatable="yes">Attach _Logfile</property> <property name="use_underline">True</property> - <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> </packing> </child> - </widget> + </object> <packing> <property name="padding">5</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> <property name="homogeneous">True</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <child> - <widget class="GtkButton" id="cancelBtn"> + <object class="GtkButton" id="cancelBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="label" translatable="yes">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_cancel_clicked"/> - </widget> + <signal handler="cb_cancel_clicked" name="clicked"/> + </object> </child> <child> - <widget class="GtkButton" id="sendBtn"> + <object class="GtkButton" id="sendBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_send_clicked"/> + <signal handler="cb_send_clicked" name="clicked"/> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="spacing">2</property> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="xalign">1</property> <property name="stock">gtk-ok</property> - </widget> + </object> </child> <child> - <widget class="GtkLabel" id="label5"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Send</property> <property name="use_underline">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -218,7 +214,7 @@ what did you do to hit the bug?</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/MainWindow.glade b/portato/gui/templates/MainWindow.ui index ad6b4a0..98da2ad 100644 --- a/portato/gui/templates/MainWindow.glade +++ b/portato/gui/templates/MainWindow.ui @@ -1,363 +1,252 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.5 on Fri Dec 5 12:57:49 2008 --> -<glade-interface> - <widget class="GtkWindow" id="MainWindow"> +<interface> + <object class="GtkUIManager" id="uimanager"> + <child> + <object class="GtkActionGroup" id="pluginActionGroup"> + <child> + <object class="GtkAction" id="pluginMenuAction"> + <property name="name">pluginMenuAction</property> + <property name="label" translatable="yes">Plu_gins</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkActionGroup" id="generalActionGroup"> + <child> + <object class="GtkAction" id="fileMenuAction"> + <property name="name">fileMenuAction</property> + <property name="label" translatable="yes">_File</property> + </object> + </child> + <child> + <object class="GtkAction" id="prefAction"> + <property name="stock_id">gtk-preferences</property> + <property name="name">prefAction</property> + <property name="label" translatable="yes">_Preferences</property> + <signal handler="cb_preferences_clicked" name="activate"/> + </object> + <accelerator key="P" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="reloadAction"> + <property name="stock_id">gtk-refresh</property> + <property name="name">reloadAction</property> + <property name="label" translatable="yes">Re_load Portage</property> + <signal handler="cb_reload_clicked" name="activate"/> + </object> + <accelerator key="F5" modifiers=""/> + <accelerator key="R" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="closeAction"> + <property name="stock_id" translatable="yes">gtk-quit</property> + <property name="name">closeAction</property> + <signal handler="cb_close" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="emergeMenuAction"> + <property name="name">emergeMenuAction</property> + <property name="label" translatable="yes">_Emerge</property> + </object> + </child> + <child> + <object class="GtkAction" id="emergeAction"> + <property name="stock_id">gtk-add</property> + <property name="name">emergeAction</property> + <property name="label" translatable="yes">_Install</property> + <signal handler="cb_package_emerge_clicked" name="activate"/> + </object> + <accelerator key="plus" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="unmergeAction"> + <property name="stock_id">gtk-remove</property> + <property name="name">unmergeAction</property> + <property name="label" translatable="yes">_Uninstall</property> + <signal handler="cb_package_unmerge_clicked" name="activate"/> + </object> + <accelerator key="minus" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="updateAction"> + <property name="name">updateAction</property> + <property name="label" translatable="yes">Update _World</property> + <signal handler="cb_update_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="showUpdatesAction"> + <property name="name">showUpdatesAction</property> + <property name="label" translatable="yes">Show Updatable P_ackages</property> + <signal handler="cb_show_updates_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkToggleAction" id="showInstalledAction"> + <property name="name">showInstalledAction</property> + <property name="label" translatable="yes">Show _Only Installed Packages</property> + <signal handler="cb_show_installed_toggled" name="toggled"/> + </object> + <accelerator key="i" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="syncAction"> + <property name="stock_id">gtk-refresh</property> + <property name="name">syncAction</property> + <property name="label" translatable="yes">_Sync</property> + <signal handler="cb_sync_clicked" name="activate"/> + </object> + <accelerator key="S" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="saveFlagsAction"> + <property name="stock_id">gtk-save</property> + <property name="name">saveFlagsAction</property> + <property name="label" translatable="yes">Save _Flags</property> + <signal handler="cb_save_flags_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkToggleAction" id="pauseAction"> + <property name="name">pauseActionMenu</property> + <property name="label" translatable="yes">Emerge _Paused</property> + <signal handler="cb_pause_emerge" name="activate"/> + </object> + <accelerator key="Z" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="killAction"> + <property name="stock_id">gtk-stop</property> + <property name="name">killAction</property> + <property name="label" translatable="yes">_Kill Emerge</property> + <signal handler="cb_kill_clicked" name="activate"/> + </object> + <accelerator key="K" modifiers="GDK_CONTROL_MASK"/> + </child> + <child> + <object class="GtkAction" id="copyAction"> + <property name="stock_id">gtk-copy</property> + <property name="name">copyAction</property> + <property name="label" translatable="yes">_Copy</property> + <signal handler="cb_copy_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="helpMenuAction"> + <property name="name">helpMenuAction</property> + <property name="label" translatable="yes">_?</property> + </object> + </child> + <child> + <object class="GtkAction" id="aboutAction"> + <property name="stock_id">gtk-about</property> + <property name="name">aboutAction</property> + <property name="label" translatable="yes">_About</property> + <signal handler="cb_about_clicked" name="activate"/> + </object> + </child> + <child> + <object class="GtkAction" id="pluginsAction"> + <property name="stock_id">gtk-connect</property> + <property name="name">pluginsAction</property> + <property name="label" translatable="yes">_Plugins</property> + <signal handler="cb_plugins_clicked" name="activate"/> + </object> + </child> + </object> + </child> + <ui> + <menubar name="menubar"> + <menu name="fileMenu" action="fileMenuAction"> + <menuitem name="prefMenuItem" action="prefAction"/> + <menuitem name="reloadMenuItem" action="reloadAction"/> + <separator/> + <menuitem name="closeMenuItem" action="closeAction"/> + </menu> + <menu name="emergeMenu" action="emergeMenuAction"> + <menuitem name="emergeMenuItem" action="emergeAction"/> + <menuitem name="unmergeMenuItem" action="unmergeAction"/> + <menuitem name="updateMenuItem" action="updateAction"/> + <menuitem name="showUpdatesMenuItem" action="showUpdatesAction"/> + <menuitem name="showInstalledMenuItem" action="showInstalledAction"/> + <separator/> + <menuitem name="syncMenuItem" action="syncAction"/> + <menuitem name="saveFlagsMenuItem" action="saveFlagsAction"/> + <separator/> + <menuitem name="pauseMenuItem" action="pauseAction"/> + <menuitem name="killMenuItem" action="killAction"/> + </menu> + <menu name="pluginMenu" action="pluginMenuAction"/> + <menu name="helpMenu" action="helpMenuAction"> + <menuitem name="aboutMenuItem" action="aboutAction"/> + <menuitem name="pluginsMenuItem" action="pluginsAction"/> + </menu> + </menubar> + <popup name="systrayPopup"> + <menuitem action="pauseAction"/> + <menuitem action="killAction"/> + <menuitem action="closeAction"/> + </popup> + <popup name="consolePopup"> + <menuitem name="copyMenuItem" action="copyAction"/> + <menuitem name="killMenuItem" action="killAction"/> + <menuitem name="pauseMenuItem" action="pauseAction"/> + </popup> + </ui> + </object> + <object class="GtkMenu" constructor="uimanager" id="systrayPopup"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </object> + <object class="GtkMenu" constructor="uimanager" id="consolePopup"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </object> + <object class="GtkWindow" id="MainWindow"> <property name="border_width">2</property> <property name="window_position">GTK_WIN_POS_CENTER</property> - <signal name="destroy" handler="cb_destroy"/> - <signal name="delete_event" handler="cb_delete"/> - <signal name="window_state_event" handler="cb_minimized"/> + <signal handler="cb_destroy" name="destroy"/> + <signal handler="cb_delete" name="delete_event"/> + <signal handler="cb_minimized" name="window_state_event"/> <child> - <widget class="GtkVBox" id="mainVB"> + <object class="GtkVBox" id="mainVB"> <property name="visible">True</property> <child> - <widget class="GtkMenuBar" id="menubar"> + <object class="GtkMenuBar" constructor="uimanager" id="menubar"> <property name="visible">True</property> - <child> - <widget class="GtkMenuItem" id="fileMenuItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_File</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="fileMenu"> - <property name="visible">True</property> - <child> - <widget class="GtkImageMenuItem" id="prefItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Preferences</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_preferences_clicked"/> - <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image8"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-preferences</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="reloadItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Re_load Portage</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_reload_clicked"/> - <accelerator key="F5" modifiers="" signal="activate"/> - <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image9"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-refresh</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem1"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="closeItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">gtk-quit</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <signal name="activate" handler="cb_close"/> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="emergeMenuItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Emerge</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="emergeMenu"> - <property name="visible">True</property> - <child> - <widget class="GtkImageMenuItem" id="emergeItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Install</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_package_emerge_clicked"/> - <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image10"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="stock">gtk-add</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="unmergeItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Uninstall</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_package_unmerge_clicked"/> - <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image11"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="stock">gtk-remove</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="updateItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Update _World</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_update_clicked"/> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="showUpdatesItem"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show Updatable P_ackages</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_show_updates_clicked"/> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="showInstalledItem"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show _Only Installed Packages</property> - <property name="use_underline">True</property> - <signal name="toggled" handler="cb_show_installed_toggled"/> - <accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem2"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="syncItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Sync</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_sync_clicked"/> - <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image12"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="stock">gtk-refresh</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="saveFlagsItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">Save _Flags</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_save_flags_clicked"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image13"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK</property> - <property name="stock">gtk-save</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkSeparatorMenuItem" id="separatormenuitem3"> - <property name="visible">True</property> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="pauseItemMenu"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Emerge _Paused</property> - <property name="use_underline">True</property> - <accelerator key="Z" modifiers="GDK_CONTROL_MASK" signal="activate"/> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="killItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Kill Emerge</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_kill_clicked"/> - <accelerator key="K" modifiers="GDK_CONTROL_MASK" signal="activate"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image14"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="hiddenConsoleMenu"> - <property name="sensitive">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Console</property> - <child> - <widget class="GtkMenu" id="consolePopup"> - <property name="visible">True</property> - <child> - <widget class="GtkImageMenuItem" id="copyItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Copy</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_copy_clicked"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image17"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-copy</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="killItemPopup"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Kill Emerge</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_kill_clicked"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image18"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkCheckMenuItem" id="pauseItemPopup"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Emerge _Paused</property> - <property name="use_underline">True</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="pluginMenuItem"> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Plu_gins</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="pluginMenu"> - <property name="visible">True</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkMenuItem" id="helpMenuItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_?</property> - <property name="use_underline">True</property> - <child> - <widget class="GtkMenu" id="helpMenu"> - <property name="visible">True</property> - <child> - <widget class="GtkImageMenuItem" id="aboutItem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_About</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_about_clicked"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image19"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-about</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="pluginsItem"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">_Plugins</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_plugins_clicked"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image20"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="stock">gtk-connect</property> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - </widget> + </object> <packing> <property name="expand">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="searchHB"> + <object class="GtkHBox" id="searchHB"> <property name="visible">True</property> <property name="border_width">3</property> <child> - <widget class="GtkEntry" id="searchEntry"> + <object class="GtkEntry" id="searchEntry"> <property name="visible">True</property> - <signal name="changed" handler="cb_search_changed"/> - <signal name="delete_text" handler="cb_search_changed"/> - <signal name="activate" handler="cb_search_clicked" object="searchEntry"/> - </widget> + <signal handler="cb_search_changed" name="changed"/> + <signal handler="cb_search_changed" name="delete_text"/> + <signal handler="cb_search_clicked" name="activate" object="searchEntry"/> + </object> <packing> <property name="padding">5</property> </packing> </child> <child> - <widget class="GtkButton" id="deleteSearchButton"> + <object class="GtkButton" id="deleteSearchButton"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">gtk-delete</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_delete_search_clicked"/> - </widget> + <signal handler="cb_delete_search_clicked" name="clicked"/> + </object> <packing> <property name="expand">False</property> <property name="padding">5</property> @@ -365,20 +254,19 @@ </packing> </child> <child> - <widget class="GtkButton" id="searchButton"> + <object class="GtkButton" id="searchButton"> <property name="visible">True</property> <property name="label" translatable="yes">gtk-find</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_search_clicked" object="searchEntry"/> - </widget> + <signal handler="cb_search_clicked" name="clicked" object="searchEntry"/> + </object> <packing> <property name="expand">False</property> <property name="padding">5</property> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -386,201 +274,195 @@ </packing> </child> <child> - <widget class="GtkVPaned" id="vpaned"> + <object class="GtkVPaned" id="vpaned"> <property name="visible">True</property> <property name="position">300</property> <child> - <widget class="GtkFrame" id="listFrame"> + <object class="GtkFrame" id="listFrame"> <property name="visible">True</property> <property name="label_xalign">0</property> <property name="label_yalign">0</property> <property name="shadow_type">GTK_SHADOW_IN</property> <child> - <widget class="GtkHBox" id="listHB"> + <object class="GtkHBox" id="listHB"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">5</property> <property name="homogeneous">True</property> <child> - <widget class="GtkScrolledWindow" id="catScroll"> + <object class="GtkScrolledWindow" id="catScroll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTreeView" id="catList"> + <object class="GtkTreeView" id="catList"> <property name="visible">True</property> <property name="search_column">0</property> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkScrolledWindow" id="pkgScroll"> + <object class="GtkScrolledWindow" id="pkgScroll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTreeView" id="pkgList"> + <object class="GtkTreeView" id="pkgList"> <property name="visible">True</property> <property name="search_column">0</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="versionScroll"> + <object class="GtkScrolledWindow" id="versionScroll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTreeView" id="versionList"> + <object class="GtkTreeView" id="versionList"> <property name="visible">True</property> <property name="search_column">1</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - <child> + <child type="label"> <placeholder/> - <packing> - <property name="type">label_item</property> - </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">False</property> </packing> </child> <child> - <widget class="GtkHPaned" id="hpaned"> + <object class="GtkHPaned" id="hpaned"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkVBox" id="packageVB"> + <object class="GtkVBox" id="packageVB"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkHBox" id="packageHeaderHB"> + <object class="GtkHBox" id="packageHeaderHB"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="nameLabel"> + <object class="GtkLabel" id="nameLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">label</property> <property name="ellipsize">PANGO_ELLIPSIZE_START</property> <property name="single_line_mode">True</property> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="pkgEmergeBtn"> + <object class="GtkButton" id="pkgEmergeBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">Install onto system</property> + <property name="tooltip-text" translatable="yes">Install onto system</property> <property name="relief">GTK_RELIEF_NONE</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_package_emerge_clicked"/> + <signal handler="cb_package_emerge_clicked" name="clicked"/> <child> - <widget class="GtkImage" id="image1"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-add</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="pkgUnmergeBtn"> + <object class="GtkButton" id="pkgUnmergeBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">Uninstall from system</property> + <property name="tooltip-text" translatable="yes">Uninstall from system</property> <property name="relief">GTK_RELIEF_NONE</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_package_unmerge_clicked"/> + <signal handler="cb_package_unmerge_clicked" name="clicked"/> <child> - <widget class="GtkImage" id="image4"> + <object class="GtkImage" id="image4"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-remove</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkButton" id="pkgRevertBtn"> + <object class="GtkButton" id="pkgRevertBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="tooltip" translatable="yes">Revert changes</property> + <property name="tooltip-text" translatable="yes">Revert changes</property> <property name="relief">GTK_RELIEF_NONE</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_package_revert_clicked"/> + <signal handler="cb_package_revert_clicked" name="clicked"/> <child> - <widget class="GtkImage" id="image5"> + <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-undo</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="padding">4</property> </packing> </child> <child> - <widget class="GtkNotebook" id="packageNotebook"> + <object class="GtkNotebook" id="packageNotebook"> <property name="visible">True</property> <property name="tab_pos">GTK_POS_BOTTOM</property> <property name="scrollable">True</property> <child> - <widget class="GtkScrolledWindow" id="generalScroll"> + <object class="GtkScrolledWindow" id="generalScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkViewport" id="generalVB"> + <object class="GtkViewport" id="generalVB"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="resize_mode">GTK_RESIZE_QUEUE</property> <property name="shadow_type">GTK_SHADOW_NONE</property> <child> - <widget class="GtkTable" id="generalTable"> + <object class="GtkTable" id="generalTable"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">6</property> @@ -595,103 +477,103 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="licenseLabel"> + <object class="GtkLabel" id="licenseLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">label</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="licenseLabelLabel"> + <object class="GtkLabel" id="licenseLabelLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>License:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> <property name="y_padding">5</property> </packing> </child> <child> - <widget class="GtkLabel" id="notInSysLabel"> + <object class="GtkLabel" id="notInSysLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="label" translatable="yes"><b>Installed, but not in portage anymore</b></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="missingLabel"> + <object class="GtkLabel" id="missingLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="label" translatable="yes"><span foreground='red'><b>MISSING KEYWORD</b></span></property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkHBox" id="linkBox"> + <object class="GtkHBox" id="linkBox"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">5</property> <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="descLabelLabel"> + <object class="GtkLabel" id="descLabelLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Description:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> <property name="y_padding">5</property> </packing> </child> <child> - <widget class="GtkLabel" id="overlayLabelLabel"> + <object class="GtkLabel" id="overlayLabelLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> @@ -699,136 +581,133 @@ <property name="label" translatable="yes"><b>Overlay:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> <property name="y_padding">5</property> </packing> </child> <child> - <widget class="GtkLabel" id="descLabel"> + <object class="GtkLabel" id="descLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="label" translatable="yes">label</property> <property name="wrap">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="overlayLabel"> + <object class="GtkLabel" id="overlayLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">label</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="homepageLinkLabel"> + <object class="GtkLabel" id="homepageLinkLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="label" translatable="yes"><b>Homepage:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> <property name="y_padding">5</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="installedCheck"> + <object class="GtkCheckButton" id="installedCheck"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Installed</property> <property name="xalign">0</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="button_press_event" handler="cb_button_pressed"/> - </widget> + <signal handler="cb_button_pressed" name="button_press_event"/> + </object> <packing> <property name="top_attach">6</property> <property name="bottom_attach">7</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkCheckButton" id="maskedCheck"> + <object class="GtkCheckButton" id="maskedCheck"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Masked</property> <property name="xalign">0</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="cb_masked_toggled"/> - </widget> + <signal handler="cb_masked_toggled" name="toggled"/> + </object> <packing> <property name="top_attach">8</property> <property name="bottom_attach">9</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="maskedLabel"> + <object class="GtkLabel" id="maskedLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">8</property> <property name="bottom_attach">9</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkCheckButton" id="testingCheck"> + <object class="GtkCheckButton" id="testingCheck"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> <property name="label" translatable="yes">Testing</property> <property name="xalign">0</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="cb_testing_toggled"/> - </widget> + <signal handler="cb_testing_toggled" name="toggled"/> + </object> <packing> <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> - <widget class="GtkLabel" id="useFlagsLabelLabel"> + <object class="GtkLabel" id="useFlagsLabelLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> @@ -836,17 +715,17 @@ <property name="label" translatable="yes"><b>Use Flags:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> <property name="y_padding">5</property> </packing> </child> <child> - <widget class="GtkLabel" id="useFlagsLabel"> + <object class="GtkLabel" id="useFlagsLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="no_show_all">True</property> @@ -854,33 +733,32 @@ <property name="label">use flags</property> <property name="ellipsize">PANGO_ELLIPSIZE_END</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label"> + <child type="tab"> + <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="label" translatable="yes">General</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="useListScroll"> + <object class="GtkScrolledWindow" id="useListScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -889,25 +767,21 @@ <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">1</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label20"> + <child type="tab"> + <object class="GtkLabel" id="label20"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Use List</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="dependencyScroll"> + <object class="GtkScrolledWindow" id="dependencyScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -916,25 +790,21 @@ <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">2</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="tab"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Dependencies</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">2</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="ebuildScroll"> + <object class="GtkScrolledWindow" id="ebuildScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -943,25 +813,21 @@ <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">3</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label16"> + <child type="tab"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Ebuild</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">3</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="changelogScroll"> + <object class="GtkScrolledWindow" id="changelogScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -970,25 +836,21 @@ <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">4</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label14"> + <child type="tab"> + <object class="GtkLabel" id="label14"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Changelog</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">4</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="filesScroll"> + <object class="GtkScrolledWindow" id="filesScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> @@ -997,129 +859,121 @@ <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">5</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label2"> + <child type="tab"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Files</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">5</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">False</property> </packing> </child> <child> - <widget class="GtkNotebook" id="systemNotebook"> + <object class="GtkNotebook" id="systemNotebook"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="tab_pos">GTK_POS_BOTTOM</property> <property name="scrollable">True</property> <child> - <widget class="GtkVBox" id="queueVB"> + <object class="GtkVBox" id="queueVB"> <property name="visible">True</property> <child> - <widget class="GtkHButtonBox" id="queueBB"> + <object class="GtkHButtonBox" id="queueBB"> <property name="visible">True</property> <property name="border_width">5</property> <property name="homogeneous">True</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <child> - <widget class="GtkButton" id="executeBtn"> + <object class="GtkButton" id="executeBtn"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Execute the current selected queue</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_execute_clicked"/> + <property name="tooltip-text" translatable="yes">Execute the current selected queue</property> + <signal handler="cb_execute_clicked" name="clicked"/> <child> - <widget class="GtkHBox" id="hbox7"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkImage" id="image6"> + <object class="GtkImage" id="image6"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-execute</property> - </widget> + </object> </child> <child> - <widget class="GtkLabel" id="label12"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="label" translatable="yes">E_xecute</property> <property name="use_underline">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkButton" id="updateBtn"> + <object class="GtkButton" id="updateBtn"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Calculate the packages which will be installed during an "update world"</property> + <property name="tooltip-text" translatable="yes">Calculate the packages which will be installed during an "update world"</property> <property name="label" translatable="yes">Update _World</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_update_clicked"/> - </widget> + <signal handler="cb_update_clicked" name="clicked"/> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="removeBtn"> + <object class="GtkButton" id="removeBtn"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Remove the selected package from the queue</property> + <property name="tooltip-text" translatable="yes">Remove the selected package from the queue</property> <property name="label" translatable="yes">_Remove</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_remove_clicked"/> - </widget> + <signal handler="cb_remove_clicked" name="clicked"/> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="homogeneous">True</property> <child> - <widget class="GtkCheckButton" id="oneshotCB"> + <object class="GtkCheckButton" id="oneshotCB"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="label">--oneshot</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="padding">5</property> </packing> @@ -1130,49 +984,48 @@ <child> <placeholder/> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="queueScroll"> + <object class="GtkScrolledWindow" id="queueScroll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTreeView" id="queueList"> + <object class="GtkTreeView" id="queueList"> <property name="visible">True</property> <property name="has_tooltip">True</property> <property name="headers_visible">False</property> <property name="enable_search">False</property> - <signal name="button_press_event" handler="cb_right_click"/> - <signal name="query_tooltip" handler="cb_queue_tooltip_queried"/> - <signal name="row_activated" handler="cb_queue_row_activated"/> - </widget> + <signal handler="cb_right_click" name="button_press_event"/> + <signal handler="cb_queue_tooltip_queried" name="query_tooltip"/> + <signal handler="cb_queue_row_activated" name="row_activated"/> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label17"> + <child type="tab"> + <object class="GtkLabel" id="label17"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Queue</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkHBox" id="termHB"> + <object class="GtkHBox" id="termHB"> <property name="visible">True</property> <child> <placeholder/> @@ -1180,96 +1033,88 @@ <child> <placeholder/> </child> - </widget> - <packing> - <property name="position">1</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label18"> + <child type="tab"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Console</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="logScroll"> + <object class="GtkScrolledWindow" id="logScroll"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTextView" id="logView"> + <object class="GtkTextView" id="logView"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="editable">False</property> <property name="wrap_mode">GTK_WRAP_WORD</property> <property name="cursor_visible">False</property> - </widget> + </object> </child> - </widget> - <packing> - <property name="position">2</property> - </packing> + </object> </child> - <child> - <widget class="GtkLabel" id="label19"> + <child type="tab"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Log</property> - </widget> + </object> <packing> - <property name="type">tab</property> <property name="position">2</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">True</property> </packing> </child> - </widget> + </object> <packing> <property name="resize">True</property> <property name="shrink">True</property> </packing> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment4"> + <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="top_padding">5</property> <child> - <widget class="GtkLabel" id="statusLabel"> + <object class="GtkLabel" id="statusLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="label">Portato - A Portage GUI</property> <property name="single_line_mode">True</property> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/PluginWindow.glade b/portato/gui/templates/PluginWindow.ui index f76193e..8cac2cb 100644 --- a/portato/gui/templates/PluginWindow.glade +++ b/portato/gui/templates/PluginWindow.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.5 on Fri Jul 4 15:24:27 2008 --> -<glade-interface> - <widget class="GtkWindow" id="PluginWindow"> +<interface> + <object class="GtkWindow" id="PluginWindow"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> <property name="title" translatable="yes">Plugins</property> @@ -14,78 +13,74 @@ <property name="skip_pager_hint">True</property> <property name="urgency_hint">True</property> <child> - <widget class="GtkVBox" id="vbox5"> + <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">5</property> <child> - <widget class="GtkScrolledWindow" id="pluginListScroll"> + <object class="GtkScrolledWindow" id="pluginListScroll"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> <property name="vscrollbar_policy">GTK_POLICY_NEVER</property> <child> - <widget class="GtkTreeView" id="pluginList"> + <object class="GtkTreeView" id="pluginList"> <property name="visible">True</property> <property name="headers_visible">False</property> <property name="rules_hint">True</property> <property name="enable_search">False</property> - </widget> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkFrame" id="frame1"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="label_xalign">0</property> <child> - <widget class="GtkTable" id="table1"> + <object class="GtkTable" id="table1"> <property name="visible">True</property> <property name="n_rows">4</property> <property name="n_columns">2</property> <property name="row_spacing">10</property> <child> - <widget class="GtkButton" id="installBtn"> + <object class="GtkButton" id="installBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="label" translatable="yes">_Install dependencies</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_install_clicked"/> - </widget> + <signal handler="cb_install_clicked" name="clicked"/> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options"/> <property name="x_padding">10</property> </packing> </child> <child> - <widget class="GtkExpander" id="depExpander"> + <object class="GtkExpander" id="depExpander"> <property name="visible">True</property> <property name="can_focus">True</property> <child> - <widget class="GtkTreeView" id="depList"> + <object class="GtkTreeView" id="depList"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <property name="headers_clickable">True</property> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label4"> + <child type="label"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="label" translatable="yes">Needed dependencies</property> <property name="single_line_mode">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> @@ -93,10 +88,10 @@ </packing> </child> <child> - <widget class="GtkLabel" id="descrLabel"> + <object class="GtkLabel" id="descrLabel"> <property name="visible">True</property> <property name="label" translatable="yes">label</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="y_options">GTK_FILL</property> @@ -104,12 +99,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Author:</b></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -117,12 +112,12 @@ </packing> </child> <child> - <widget class="GtkLabel" id="authorLabel"> + <object class="GtkLabel" id="authorLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">label</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -132,62 +127,58 @@ </packing> </child> <child> - <widget class="GtkHButtonBox" id="buttonBox"> + <object class="GtkHButtonBox" id="buttonBox"> <property name="visible">True</property> <property name="spacing">5</property> <property name="homogeneous">True</property> <property name="layout_style">GTK_BUTTONBOX_EDGE</property> <child> - <widget class="GtkRadioButton" id="enabledRB"> + <object class="GtkRadioButton" id="enabledRB"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Enabled</property> - <property name="response_id">0</property> <property name="active">True</property> - <signal name="toggled" handler="cb_state_toggled"/> - </widget> + <signal handler="cb_state_toggled" name="toggled"/> + </object> </child> <child> - <widget class="GtkRadioButton" id="tempEnabledRB"> + <object class="GtkRadioButton" id="tempEnabledRB"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Temporarily enabled</property> - <property name="response_id">0</property> <property name="group">enabledRB</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="tempDisabledRB"> + <object class="GtkRadioButton" id="tempDisabledRB"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Temporarily disabled</property> - <property name="response_id">0</property> <property name="group">enabledRB</property> - <signal name="toggled" handler="cb_state_toggled"/> - </widget> + <signal handler="cb_state_toggled" name="toggled"/> + </object> <packing> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="disabledRB"> + <object class="GtkRadioButton" id="disabledRB"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Disabled</property> - <property name="response_id">0</property> <property name="group">enabledRB</property> - <signal name="toggled" handler="cb_state_toggled"/> - </widget> + <signal handler="cb_state_toggled" name="toggled"/> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">3</property> </packing> </child> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">3</property> @@ -195,59 +186,54 @@ <property name="y_options">GTK_FILL</property> </packing> </child> - </widget> + </object> </child> - <child> + <child type="label"> <placeholder/> - <packing> - <property name="type">label_item</property> - </packing> </child> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox2"> + <object class="GtkHButtonBox" id="hbuttonbox2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="homogeneous">True</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <child> - <widget class="GtkButton" id="cancelBtn"> + <object class="GtkButton" id="cancelBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="close"/> - </widget> + <signal handler="close" name="clicked"/> + </object> </child> <child> - <widget class="GtkButton" id="okBtn"> + <object class="GtkButton" id="okBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">gtk-apply</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_ok_clicked"/> - </widget> + <signal handler="cb_ok_clicked" name="clicked"/> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/PreferenceWindow.glade b/portato/gui/templates/PreferenceWindow.ui index 5fe6a46..0642e02 100644 --- a/portato/gui/templates/PreferenceWindow.glade +++ b/portato/gui/templates/PreferenceWindow.ui @@ -1,132 +1,272 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.5 on Mon Nov 24 21:13:06 2008 --> -<glade-interface> - <widget class="GtkWindow" id="PreferenceWindow"> +<?xml version="1.0"?> +<interface> + <requires lib="gtk+" version="2.14"/> + <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">300</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkWindow" id="PreferenceWindow"> <property name="border_width">5</property> <property name="title" translatable="yes">Preferences</property> <property name="modal">True</property> - <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> + <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <property name="skip_taskbar_hint">True</property> <signal name="configure_event" handler="cb_size_changed"/> <child> - <widget class="GtkVBox" id="mainVB"> + <object class="GtkVBox" id="mainVB"> <property name="visible">True</property> <property name="spacing">5</property> <child> - <widget class="GtkNotebook" id="notebook2"> + <object class="GtkNotebook" id="notebook2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkVBox" id="vbox2"> + <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> <child> - <widget class="GtkFrame" id="generalFrame"> + <object class="GtkFrame" id="generalFrame"> <property name="visible">True</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="top_padding">5</property> <property name="bottom_padding">5</property> <property name="left_padding">12</property> <property name="right_padding">5</property> <child> - <widget class="GtkVBox" id="generalVB"> + <object class="GtkVBox" id="generalVB"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="debugCheck"> - <property name="visible">True</property> + <object class="GtkCheckButton" id="debugCheck"> <property name="label" translatable="yes">Debug</property> - <property name="response_id">0</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkHBox" id="hbox3"> + <object class="GtkCheckButton" id="searchOnTypeCheck"> + <property name="label" translatable="yes">Search while typing</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="yalign">0.47999998927116394</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkLabel" id="browserLabel"> + <object class="GtkLabel" id="browserLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Browser command: </property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="browserEdit"> + <object class="GtkEntry" id="browserEdit"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label1"> + <child type="label"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="label" translatable="yes"><b>General Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="updateFrame"> + <object class="GtkFrame" id="databaseFrame"> <property name="visible">True</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment11"> <property name="visible">True</property> <property name="top_padding">5</property> <property name="bottom_padding">5</property> <property name="left_padding">12</property> + <property name="right_padding">5</property> <child> - <widget class="GtkVBox" id="updateVB"> + <object class="GtkVBox" id="databaseVB"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="deepCheck"> + <object class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label17"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Used database type</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="databaseCombo"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <signal name="changed" handler="cb_db_combo_changed"/> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkAlignment" id="alignment13"> + <property name="visible">True</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">12</property> + <child> + <object class="GtkLabel" id="dbDescriptionLabel"> + <property name="visible">True</property> + <property name="label" translatable="yes">label</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label25"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Description</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label16"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Database Options</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + <child type="tab"> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">General</property> + </object> + <packing> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox5"> + <property name="visible">True</property> + <child> + <object class="GtkFrame" id="updateFrame"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">12</property> + <child> + <object class="GtkVBox" id="updateVB"> + <property name="visible">True</property> + <child> + <object class="GtkCheckButton" id="deepCheck"> <property name="label">--deep</property> - <property name="response_id">0</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="newUseCheck"> - <property name="visible">True</property> + <object class="GtkCheckButton" id="newUseCheck"> <property name="label">--newuse</property> - <property name="response_id">0</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> @@ -134,148 +274,131 @@ </packing> </child> <child> - <widget class="GtkFrame" id="setFrame"> + <object class="GtkFrame" id="setFrame"> <property name="no_show_all">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkAlignment" id="alignment4"> + <object class="GtkAlignment" id="alignment4"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> <property name="right_padding">10</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkTreeView" id="setList"> + <object class="GtkTreeView" id="setList"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="headers_visible">False</property> <property name="rules_hint">True</property> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label12"> + <child type="label"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Package sets to update</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label4"> + <child type="label"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Update World Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="syncFrame"> + <object class="GtkFrame" id="syncFrame"> <property name="visible">True</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment5"> + <object class="GtkAlignment" id="alignment5"> <property name="visible">True</property> <property name="top_padding">5</property> <property name="bottom_padding">5</property> <property name="left_padding">12</property> <property name="right_padding">5</property> <child> - <widget class="GtkHBox" id="syncHB"> + <object class="GtkHBox" id="syncHB"> <property name="visible">True</property> <child> - <widget class="GtkLabel" id="syncLabel"> + <object class="GtkLabel" id="syncLabel"> <property name="visible">True</property> <property name="label" translatable="yes">Sync command: </property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkEntry" id="syncCommandEdit"> + <object class="GtkEntry" id="syncCommandEdit"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label6"> + <child type="label"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Sync Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <widget class="GtkFrame" id="keywordFrame"> + <object class="GtkFrame" id="keywordFrame"> <property name="visible">True</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment3"> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> <property name="top_padding">5</property> <property name="bottom_padding">5</property> <property name="left_padding">12</property> <property name="right_padding">5</property> <child> - <widget class="GtkTable" id="keywordTable"> + <object class="GtkTable" id="keywordTable"> <property name="visible">True</property> <property name="n_rows">10</property> <property name="n_columns">2</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkEntry" id="useFileEdit"> + <object class="GtkEntry" id="useFileEdit"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -284,24 +407,25 @@ </packing> </child> <child> - <widget class="GtkLabel" id="useEditLabel"> + <object class="GtkLabel" id="useEditLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">File name to use, if package.use is a directory: </property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="usePerVersionCheck"> - <property name="visible">True</property> + <object class="GtkCheckButton" id="usePerVersionCheck"> <property name="label" translatable="yes">Add only exact version to package.use</property> - <property name="response_id">0</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">2</property> @@ -309,12 +433,13 @@ </packing> </child> <child> - <widget class="GtkCheckButton" id="testPerVersionCheck"> - <property name="visible">True</property> + <object class="GtkCheckButton" id="testPerVersionCheck"> <property name="label" translatable="yes">Add only exact version to package.keywords</property> - <property name="response_id">0</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> @@ -322,21 +447,21 @@ </packing> </child> <child> - <widget class="GtkLabel" id="testEditLabel"> + <object class="GtkLabel" id="testEditLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">File name to use, if package.keywords is a directory: </property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">6</property> <property name="bottom_attach">7</property> </packing> </child> <child> - <widget class="GtkEntry" id="testFileEdit"> + <object class="GtkEntry" id="testFileEdit"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -345,9 +470,9 @@ </packing> </child> <child> - <widget class="GtkEntry" id="maskFileEdit"> + <object class="GtkEntry" id="maskFileEdit"> <property name="visible">True</property> - </widget> + </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> @@ -356,24 +481,25 @@ </packing> </child> <child> - <widget class="GtkLabel" id="maskEditLabel"> + <object class="GtkLabel" id="maskEditLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">File name to use, if package.mask/package.unmask is a directory: </property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">9</property> <property name="bottom_attach">10</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="maskPerVersionCheck"> - <property name="visible">True</property> + <object class="GtkCheckButton" id="maskPerVersionCheck"> <property name="label" translatable="yes">Add only exact version to package.mask/package.unmask</property> - <property name="response_id">0</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="right_attach">2</property> <property name="top_attach">8</property> @@ -381,15 +507,15 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="hintEB"> + <object class="GtkEventBox" id="hintEB"> <property name="visible">True</property> <child> - <widget class="GtkFrame" id="hintFrame"> + <object class="GtkFrame" id="hintFrame"> <property name="visible">True</property> <property name="label_xalign">0</property> - <property name="shadow_type">GTK_SHADOW_OUT</property> + <property name="shadow_type">out</property> <child> - <widget class="GtkLabel" id="hintLabel"> + <object class="GtkLabel" id="hintLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes"><u>You may use the following placeholders:</u> @@ -399,30 +525,27 @@ <i>$(cat-1)/$(cat-2)</i>: first/second part of the category <i>$(version)</i> : version of the package</property> <property name="use_markup">True</property> - </widget> + </object> </child> - <child> + <child type="label_item"> <placeholder/> - <packing> - <property name="type">label_item</property> - </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> <property name="right_attach">2</property> </packing> </child> <child> - <widget class="GtkLabel" id="useLabel"> + <object class="GtkLabel" id="useLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes"><u><i>Use-Flags</i></u></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> @@ -430,14 +553,14 @@ </packing> </child> <child> - <widget class="GtkLabel" id="testLabel"> + <object class="GtkLabel" id="testLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes"><u><i>Testing Keywords</i></u></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> @@ -445,179 +568,169 @@ </packing> </child> <child> - <widget class="GtkLabel" id="maskLabel"> + <object class="GtkLabel" id="maskLabel"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="label" translatable="yes"><u><i>Masking Keywords</i></u></property> <property name="use_markup">True</property> <property name="single_line_mode">True</property> - </widget> + </object> <packing> <property name="top_attach">7</property> <property name="bottom_attach">8</property> <property name="y_padding">5</property> </packing> </child> - </widget> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label5"> + <child type="label"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="label" translatable="yes"><b>Use Flag and Keyword Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">1</property> + </packing> </child> - <child> - <widget class="GtkLabel" id="label7"> + <child type="tab"> + <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">General</property> - </widget> + <property name="label" translatable="yes">Portage</property> + </object> <packing> - <property name="type">tab</property> + <property name="position">1</property> <property name="tab_fill">False</property> </packing> </child> <child> - <widget class="GtkAlignment" id="alignment6"> + <object class="GtkAlignment" id="alignment6"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="top_padding">5</property> <property name="left_padding">12</property> <property name="right_padding">12</property> <child> - <widget class="GtkVBox" id="vbox4"> + <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkFrame" id="visualGeneralFrame"> + <object class="GtkFrame" id="visualGeneralFrame"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment8"> + <object class="GtkAlignment" id="alignment8"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="top_padding">5</property> <property name="bottom_padding">5</property> <property name="left_padding">12</property> <child> - <widget class="GtkVBox" id="vbox6"> + <object class="GtkVBox" id="vbox6"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkCheckButton" id="systrayCheck"> + <object class="GtkCheckButton" id="systrayCheck"> + <property name="label" translatable="yes">Enable systray</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Enable systray</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="titleUpdateCheck"> + <object class="GtkCheckButton" id="titleUpdateCheck"> + <property name="label" translatable="yes">Show emerge progress in window title</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show emerge progress in window title</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="consoleUpdateCheck"> + <object class="GtkCheckButton" id="consoleUpdateCheck"> + <property name="label" translatable="yes">Show emerge progress in console title</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show emerge progress in console title</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">2</property> </packing> </child> <child> - <widget class="GtkCheckButton" id="minimizeCheck"> + <object class="GtkCheckButton" id="minimizeCheck"> + <property name="label" translatable="yes">Hide on minimization (only if systray is enabled)</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Hide on minimization (only if systray is enabled)</property> - <property name="response_id">0</property> <property name="draw_indicator">True</property> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">3</property> </packing> </child> - <child> - <widget class="GtkCheckButton" id="searchOnTypeCheck"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="tooltip_markup">Update the package list with the current search results while you are typing. -<b>Note</b>: Will slow down the typing process.</property> - <property name="label" translatable="yes">Search while typing</property> - <property name="yalign">0.47999998927116394</property> - <property name="response_id">-3</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="position">4</property> - </packing> - </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label3"> + <child type="label"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes"><b>General Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> + <property name="position">0</property> </packing> </child> <child> - <widget class="GtkFrame" id="consoleFrame"> + <object class="GtkFrame" id="tabFrame"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment9"> + <object class="GtkAlignment" id="alignment10"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="top_padding">5</property> @@ -625,97 +738,95 @@ <property name="left_padding">12</property> <property name="right_padding">5</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">5</property> <child> - <widget class="GtkHBox" id="hbox1"> + <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="spacing">5</property> + <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Console Font</property> - <property name="single_line_mode">True</property> - </widget> + <property name="label" translatable="yes">Package Tabs</property> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkFontButton" id="consoleFontBtn"> + <object class="GtkComboBox" id="packageTabCombo"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="response_id">0</property> - <property name="title" translatable="yes">Chose a console font</property> - <property name="use_font">True</property> - <property name="use_size">True</property> - <property name="show_style">False</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox"> + <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label21"> <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum length of the console title</property> - <property name="single_line_mode">True</property> - </widget> + <property name="label" translatable="yes">System Tabs</property> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkSpinButton" id="titleLengthSpinBtn"> + <object class="GtkComboBox" id="systemTabCombo"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">0 0 300 1 10 10</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - </widget> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> - <property name="padding">4</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label8"> + <child type="label"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes"><b>Console Options</b></property> + <property name="label" translatable="yes"><b>Tab Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkFrame" id="tabFrame"> + <object class="GtkFrame" id="packageFrame"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment10"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="top_padding">5</property> @@ -723,91 +834,164 @@ <property name="left_padding">12</property> <property name="right_padding">5</property> <child> - <widget class="GtkVBox" id="vbox7"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="spacing">5</property> <child> - <widget class="GtkHBox" id="hbox2"> + <object class="GtkCheckButton" id="showSlotsCheck"> + <property name="label" translatable="yes">Show slots in the version list</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="homogeneous">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="collapseCatCheck"> + <property name="label" translatable="yes">Collapse categories with same prefix</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup">Organize the categories in a tree. Thereby collapse categories with the same prefix: +As an example: <i>app-admin</i>, <i>app-emacs</i>, and <i>app-vim</i> would be collapsed into <i><b>app</b></i> as root and <i>admin</i>, <i>emacs</i>, and <i>vim</i> as children.</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes"><b>Package Options</b></property> + <property name="use_markup">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="consoleFrame"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label_xalign">0</property> + <child> + <object class="GtkAlignment" id="alignment9"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">12</property> + <property name="right_padding">5</property> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">5</property> <child> - <widget class="GtkLabel" id="label15"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Package Tabs</property> - </widget> + <property name="label" translatable="yes">Console Font</property> + <property name="single_line_mode">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkComboBox" id="packageTabCombo"> + <object class="GtkFontButton" id="consoleFontBtn"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="items" translatable="yes"></property> - </widget> + <property name="title" translatable="yes">Chose a console font</property> + <property name="use_font">True</property> + <property name="use_size">True</property> + <property name="show_style">False</property> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHBox" id="hbox4"> + <object class="GtkHBox" id="hbox"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="homogeneous">True</property> <child> - <widget class="GtkLabel" id="label21"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> - <property name="label" translatable="yes">System Tabs</property> - </widget> + <property name="label" translatable="yes">Maximum length of the console title</property> + <property name="single_line_mode">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkComboBox" id="systemTabCombo"> + <object class="GtkSpinButton" id="titleLengthSpinBtn"> <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="items" translatable="yes"></property> - </widget> + <property name="can_focus">True</property> + <property name="adjustment">adjustment1</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> + <property name="padding">4</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label9"> + <child type="label"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes"><b>Tab Options</b></property> + <property name="label" translatable="yes"><b>Console Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> - <widget class="GtkFrame" id="packageFrame"> + <object class="GtkFrame" id="colorFrame"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label_xalign">0</property> <child> - <widget class="GtkAlignment" id="alignment7"> + <object class="GtkAlignment" id="alignment12"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="top_padding">5</property> @@ -815,109 +999,156 @@ <property name="left_padding">12</property> <property name="right_padding">5</property> <child> - <widget class="GtkVBox" id="vbox3"> + <object class="GtkVBox" id="vbox8"> <property name="visible">True</property> <child> - <widget class="GtkCheckButton" id="showSlotsCheck"> + <object class="GtkHBox" id="hbox7"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Show slots in the version list</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - </widget> + <property name="spacing">5</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Package Detail Background</property> + <property name="single_line_mode">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="pkgTableColorBtn"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="color">#000000000000</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkCheckButton" id="collapseCatCheck"> + <object class="GtkHBox" id="hbox6"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_markup">Organize the categories in a tree. Thereby collapse categories with the same prefix: -As an example: <i>app-admin</i>, <i>app-emacs</i>, and <i>app-vim</i> would be collapsed into <i><b>app</b></i> as root and <i>admin</i>, <i>emacs</i>, and <i>vim</i> as children.</property> - <property name="label" translatable="yes">Collapse categories with same prefix</property> - <property name="response_id">0</property> - <property name="draw_indicator">True</property> - </widget> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">5</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Flag Placeholder Description Background</property> + <property name="single_line_mode">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkColorButton" id="prefColorBtn"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="color">#000000000000</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - <child> - <widget class="GtkLabel" id="label14"> + <child type="label"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes"><b>Package Options</b></property> + <property name="label" translatable="yes"><b>Color Options</b></property> <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> + </object> </child> - </widget> + </object> <packing> <property name="expand">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> <packing> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label10"> + <child type="tab"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Visual</property> - </widget> + </object> <packing> - <property name="type">tab</property> - <property name="position">1</property> + <property name="position">2</property> <property name="tab_fill">False</property> </packing> </child> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkHButtonBox" id="buttonBox"> + <object class="GtkHButtonBox" id="buttonBox"> <property name="visible">True</property> <property name="homogeneous">True</property> - <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> + <property name="layout_style">spread</property> <child> - <widget class="GtkButton" id="cancelBtn"> - <property name="visible">True</property> + <object class="GtkButton" id="cancelBtn"> <property name="label" translatable="yes">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> - <property name="response_id">0</property> <signal name="clicked" handler="cb_cancel_clicked"/> - </widget> + </object> + <packing> + <property name="position">0</property> + </packing> </child> <child> - <widget class="GtkButton" id="okBtn"> - <property name="visible">True</property> + <object class="GtkButton" id="okBtn"> <property name="label" translatable="yes">gtk-apply</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="receives_default">False</property> <property name="use_stock">True</property> <property name="yalign">0.51999998092651367</property> - <property name="response_id">0</property> <signal name="clicked" handler="cb_ok_clicked"/> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">6</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/SearchWindow.glade b/portato/gui/templates/SearchWindow.ui index f6760c9..f5ba012 100644 --- a/portato/gui/templates/SearchWindow.glade +++ b/portato/gui/templates/SearchWindow.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.1 on Fri Feb 29 00:01:28 2008 --> -<glade-interface> - <widget class="GtkWindow" id="SearchWindow"> +<interface> + <object class="GtkWindow" id="SearchWindow"> <property name="width_request">350</property> <property name="height_request">250</property> <property name="title" translatable="yes">Search Results</property> @@ -11,84 +10,81 @@ <property name="destroy_with_parent">True</property> <property name="skip_taskbar_hint">True</property> <child> - <widget class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTreeView" id="searchList"> + <object class="GtkTreeView" id="searchList"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="headers_visible">False</property> <property name="rules_hint">True</property> - <signal name="row_activated" handler="ok"/> - </widget> + <signal handler="ok" name="row_activated"/> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkHButtonBox" id="hbuttonbox3"> + <object class="GtkHButtonBox" id="hbuttonbox3"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="homogeneous">True</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <child> - <widget class="GtkButton" id="cancelBtn"> + <object class="GtkButton" id="cancelBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">gtk-cancel</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="close"/> - </widget> + <signal handler="close" name="clicked"/> + </object> </child> <child> - <widget class="GtkButton" id="jumpBtn"> + <object class="GtkButton" id="jumpBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">gtk-jump-to</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="jump"/> - </widget> + <signal handler="jump" name="clicked"/> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="okBtn"> + <object class="GtkButton" id="okBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">gtk-ok</property> <property name="use_stock">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="ok"/> - </widget> + <signal handler="ok" name="clicked"/> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/SplashScreen.glade b/portato/gui/templates/SplashScreen.ui index 79e27bf..4529fcc 100644 --- a/portato/gui/templates/SplashScreen.glade +++ b/portato/gui/templates/SplashScreen.ui @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.1 on Fri Feb 29 00:02:46 2008 --> -<glade-interface> - <widget class="GtkWindow" id="SplashScreen"> +<interface> + <object class="GtkWindow" id="SplashScreen"> <property name="width_request">300</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="resizable">False</property> @@ -13,7 +12,7 @@ <property name="decorated">False</property> <property name="deletable">False</property> <child> - <widget class="GtkAlignment" id="alignment7"> + <object class="GtkAlignment" id="alignment7"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="top_padding">20</property> @@ -21,41 +20,41 @@ <property name="left_padding">20</property> <property name="right_padding">20</property> <child> - <widget class="GtkVBox" id="vbox3"> + <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> - <widget class="GtkImage" id="image"> + <object class="GtkImage" id="image"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock">gtk-missing-image</property> - </widget> + </object> </child> <child> - <widget class="GtkLabel" id="generalLabel"> + <object class="GtkLabel" id="generalLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label">label</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkLabel" id="descrLabel"> + <object class="GtkLabel" id="descrLabel"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label">label</property> <property name="use_markup">True</property> - </widget> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/UpdateWindow.glade b/portato/gui/templates/UpdateWindow.ui index 2bf712e..69b668d 100644 --- a/portato/gui/templates/UpdateWindow.glade +++ b/portato/gui/templates/UpdateWindow.ui @@ -1,94 +1,90 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<?xml version="1.0"?> <!--Generated with glade3 3.4.4 on Thu May 15 21:45:30 2008 --> -<glade-interface> - <widget class="GtkWindow" id="UpdateWindow"> +<interface> + <object class="GtkWindow" id="UpdateWindow"> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="title" translatable="yes">Updatable Packages</property> <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property> <property name="destroy_with_parent">True</property> <property name="urgency_hint">True</property> - <signal name="realize" handler="cb_set_size"/> + <signal handler="cb_set_size" name="realize"/> <child> - <widget class="GtkVBox" id="mainVB"> + <object class="GtkVBox" id="mainVB"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="spacing">5</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> <child> - <widget class="GtkTreeView" id="packageList"> + <object class="GtkTreeView" id="packageList"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="headers_visible">False</property> <property name="reorderable">True</property> <property name="rules_hint">True</property> - <signal name="cursor_changed" handler="cb_package_selected"/> - </widget> + <signal handler="cb_package_selected" name="cursor_changed"/> + </object> </child> - </widget> + </object> </child> <child> - <widget class="GtkHButtonBox" id="updateBB"> + <object class="GtkHButtonBox" id="updateBB"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="homogeneous">True</property> <property name="layout_style">GTK_BUTTONBOX_SPREAD</property> <child> - <widget class="GtkButton" id="closeBtn"> + <object class="GtkButton" id="closeBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">_Close</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="close"/> - </widget> + <signal handler="close" name="clicked"/> + </object> </child> <child> - <widget class="GtkButton" id="selectAllBtn"> + <object class="GtkButton" id="selectAllBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Select _All</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_select_all_clicked"/> - </widget> + <signal handler="cb_select_all_clicked" name="clicked"/> + </object> <packing> <property name="position">1</property> </packing> </child> <child> - <widget class="GtkButton" id="installBtn"> + <object class="GtkButton" id="installBtn"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">_Install Selected</property> <property name="use_underline">True</property> - <property name="response_id">0</property> - <signal name="clicked" handler="cb_install_clicked"/> - </widget> + <signal handler="cb_install_clicked" name="clicked"/> + </object> <packing> <property name="position">2</property> </packing> </child> - </widget> + </object> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - </widget> + </object> </child> - </widget> -</glade-interface> + </object> +</interface> diff --git a/portato/gui/templates/popups.glade b/portato/gui/templates/popups.glade deleted file mode 100644 index 63169c3..0000000 --- a/portato/gui/templates/popups.glade +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> -<!--Generated with glade3 3.4.4 on Mon Jun 9 20:49:26 2008 --> -<glade-interface> - <widget class="GtkMenu" id="systrayPopup"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <widget class="GtkCheckMenuItem" id="pauseItemTray"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Emerge _Paused</property> - <property name="use_underline">True</property> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="killItemTray"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Kill Emerge</property> - <property name="use_underline">True</property> - <signal name="activate" handler="cb_kill_clicked"/> - <child internal-child="image"> - <widget class="GtkImage" id="menu-item-image16"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - </widget> - </child> - </widget> - </child> - <child> - <widget class="GtkImageMenuItem" id="closeItemTray"> - <property name="visible">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">gtk-quit</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - <signal name="activate" handler="cb_close"/> - </widget> - </child> - </widget> -</glade-interface> diff --git a/portato/gui/windows/basic.py b/portato/gui/windows/basic.py index 1117e5e..b3f210c 100644 --- a/portato/gui/windows/basic.py +++ b/portato/gui/windows/basic.py @@ -14,7 +14,6 @@ from __future__ import absolute_import # gtk stuff import gtk -import gtk.glade import gobject from functools import wraps @@ -23,11 +22,18 @@ import os.path from ...constants import TEMPLATE_DIR, APP, LOCALE_DIR from ...helper import error -gtk.glade.bindtextdomain (APP, LOCALE_DIR) -gtk.glade.textdomain (APP) +# for the GtkBuilder to translate correctly :) +import ctypes +try: + getlib = ctypes.cdll.LoadLibrary("libgettextlib.so") +except OSError: + error("'libgettextlib.so' cannot be loaded. Might be, that there are no translations available in the GUI.") +else: + getlib.textdomain(APP) + getlib.bindtextdomain(APP, LOCALE_DIR) class WrappedTree (object): - __slots__ = ("klass", "tree", "get_widget") + __slots__ = ("klass", "tree", "get_widget", "get_ui") def __init__ (self, klass, tree): self.tree = tree self.klass = klass @@ -39,25 +45,52 @@ class WrappedTree (object): return getattr(self.tree, name) def get_widget(self, name): - w = self.tree.get_widget(name) + w = self.tree.get_object(name) if w is None: error("Widget '%s' could not be found in class '%s'.", name, self.klass) return w -class Window (object): - def __init__ (self): + def get_ui (self, name, ui = "uimanager"): + uiw = self.get_widget(ui) + if uiw is None: + return None - if not hasattr(self, "__tree__"): - self.__tree__ = self.__class__.__name__ + if not name.startswith("ui/"): + name = "ui/%s" % name - if not hasattr(self, "__window__"): - self.__window__ = self.__class__.__name__ + w = uiw.get_widget(name) + if w is None: + error("UIItem '%s' of UIManager '%s' could not be found in class '%s'.", name, ui, self.klass) + return w + +class UIBuilder (object): + def __init__ (self, connector = None): if not hasattr(self, "__file__"): self.__file__ = self.__class__.__name__ - self.tree = self.get_tree(self.__tree__) - self.tree.signal_autoconnect(self) + self._builder = gtk.Builder() + self._builder.add_from_file(os.path.join(TEMPLATE_DIR, self.__file__+".ui")) + self._builder.set_translation_domain(APP) + + if connector is None: connector = self + + unconnected = self._builder.connect_signals(connector) + + if unconnected is not None: + for uc in set(unconnected): + error("Signal '%s' not connected in class '%s'.", uc, self.__class__.__name__) + + self.tree = WrappedTree(self.__class__.__name__, self._builder) + +class Window (UIBuilder): + def __init__ (self): + + UIBuilder.__init__(self) + + if not hasattr(self, "__window__"): + self.__window__ = self.__class__.__name__ + self.window = self.tree.get_widget(self.__window__) @staticmethod @@ -82,9 +115,6 @@ class Window (object): return wrapper - def get_tree (self, name): - return WrappedTree(self.__class__.__name__, gtk.glade.XML(os.path.join(TEMPLATE_DIR, self.__file__+".glade"), name)) - class AbstractDialog (Window): """A class all our dialogs get derived from. It sets useful default vars and automatically handles the ESC-Button.""" @@ -114,13 +144,3 @@ class AbstractDialog (Window): def close (self, *args): self.window.destroy() - -class Popup (object): - - def __init__ (self, name, parent, file = "popups"): - self.tree = WrappedTree(self.__class__.__name__, gtk.glade.XML(os.path.join(TEMPLATE_DIR, file+".glade"), root = name)) - self.tree.signal_autoconnect(parent) - self._popup = self.tree.get_widget(name) - - def popup (self, *args): - self._popup.popup(*args) diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 443fa76..04a9995 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -43,7 +43,7 @@ from ..dialogs import (blocked_dialog, changed_flags_dialog, io_ex_dialog, from ..exceptions import PreReqError # even more GUI stuff -from .basic import Window, Popup +from .basic import Window from .about import AboutWindow from .plugin import PluginWindow from .preference import PreferenceWindow @@ -62,7 +62,6 @@ class PackageTable: self.main = main self.tree = main.tree self.window = main.window - self.tree.signal_autoconnect(self) # all the package data is in this one VB self.vb = self.tree.get_widget("packageVB") @@ -77,8 +76,7 @@ class PackageTable: self.maskedLabel = self.tree.get_widget("maskedLabel") # labels - generalVB = self.tree.get_widget("generalVB") - generalVB.modify_bg(gtk.STATE_NORMAL, get_color(self.main.cfg, "packagetable")) + self.main.set_color(get_color(self.main.cfg, "packagetable")) self.nameLabel = self.tree.get_widget("nameLabel") self.descLabel = self.tree.get_widget("descLabel") @@ -473,7 +471,7 @@ class MainWindow (Window): # package db splash(_("Creating Database")) - self.db = Database() + self.db = Database(self.cfg.get("type", section = "DATABASE")) # set plugins and plugin-menu splash(_("Loading Plugins")) @@ -481,13 +479,24 @@ class MainWindow (Window): plugin.load_plugins() menus = [p.menus for p in plugin.get_plugin_queue().get_plugins()] if menus: - self.tree.get_widget("pluginMenuItem").set_no_show_all(False) - pluginMenu = self.tree.get_widget("pluginMenu") + uim = self.tree.get_widget("uimanager") + ag = self.tree.get_widget("pluginActionGroup") + ctr = 0 for m in itt.chain(*menus): - item = gtk.MenuItem(m.label) - item.connect("activate", m.call) - pluginMenu.append(item) + + # create action + aname = "plugin%d" % ctr + a = gtk.Action(aname, m.label, None, None) + a.connect("activate", m.call) + ag.add_action(a) + + # add to UI + mid = uim.new_merge_id() + uim.add_ui(mid, "ui/menubar/pluginMenu", aname, aname, gtk.UI_MANAGER_MENUITEM, False) + + ctr += 1 + splash(_("Building frontend")) # set paned position @@ -554,18 +563,11 @@ class MainWindow (Window): self.packageTable = PackageTable(self) # popups - self.consolePopup = Popup("consolePopup", self, self.__file__) - self.trayPopup = Popup("systrayPopup", self) + self.consolePopup = self.tree.get_ui("consolePopup") + self.trayPopup = self.tree.get_ui("systrayPopup") # pause menu items self.emergePaused = False - self.pauseItems = {} - self.pauseItems["tray"] = self.trayPopup.tree.get_widget("pauseItemTray") - self.pauseItems["popup"] = self.consolePopup.tree.get_widget("pauseItemPopup") - self.pauseItems["menu"] = self.tree.get_widget("pauseItemMenu") - - for k,v in self.pauseItems.iteritems(): - self.pauseItems[k] = (v, v.connect_after("activate", self.cb_pause_emerge(k))) # systray if self.cfg.get_boolean("showSystray", "GUI"): @@ -1256,6 +1258,17 @@ class MainWindow (Window): self.catList.get_selection().select_path(pos) self.catList.scroll_to_cell(pos) + def set_color (self, color): + """ + Sets the color of the general VB (i.e. the thing that displays the package details) + + @param color: color to set it to + @type color: gtk.gdk.Color + """ + + generalVB = self.tree.get_widget("generalVB") + generalVB.modify_bg(gtk.STATE_NORMAL, color) + def set_uri_hook (self, browser): """ Sets the browser command which is called when a URL is going to be opened. @@ -1358,7 +1371,7 @@ class MainWindow (Window): try: self.fill_version_list(self.selCP) except VersionsNotFoundException, e: - warning(_("No versions of package '%s' found!.") % self.selCP) + warning(_("No versions of package '%s' found!") % self.selCP) no_versions_dialog(self.selCP) self.db.disable(self.selCP) self.selCP = oldcp @@ -1675,7 +1688,7 @@ class MainWindow (Window): """ User wants to open preferences. """ - PreferenceWindow(self.window, self.cfg, self.console.set_font_from_string, self.set_uri_hook, self.set_notebook_tabpos, self.fill_cat_store) + PreferenceWindow(self.window, self.cfg, self.console.set_font_from_string, self.set_uri_hook, self.set_notebook_tabpos, self.fill_cat_store, self.set_color) return True def cb_about_clicked (self, *args): @@ -1772,50 +1785,13 @@ class MainWindow (Window): self.queue.append(package, update = True, oneshot = set, forceUpdate = True) - def cb_pause_emerge (self, curr): - """ - This method returns a callback for a "pause emerge" toggle button. - It is needed as there are different toggle buttons of this type and if one is clicked, - the others should be marked too. - - @param curr: The button to return the callback for. - @type curr: gtk.ToggleButton - """ - def pause (cb): - """ - The actual callback. - - Mark all other buttons too. - - @param cb: The button which got toggled. - @type cb: gtk.ToggleButton - """ - - # pause or continue - self.emergePaused = cb.get_active() - if not self.emergePaused: - self.queue.continue_emerge() - #self.tray.set_from_file(APP_ICON) - else: - self.queue.stop_emerge() - #self.tray.set_from_file(os.path.join(ICON_DIR, "pausing.png")) - - # block the handlers of the other buttons - # so that calling "set_active" does not call this callback recursivly - for v in self.pauseItems.itervalues(): - v[0].handler_block(v[1]) - - # mark the others - for k, v in self.pauseItems.iteritems(): - if k != curr: - v[0].set_active(self.emergePaused) - - # unblock - for v in self.pauseItems.itervalues(): - v[0].handler_unblock(v[1]) - - return False - return pause + def cb_pause_emerge (self, action): + # pause or continue + self.emergePaused = action.get_active() + if not self.emergePaused: + self.queue.continue_emerge() + else: + self.queue.stop_emerge() def cb_kill_clicked (self, *args): """ @@ -1823,7 +1799,7 @@ class MainWindow (Window): """ self.queue.kill_emerge() if self.emergePaused: # unmark the "pause emerge" buttons - self.pauseItems["menu"][0].set_active(False) # calling one button is enough (see: cb_pause_emerge) + self.tree.get_widget("generalActionGroup").get_action("pauseAction").set_active(False) def cb_copy_clicked (self, *args): """ @@ -1879,6 +1855,18 @@ class MainWindow (Window): else: self.window.iconify() + def cb_testing_toggled (self, *args): + return self.packageTable.cb_testing_toggled(*args) + def cb_masked_toggled (self, *args): + return self.packageTable.cb_masked_toggled(*args) + def cb_button_pressed (self, *args): + return self.packageTable.cb_button_pressed(*args) + def cb_package_revert_clicked (self, *args): + return self.packageTable.cb_package_revert_clicked(*args) + def cb_package_unmerge_clicked (self, *args): + return self.packageTable.cb_package_unmerge_clicked(*args) + def cb_package_emerge_clicked (self, *args): + return self.packageTable.cb_package_emerge_clicked(*args) def cb_use_flag_toggled (self, *args): return self.packageTable.cb_use_flag_toggled(*args) diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py index df18e88..5b88b22 100644 --- a/portato/gui/windows/preference.py +++ b/portato/gui/windows/preference.py @@ -20,6 +20,7 @@ from .basic import AbstractDialog from ..dialogs import io_ex_dialog from ..utils import get_color from ...helper import debug +from ... import db class PreferenceWindow (AbstractDialog): """Window displaying some preferences.""" @@ -60,7 +61,7 @@ class PreferenceWindow (AbstractDialog): 4 : gtk.POS_RIGHT } - def __init__ (self, parent, cfg, console_fn, linkbtn_fn, tabpos_fn, catmodel_fn): + def __init__ (self, parent, cfg, console_fn, linkbtn_fn, tabpos_fn, catmodel_fn, labelcolor_fn): """Constructor. @param parent: parent window @@ -74,7 +75,9 @@ class PreferenceWindow (AbstractDialog): @param tabpos_fn: function to call to set the tabposition of the notebooks @type tabpos_fn: function(gtk.ComboBox,int) @param catmodel_fn: function to call to set the model of the cat list (collapsed/not collapsed) - @type catmodel_fn: function()""" + @type catmodel_fn: function() + @param labelcolor_fn: function to call to set the color of the label + @type labelcolor_fn: function(gtk.gdk.Color)""" AbstractDialog.__init__(self, parent) @@ -101,6 +104,7 @@ class PreferenceWindow (AbstractDialog): self.linkbtn_fn = linkbtn_fn self.tabpos_fn = tabpos_fn self.catmodel_fn = catmodel_fn + self.labelcolor_fn = labelcolor_fn # set the bg-color of the hint hintEB = self.tree.get_widget("hintEB") @@ -109,20 +113,16 @@ class PreferenceWindow (AbstractDialog): # the checkboxes for box, val in self.checkboxes.iteritems(): if isinstance(val, tuple): - self.tree.get_widget(box).\ - set_active(self.cfg.get_boolean(val[0], section = val[1])) + self.tree.get_widget(box).set_active(self.cfg.get_boolean(val[0], section = val[1])) else: - self.tree.get_widget(box).\ - set_active(self.cfg.get_boolean(val)) + self.tree.get_widget(box).set_active(self.cfg.get_boolean(val)) # the edits for edit, val in self.edits.iteritems(): if isinstance(val,tuple): - self.tree.get_widget(edit).\ - set_text(self.cfg.get(val[0], section = val[1])) + self.tree.get_widget(edit).set_text(self.cfg.get(val[0], section = val[1])) else: - self.tree.get_widget(edit).\ - set_text(self.cfg.get(val)) + self.tree.get_widget(edit).set_text(self.cfg.get(val)) # the set list self.setList = self.tree.get_widget("setList") @@ -138,19 +138,54 @@ class PreferenceWindow (AbstractDialog): self.titleLengthSpinBtn = self.tree.get_widget("titleLengthSpinBtn") self.titleLengthSpinBtn.set_value(int(self.cfg.get("titlelength", section = "GUI"))) + # the color buttons + self.pkgTableColorBtn = self.tree.get_widget("pkgTableColorBtn") + self.pkgTableColorBtn.set_color(get_color(self.cfg, "packagetable")) + + self.prefColorBtn = self.tree.get_widget("prefColorBtn") + self.prefColorBtn.set_color(get_color(self.cfg, "prefhint")) + # the comboboxes self.systemTabCombo = self.tree.get_widget("systemTabCombo") self.pkgTabCombo = self.tree.get_widget("packageTabCombo") for c in (self.systemTabCombo, self.pkgTabCombo): - m = c.get_model() - m.clear() + model = gtk.ListStore(str) for i in (_("Top"), _("Bottom"), _("Left"), _("Right")): - m.append((i,)) + model.append((i,)) + + c.set_model(model) + + cell = gtk.CellRendererText() + c.pack_start(cell) + c.set_attributes(cell, text = 0) self.systemTabCombo.set_active(int(self.cfg.get("systemTabPos", section = "GUI"))-1) self.pkgTabCombo.set_active(int(self.cfg.get("packageTabPos", section = "GUI"))-1) + # the database combo + dbtype = self.cfg.get("type", section = "DATABASE") + self.databaseCombo = self.tree.get_widget("databaseCombo") + model = gtk.ListStore(str, str, str) + + ctr = 0 + active = 0 + for k, (name, desc) in db.types.iteritems(): + if k == dbtype: + active = ctr + + model.append([name, desc, k]) + ctr += 1 + + self.databaseCombo.set_model(model) + self.databaseCombo.set_active(active) + + cell = gtk.CellRendererText() + self.databaseCombo.pack_start(cell) + self.databaseCombo.set_attributes(cell, text = 0) + + self.cb_db_combo_changed() + self.window.show_all() def _save(self): @@ -189,6 +224,14 @@ class PreferenceWindow (AbstractDialog): self.catmodel_fn() + # colors + c = self.pkgTableColorBtn.get_color() + self.cfg.set("packagetable", str(c)[1:], section = "COLORS") + self.labelcolor_fn(c) + + c = self.prefColorBtn.get_color() + self.cfg.set("prefhint", str(c)[1:], section = "COLORS") + def fill_setlist (self): store = gtk.ListStore(bool, str, str, str) @@ -212,6 +255,13 @@ class PreferenceWindow (AbstractDialog): self.setList.set_model(store) + def cb_db_combo_changed (self, *args): + model = self.databaseCombo.get_model() + active = self.databaseCombo.get_active() + + descr = self.tree.get_widget("dbDescriptionLabel") + descr.set_markup("<i>%s</i>" % model[active][1]) + def cb_ok_clicked(self, button): """Saves, writes to config-file and closes the window.""" self._save() |