6707 Text change for Update Manager dialog
6983 Dialog Layouts need rework
6985 Simplify Remove Confirm dialog
6987 Add Help Buttons
--- a/src/gui/data/packagemanager.glade Thu Mar 12 16:30:25 2009 -0700
+++ b/src/gui/data/packagemanager.glade Fri Mar 13 09:38:40 2009 +0000
@@ -545,6 +545,9 @@
<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="tooltip" translatable="yes">Type text to search name and description of the package.</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Search</atkproperty>
+ </accessibility>
<signal name="changed" handler="on_searchentry_changed"/>
<signal name="focus_out_event" handler="on_searchentry_focus_out_event"/>
<signal name="focus_in_event" handler="on_searchentry_focus_in_event"/>
@@ -1275,7 +1278,7 @@
<property name="icon">PM_app_48x.png</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="program_name">Package Manager</property>
- <property name="version">0.2</property>
+ <property name="version">06.2009</property>
<property name="copyright" translatable="yes">Copyright 2009 Sun Microsystems, Inc.
All rights reserved.
Use is subject to license terms.</property>
@@ -1620,11 +1623,12 @@
----------------------------------------------------------------
</property>
- <property name="authors">Michal Pryc <[email protected]>
+ <property name="authors">Frank Ludolph <[email protected]>
+Jenya Gestrin <[email protected]>
John Hawk <[email protected]>
John Rice <[email protected]>
-Jenya Gestrin <[email protected]>
-Frank Ludolph <[email protected]>
+Jyothi Srinath <[email protected]>
+Michal Pryc <[email protected]>
Padraig O'Briain <[email protected]></property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox9">
@@ -1753,7 +1757,7 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="ypad">2</property>
- <property name="label" translatable="yes"><b>Delete, rename and activate Boot Environments.</b></property>
+ <property name="label" translatable="yes"><b>Delete, rename and activate boot environments.</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -1799,7 +1803,7 @@
<property name="yalign">0</property>
<property name="xpad">4</property>
<property name="ypad">4</property>
- <property name="label" translatable="yes">Currently Active Boot Environment</property>
+ <property name="label" translatable="yes">Currently active boot environment</property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -1831,6 +1835,7 @@
<property name="label" translatable="yes">gtk-help</property>
<property name="use_stock">True</property>
<property name="response_id">-11</property>
+ <signal name="clicked" handler="on_help_bebutton_clicked"/>
</widget>
</child>
<child>
@@ -1886,224 +1891,181 @@
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox23">
<property name="visible">True</property>
- <property name="spacing">16</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkVBox" id="vbox17">
+ <widget class="GtkAlignment" id="alignment32">
<property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="top_padding">5</property>
+ <property name="right_padding">5</property>
<child>
- <widget class="GtkVBox" id="vbox18">
+ <widget class="GtkVBox" id="vbox17">
<property name="visible">True</property>
- <property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label27">
- <property name="width_request">500</property>
+ <widget class="GtkVBox" id="vbox18">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">4</property>
- <property name="label" translatable="yes">Type the repository Name and URL you want to add as a new package source.
-
-If this repository requires a SSL Key and Certificate, or it has mirrors, add a
-new repository first and then modify it to add this information.</property>
- <property name="wrap">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label28">
- <property name="width_request">80</property>
+ <widget class="GtkAlignment" id="alignment37">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">4</property>
- <property name="label" translatable="yes">_Name: </property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">repositoryname</property>
+ <property name="xalign">1</property>
+ <child>
+ <widget class="GtkLabel" id="label27">
+ <property name="width_request">500</property>
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">10</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes"><b>Add new repositories and manage existing ones.</b></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- </packing>
</child>
<child>
- <widget class="GtkEntry" id="repositoryname">
- <property name="width_request">320</property>
+ <widget class="GtkAlignment" id="alignment36">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_repositoryname_changed"/>
+ <property name="left_padding">5</property>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">lf the repository requires a SSL key and certificate, or if it has mirrors, add the new
+repository, and then click Modify to add additional information.</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label21">
- <property name="width_request">80</property>
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">4</property>
- <property name="label" translatable="yes">_URL: </property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">repositoryurl</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="repositoryurl">
- <property name="width_request">320</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="changed" handler="on_repositoryurl_changed"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="repositoryadd">
+ <widget class="GtkHBox" id="hbox11">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">_Add</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_repositoryadd_clicked"/>
+ <child>
+ <widget class="GtkLabel" id="label28">
+ <property name="width_request">80</property>
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">10</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes">_Name: </property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">repositoryname</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="repositoryname">
+ <property name="width_request">320</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_repositoryname_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">10</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="height_request">20</property>
- <property name="visible">True</property>
- <child>
- <widget class="GtkAlignment" id="alignment17">
- <property name="width_request">89</property>
- <property name="visible">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label21">
+ <property name="width_request">80</property>
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">10</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes">_URL: </property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">repositoryurl</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="repositoryurl">
+ <property name="width_request">320</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="changed" handler="on_repositoryurl_changed"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment33">
+ <property name="visible">True</property>
+ <property name="left_padding">4</property>
+ <child>
+ <widget class="GtkButton" id="repositoryadd">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">_Add</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_repositoryadd_clicked"/>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="error_label">
+ <widget class="GtkHBox" id="hbox8">
+ <property name="height_request">20</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="width_request">500</property>
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">10</property>
- <property name="ypad">4</property>
- <property name="label" translatable="yes">Select from the list to modify or remove existing repositories.</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">10</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox13">
- <property name="visible">True</property>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow15">
- <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>
<child>
- <widget class="GtkTreeView" id="repositorytreeview">
+ <widget class="GtkAlignment" id="alignment17">
+ <property name="width_request">89</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="move_cursor" handler="on_repositorytreeview_move_cursor"/>
- <signal name="button_release_event" handler="on_repositorytreeview_button_release_event"/>
+ <child>
+ <placeholder/>
+ </child>
</widget>
- </child>
- </widget>
- <packing>
- <property name="padding">10</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
- <child>
- <widget class="GtkButton" id="repositorymodify">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">_Modify...</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_repositorymodify_clicked"/>
- </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="repositoryremove">
+ <widget class="GtkLabel" id="error_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label" translatable="yes">_Remove</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <signal name="clicked" handler="on_repositoryremove_clicked"/>
+ <property name="xalign">0</property>
+ <property name="use_markup">True</property>
</widget>
<packing>
<property name="position">1</property>
@@ -2112,14 +2074,98 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkLabel" id="label26">
+ <property name="width_request">500</property>
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">10</property>
+ <property name="ypad">4</property>
+ <property name="label" translatable="yes">Select from the list to modify or remove existing repositories.</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">10</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox13">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment34">
+ <property name="visible">True</property>
+ <property name="left_padding">6</property>
+ <property name="right_padding">7</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow15">
+ <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>
+ <child>
+ <widget class="GtkTreeView" id="repositorytreeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <signal name="move_cursor" handler="on_repositorytreeview_move_cursor"/>
+ <signal name="button_release_event" handler="on_repositorytreeview_button_release_event"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <child>
+ <widget class="GtkButton" id="repositorymodify">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">_Modify...</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_repositorymodify_clicked"/>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="repositoryremove">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label" translatable="yes">_Remove</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <signal name="clicked" handler="on_repositoryremove_clicked"/>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
- <packing>
- <property name="position">3</property>
- </packing>
</child>
</widget>
<packing>
@@ -2138,6 +2184,7 @@
<property name="label" translatable="yes">gtk-help</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
+ <signal name="clicked" handler="on_repositoryhelp_clicked"/>
</widget>
</child>
<child>
@@ -2181,66 +2228,71 @@
<widget class="GtkVBox" id="dialog-vbox21">
<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="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox19">
+ <widget class="GtkAlignment" id="alignment31">
<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>
- <property name="spacing">15</property>
<child>
- <widget class="GtkHBox" id="hbox10">
+ <widget class="GtkVBox" id="vbox19">
<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">10</property>
+ <property name="border_width">5</property>
+ <property name="spacing">15</property>
<child>
- <widget class="GtkImage" id="image3">
+ <widget class="GtkHBox" id="hbox10">
<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-dialog-warning</property>
- <property name="icon_size">5</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage" id="image3">
+ <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-dialog-warning</property>
+ <property name="icon_size">5</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="packagenamelabel4">
+ <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>Apply the following changes:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="packagenamelabel4">
+ <widget class="GtkScrolledWindow" id="scrolledwindow14">
<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="xalign">0</property>
- <property name="label" translatable="yes"><b>Apply the following changes:</b></property>
- <property name="use_markup">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <child>
+ <widget class="GtkTextView" id="beconfirmtext">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow14">
- <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="beconfirmtext">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
<packing>
@@ -2451,7 +2503,7 @@
<child>
<widget class="GtkLabel" id="repositorymodifyregistrationcommentlabel">
<property name="visible">True</property>
- <property name="label" translatable="yes">This is a secure repository. Refer to the </property>
+ <property name="label" translatable="yes">This is a secure repository. Refer to the posted</property>
</widget>
</child>
</widget>
@@ -2464,7 +2516,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xscale">0</property>
- <property name="top_padding">4</property>
+ <property name="top_padding">3</property>
<child>
<widget class="GtkLinkButton" id="repositorymodifyregistrationlinkbutton">
<property name="visible">True</property>
@@ -2963,6 +3015,7 @@
<property name="label" translatable="yes">gtk-help</property>
<property name="use_stock">True</property>
<property name="response_id">-11</property>
+ <signal name="clicked" handler="on_ua_help_button_clicked"/>
</widget>
</child>
<child>
@@ -3062,121 +3115,93 @@
<widget 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">20</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox5">
+ <widget class="GtkAlignment" id="alignment14">
<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">10</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
- <widget class="GtkHBox" id="hbox6">
+ <widget class="GtkAlignment" id="alignment15">
<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="GtkImage" id="warningtriangle">
- <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-dialog-warning</property>
- <property name="icon_size">5</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
<child>
- <widget class="GtkLabel" id="label5">
- <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="yalign">0</property>
- <property name="label" translatable="yes">Review the packages selected for removal.
-Click Proceed to continue.</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <widget class="GtkLabel" id="packagenamelabel3">
+ <widget 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="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes"><b>Packages To Be Removed</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
- <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>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkTreeView" id="removetreeview">
+ <widget class="GtkHBox" id="hbox6">
<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="enable_search">False</property>
- <property name="level_indentation">70</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkImage" id="warningtriangle">
+ <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-dialog-warning</property>
+ <property name="icon_size">5</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment16">
+ <property name="visible">True</property>
+ <property name="top_padding">7</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <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="yalign">0</property>
+ <property name="label" translatable="yes"><b>Review the packages to be removed:</b></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <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="removetreeview">
+ <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="enable_search">False</property>
+ <property name="level_indentation">70</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="packagenamelabel2">
- <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="yalign">0</property>
- <property name="label" translatable="yes"><b>Summary</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="summarylabel">
- <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="yalign">0</property>
- <property name="label" translatable="yes">6 packages selected for removal</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
</child>
</widget>
<packing>
@@ -3483,69 +3508,80 @@
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkVBox" id="vbox22">
+ <widget class="GtkAlignment" id="alignment35">
<property name="visible">True</property>
- <property name="spacing">5</property>
+ <property name="top_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
- <widget class="GtkLabel" id="startup_label">
+ <widget class="GtkVBox" id="vbox22">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="ypad">2</property>
- <property name="label" translatable="yes"><b>Startup</b></property>
- <property name="use_markup">True</property>
- </widget>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox19">
- <property name="visible">True</property>
+ <property name="spacing">5</property>
<child>
- <widget class="GtkAlignment" id="alignment7">
- <property name="width_request">17</property>
+ <widget class="GtkLabel" id="startup_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="ypad">2</property>
+ <property name="label" translatable="yes"><b>Startup</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox19">
<property name="visible">True</property>
<child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox23">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkHBox" id="hbox30">
+ <widget class="GtkAlignment" id="alignment7">
+ <property name="width_request">17</property>
<property name="visible">True</property>
<child>
- <widget class="GtkCheckButton" id="startpage_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Show Start Page on startup </property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_startpage_checkbutton_toggled"/>
- </widget>
- </child>
- <child>
<placeholder/>
</child>
</widget>
<packing>
- <property name="padding">4</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox31">
+ <widget class="GtkVBox" id="vbox23">
<property name="visible">True</property>
+ <property name="spacing">3</property>
<child>
- <placeholder/>
+ <widget class="GtkHBox" id="hbox30">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkCheckButton" id="startpage_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Show Start Page on startup </property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_startpage_checkbutton_toggled"/>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">4</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkHBox" id="hbox31">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
@@ -3557,69 +3593,69 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="search_label">
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="ypad">2</property>
- <property name="label" translatable="yes"><b>Search</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox32">
- <property name="visible">True</property>
<child>
- <widget class="GtkAlignment" id="alignment8">
- <property name="width_request">17</property>
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
+ <widget class="GtkLabel" id="search_label">
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="ypad">2</property>
+ <property name="label" translatable="yes"><b>Search</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox28">
+ <widget class="GtkHBox" id="hbox32">
<property name="visible">True</property>
- <property name="spacing">3</property>
<child>
- <widget class="GtkHBox" id="hbox33">
- <child>
- <widget class="GtkCheckButton" id="typeaheadsearch_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Enable type ahead search (slow on large repositories)</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_typeaheadsearch_checkbutton_toggled"/>
- </widget>
- </child>
+ <widget class="GtkAlignment" id="alignment8">
+ <property name="width_request">17</property>
+ <property name="visible">True</property>
<child>
<placeholder/>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox34">
+ <widget class="GtkVBox" id="vbox28">
<property name="visible">True</property>
+ <property name="spacing">3</property>
<child>
- <placeholder/>
+ <widget class="GtkHBox" id="hbox33">
+ <child>
+ <widget class="GtkCheckButton" id="typeaheadsearch_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Enable type ahead search (slow on large repositories)</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_typeaheadsearch_checkbutton_toggled"/>
+ </widget>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
</child>
<child>
- <placeholder/>
+ <widget class="GtkHBox" id="hbox34">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
<packing>
@@ -3628,22 +3664,16 @@
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">3</property>
<property name="position">1</property>
</packing>
</child>
--- a/src/gui/modules/beadmin.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/gui/modules/beadmin.py Fri Mar 13 09:38:40 2009 +0000
@@ -34,6 +34,7 @@
try:
import gobject
gobject.threads_init()
+ import gnome
import gtk
import gtk.glade
import pygtk
@@ -135,6 +136,8 @@
self.__on_cancel_be_clicked,
"on_ok_be_clicked": \
self.__on_ok_be_clicked,
+ "on_help_bebutton_clicked": \
+ self.__on_help_bebutton_clicked,
}
dic_conf = \
{
@@ -234,6 +237,12 @@
column.set_expand(False)
self.w_be_treeview.append_column(column)
+ def __on_help_bebutton_clicked(self, widget):
+ if self.parent != None:
+ gui_misc.display_help(self.parent.application_dir)
+ else:
+ gui_misc.display_help()
+
def __on_ok_be_clicked(self, widget):
self.w_progress_dialog.set_title(_("Applying changes"))
self.w_progressinfo_label.set_text(
@@ -246,6 +255,7 @@
def __on_cancel_be_clicked(self, widget):
self.__on_beadmin_delete_event(None, None)
+ return False
def __on_beconfirmationdialog_delete_event(self, widget, event):
self.__on_cancel_be_conf_clicked(widget)
@@ -259,8 +269,8 @@
self.progress_stop_thread = False
Thread(target = self.__on_progressdialog_progress).start()
Thread(target = self.__delete_activate_be).start()
-
- def __on_beadmin_delete_event(self, widget, event):
+
+ def __on_beadmin_delete_event(self, widget, event, stub=None):
self.w_beadmin_dialog.destroy()
return True
@@ -379,7 +389,7 @@
not_renamed.get(orig))
gobject.idle_add(self.__error_occured, msg)
return
- gobject.idle_add(self.__on_beadmin_delete_event, None, None)
+ gobject.idle_add(self.__on_cancel_be_clicked, None)
def __rename_cell(self, model, itr, new_name):
model.set_value(itr, BE_NAME, new_name)
--- a/src/gui/modules/installupdate.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/gui/modules/installupdate.py Fri Mar 13 09:38:40 2009 +0000
@@ -118,7 +118,6 @@
w_tree_removeconfirm.get_widget("removeconfirmation")
w_removeproceed_button = w_tree_removeconfirm.get_widget("remove_proceed")
w_remove_treeview = w_tree_removeconfirm.get_widget("removetreeview")
- w_remove_summary = w_tree_removeconfirm.get_widget("summarylabel")
w_stage2 = w_tree_dialog.get_widget("stage2")
self.w_stages_box = w_tree_dialog.get_widget("stages_box")
self.w_stage1_label = w_tree_dialog.get_widget("label_stage1")
@@ -174,6 +173,8 @@
self.__on_ua_proceed_button_clicked,
"on_ua_be_name_entry_changed": \
self.__on_ua_be_name_entry_changed,
+ "on_ua_help_button_clicked": \
+ self.__on_ua_help_button_clicked,
}
dic_removeconfirm = \
{
@@ -209,12 +210,10 @@
remove_column.add_attribute(cell, 'text', 0)
w_remove_treeview.append_column(remove_column)
- treestore = gtk.TreeStore(str)
+ liststore = gtk.ListStore(str)
for sel_pkg in list_of_packages:
- treestore.append(None, [sel_pkg])
- w_remove_summary.set_label("Packages Selected For Removal: %d" %
- len(list_of_packages))
- w_remove_treeview.set_model(treestore)
+ liststore.append([sel_pkg])
+ w_remove_treeview.set_model(liststore)
w_remove_treeview.expand_all()
self.w_removeconfirm_dialog.show()
@@ -265,6 +264,9 @@
return
gobject.idle_add(self.parent.update_package_list, None)
+ def __on_ua_help_button_clicked(self, widget):
+ gui_misc.display_help(self.parent.application_dir)
+
def __on_ua_cancel_button_clicked(self, widget):
self.w_ua_dialog.hide()
if self.web_install:
@@ -728,10 +730,10 @@
buttons = gtk.BUTTONS_OK_CANCEL, flags = gtk.DIALOG_MODAL,
type = gtk.MESSAGE_ERROR,
message_format = _(
- "Not enough disk space: selected action cannot " +
+ "Not enough disk space, the selected action cannot " +
"be performed.\n\n" +
- "You may click OK to launch BE Management to manage your " +
- "existing BE's and free up disk space."))
+ "Click OK to manage your existing BEs and free up disk space or " +
+ "Cancel to cancel the action."))
msgbox.set_title(_("Not Enough Disk Space"))
result = msgbox.run()
msgbox.destroy()
--- a/src/gui/modules/misc.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/gui/modules/misc.py Fri Mar 13 09:38:40 2009 +0000
@@ -27,10 +27,14 @@
import sys
try:
import gobject
+ import gnome
import gtk
except ImportError:
sys.exit(1)
+def get_client_api_version():
+ return 12 # CLIENT_API_VERSION Used by PM, UM and WebInstall
+
def get_app_pixbuf(application_dir, icon_name):
return get_pixbuf_from_path(application_dir +
"/usr/share/package-manager/", icon_name)
@@ -62,3 +66,13 @@
detail = None)
# XXX Could return image-we don't want to show ugly icon.
return None
+def display_help(application_dir="", id=None):
+ props = { gnome.PARAM_APP_DATADIR : application_dir + \
+ '/usr/share/package-manager/help' }
+ gnome.program_init('package-manager', '0.1', properties=props)
+ if id != None:
+ gnome.help_display_with_doc_id('package-manager', link_id=id)
+ else:
+ gnome.help_display('package-manager')
+
+
--- a/src/gui/modules/repository.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/gui/modules/repository.py Fri Mar 13 09:38:40 2009 +0000
@@ -43,6 +43,7 @@
import pkg.client.api_errors as api_errors
import pkg.misc as misc
import pkg.gui.enumerations as enumerations
+import pkg.gui.misc as gui_misc
ERROR_FORMAT = "<span color = \"red\">%s</span>"
@@ -211,6 +212,8 @@
self.__on_repositoryname_changed,
"on_repositorytreeview_button_release_event": \
self.__on_repositorytreeview_button_release_event,
+ "on_repositoryhelp_clicked": \
+ self.__on_repositoryhelp_clicked,
}
dic_conf = \
{
@@ -800,6 +803,9 @@
def __on_repository_delete_event(self, widget, event):
self.__on_repositoryclose_clicked(widget)
+ def __on_repositoryhelp_clicked(self, widget):
+ gui_misc.display_help(self.parent.application_dir)
+
def __on_repositoryclose_clicked(self, widget):
# if the number is greater then 1 it means that we did something
# to the repository list and it is safer to reload package info
--- a/src/gui/modules/webinstall.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/gui/modules/webinstall.py Fri Mar 13 09:38:40 2009 +0000
@@ -23,7 +23,6 @@
# Use is subject to license terms.
#
-CLIENT_API_VERSION = 11
PKG_CLIENT_NAME = "packagemanager"
import locale
@@ -47,6 +46,8 @@
from pkg.client import global_settings
import pkg.client.publisher as publisher
+CLIENT_API_VERSION = gui_misc.get_client_api_version()
+
debug = False
class Webinstall:
--- a/src/packagemanager.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/packagemanager.py Fri Mar 13 09:38:40 2009 +0000
@@ -50,7 +50,6 @@
STATUS_COLUMN_INDEX = 2 # Index of Status Column in Application TreeView
-CLIENT_API_VERSION = 12
PKG_CLIENT_NAME = "packagemanager"
# Load Start Page from lang dir if available
@@ -126,6 +125,8 @@
CLICK_LINK,
) = range(2)
+CLIENT_API_VERSION = gui_misc.get_client_api_version()
+
class PackageManager:
def __init__(self):
signal.signal(signal.SIGINT, self.__main_application_quit)
@@ -1225,7 +1226,7 @@
self.w_preferencesdialog.hide()
def __on_preferenceshelp_clicked(self, widget):
- self.__on_help_help(widget)
+ gui_misc.display_help(self.application_dir)
def __on_startpage_checkbutton_toggled(self, widget):
self.show_startpage = self.w_startpage_checkbutton.get_active()
@@ -1539,10 +1540,7 @@
aboutdialog.run()
def __on_help_help(self, widget):
- props = { gnome.PARAM_APP_DATADIR : self.application_dir + \
- '/usr/share/package-manager/help' }
- gnome.program_init('package-manager', '0.1', properties=props)
- gnome.help_display('package-manager')
+ gui_misc.display_help(self.application_dir)
def __on_remove(self, widget):
self.api_o.reset()
@@ -2863,9 +2861,9 @@
msgbox = gtk.MessageDialog(parent = self.w_main_window,
buttons = gtk.BUTTONS_OK,
flags = gtk.DIALOG_MODAL, type = gtk.MESSAGE_INFO,
- message_format = _("Update All has completed and Package " \
- "Manager will now exit.\n\nPlease reboot after reviewing the "
- "release notes posted at:\n\n"
+ message_format = _("The Update All action is now complete and "
+ "Package Manager will close.\n\nReview the posted release notes "
+ "before rebooting your system:\n\n"
"http://opensolaris.org/os/project/indiana/resources/"
"relnotes/200811/x86/"))
msgbox.set_title(_("Update All"))
--- a/src/um/data/updatemanager.glade Thu Mar 12 16:30:25 2009 -0700
+++ b/src/um/data/updatemanager.glade Fri Mar 13 09:38:40 2009 +0000
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Wed Jan 28 15:35:17 2009 -->
+<!--Generated with glade3 3.4.5 on Thu Mar 12 12:06:59 2009 -->
<glade-interface>
<widget class="GtkDialog" id="progressdialog">
<property name="width_request">450</property>
@@ -290,8 +290,6 @@
</child>
</widget>
<widget class="GtkDialog" id="um_dialog">
- <property name="width_request">620</property>
- <property name="height_request">500</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Update Manager</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
@@ -305,125 +303,128 @@
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="spacing">10</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkImage" id="pm_image">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="pixbuf">PM_app_48x.png</property>
- <property name="icon_size">12</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkImage" id="pm_image">
+ <property name="visible">True</property>
+ <property name="pixbuf">PM_app_48x.png</property>
+ <property name="icon_size">12</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="um_intro_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Updates are available for the following packages.
+Select the packages you want to update and click Install.</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="um_intro_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Updates are available for the following packages.
-Select the packages you want to update and click Install.</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="um_scrolledwindow">
- <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>
- <child>
- <widget class="GtkTreeView" id="um_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="rules_hint">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="selectall_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">2</property>
- <property name="label" translatable="yes">_Select all Updates</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_selectall_checkbutton_toggled"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkExpander" id="um_expander">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_um_expander_activate"/>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <widget class="GtkScrolledWindow" id="um_scrolledwindow">
<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>
<child>
- <widget class="GtkTextView" id="um_textview">
- <property name="height_request">130</property>
+ <widget class="GtkTreeView" id="um_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="pixels_above_lines">1</property>
- <property name="editable">False</property>
- <property name="left_margin">4</property>
- <property name="indent">6</property>
+ <property name="rules_hint">True</property>
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="selectall_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">2</property>
+ <property name="label" translatable="yes">_Select all Updates</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_selectall_checkbutton_toggled"/>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkExpander" id="um_expander">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Latest Version _Details</b></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="on_um_expander_activate"/>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <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>
+ <child>
+ <widget class="GtkTextView" id="um_textview">
+ <property name="height_request">130</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">1</property>
+ <property name="editable">False</property>
+ <property name="left_margin">4</property>
+ <property name="indent">6</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Latest Version _Details</b></property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="type">label_item</property>
+ <property name="expand">False</property>
+ <property name="position">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">4</property>
- </packing>
</child>
</widget>
<packing>
--- a/src/updatemanager.py Thu Mar 12 16:30:25 2009 -0700
+++ b/src/updatemanager.py Fri Mar 13 09:38:40 2009 +0000
@@ -62,7 +62,8 @@
IMAGE_DIRECTORY_DEFAULT = "/" # Image default directory
IMAGE_DIR_COMMAND = "svcprop -p update/image_dir svc:/application/pkg/update"
-CLIENT_API_VERSION = 12 # API version
+CLIENT_API_VERSION = gui_misc.get_client_api_version()
+
PKG_CLIENT_NAME = "updatemanager" # API client name
SELECTION_CHANGE_LIMIT = 0.5 # Time limit in seconds to cancel selection updates
IND_DELAY = 0.05 # Time delay for printing index progress
@@ -304,7 +305,6 @@
# UM Dialog
w_xmltree_um = gtk.glade.XML(self.gladefile, "um_dialog")
self.w_um_dialog = w_xmltree_um.get_widget("um_dialog")
-
self.w_um_dialog.connect("destroy", self.__on_um_dialog_close)
self.w_um_intro_label = w_xmltree_um.get_widget("um_intro_label")
self.w_um_install_button = w_xmltree_um.get_widget("um_install_button")
@@ -361,6 +361,7 @@
self.api_obj = None
self.w_um_dialog.show_all()
+ self.w_um_dialog.resize(620,500)
def __set_cancel_state(self, status):
if self.install_error:
@@ -729,19 +730,15 @@
return None
def __display_noupdates(self):
- self.w_um_scrolledwindow.set_policy(gtk.POLICY_NEVER,
- gtk.POLICY_AUTOMATIC)
- self.w_um_expander.set_expanded(True)
- infobuffer = self.w_um_textview.get_buffer()
- textiter = infobuffer.get_end_iter()
- infobuffer.insert_with_tags_by_name(textiter,
- _("\nNo Updates available"), "bold")
-
+ self.w_um_intro_label.set_markup(_("<b>No Updates available.</b>"))
+ self.w_um_treeview.hide()
+ self.w_um_expander.hide()
self.w_um_install_button.set_sensitive(False)
self.w_um_updateall_button.set_sensitive(False)
self.w_select_checkbox.set_active(False)
self.w_select_checkbox.set_sensitive(False)
self.w_um_dialog.present()
+ self.w_um_dialog.resize(420,100)
def __get_info_from_name(self, name, local):
if self.fmri_description != name:
@@ -777,7 +774,12 @@
if len(info.category_info_list) > 1:
for ci in info.category_info_list[1:]:
categories += ", " + ci.__str__(verbose)
- installed_ver = "%s-%s" % (local_info.version, local_info.branch)
+ try:
+ installed_ver = "%s-%s" % (local_info.version, local_info.branch)
+ except AttributeError:
+ installed_ver = ""
+ pass # Ignore if we can't get the installed version info
+
ver = "%s-%s" % (info.version, info.branch)
summary = _("None")
if info.summary:
@@ -877,14 +879,15 @@
infobuffer.set_text("")
textiter = infobuffer.get_end_iter()
infobuffer.insert_with_tags_by_name(textiter,
- "\n%s\n" % fmri, "bold")
+ "\n%s" % fmri, "bold")
infobuffer.insert(textiter, details)
elif self.fmri_description == fmri and details == None:
infobuffer = self.w_um_textview.get_buffer()
infobuffer.set_text("")
textiter = infobuffer.get_end_iter()
- infobuffer.insert_with_tags_by_name(textiter,
- _("\nNo details available"), "bold")
+ if textiter != None: #Gtk race condition seems to cause this
+ infobuffer.insert_with_tags_by_name(textiter,
+ _("\nNo details available"), "bold")
def __on_um_dialog_close(self, widget):
self.__exit_app()
@@ -1002,7 +1005,7 @@
"\nUpdate All finished successfully in < 1 min\n\n")
info_str += _(
- "Please reboot after reviewing the release notes posted at:\n\n"
+ "Review the posted release notes before rebooting your system:\n\n"
"http://opensolaris.org/os/project/indiana/resources/"
"relnotes/200811/x86/")
@@ -1180,10 +1183,10 @@
buttons = gtk.BUTTONS_OK_CANCEL, flags = gtk.DIALOG_MODAL,
type = gtk.MESSAGE_ERROR,
message_format = _(
- "Not enough disc space: the Update All action cannot "
+ "Not enough disc space, the Update All action cannot "
"be performed.\n\n"
- "Click OK to launch BE Management to manage your "
- "existing BE's and free up disc space."))
+ "Click OK to manage your existing BEs and free up disk space or "
+ "Cancel to cancel Update All."))
msgbox.set_title(_("Not Enough Disc Space"))
result = msgbox.run()
msgbox.destroy()