From 4530643d34b9a9d469872a6d128e44e126095cf3 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 12:45:31 +0200 Subject: * use PANGO_ELLIPSIZE_END for the action label in the progress dialog to avoid ugly resizes of the dialog * replace "exmaing system" by "starting update manager" to avoid the confusion with checking for updates --- data/glade/UpdateManager.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index 372be566..bb78008c 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -1373,7 +1373,7 @@ Your system does not check for updates automatically. You can configure this beh True - <big><b>Examining your system</b></big> + <big><b>Starting update manager</b></big> Software updates correct errors, eliminate security vulnerabilities and provide new features. False @@ -1431,7 +1431,7 @@ Software updates correct errors, eliminate security vulnerabilities and provide 0.5 0 0 - PANGO_ELLIPSIZE_NONE + PANGO_ELLIPSIZE_END -1 False 0 -- cgit v1.2.3 From 45d74191b4d72141c907ab9bd147b64787086f14 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 14:54:26 +0200 Subject: * replace "Ubuntu Upgrade" by "System Upgrade" - +1 for derivats * remove obsolete sample text in the obsolete dialog * convert glade files to glade3 * make sure that the tasks are always left aligned in the main window --- DistUpgrade/DistUpgrade.glade | 3152 +++++++++++++++++++++++++---------------- 1 file changed, 1934 insertions(+), 1218 deletions(-) diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index dbe7911d..ba55ace0 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -1,726 +1,1205 @@ - - - + + + - - True - 6 - Upgrading Ubuntu - False - GTK_WIN_POS_CENTER - True - - - - - True - 12 - - - True - 6 - 12 - - - True - 0.000000 - <span weight="bold" size="x-large">Upgrading to Ubuntu 6.10</span> - True - - - False - False - - - - - True - - - True - - - - False - False - - - - - True - 5 - 2 - 6 - 6 - - - True - 0.000000 - Restarting the system - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - - 18 - 18 - True - - - 4 - 5 - GTK_FILL - - - - - 18 - 18 - True - - - GTK_FILL - - - - - True - 0.000000 - Cleaning up - - - 1 - 2 - 3 - 4 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - True - 0.000000 - Fetching and installing the upgrades - - - 1 - 2 - 2 - 3 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - True - 0.000000 - Modifying the software channels - - - 1 - 2 - 1 - 2 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - True - 0.000000 - Preparing the upgrade - - - 1 - 2 - GTK_EXPAND | GTK_SHRINK | GTK_FILL - - - - - - 18 - 18 - True - - - 3 - 4 - GTK_FILL - - - - - 18 - 18 - True - - - 2 - 3 - GTK_FILL - - - - - 18 - 18 - True - - - 1 - 2 - GTK_FILL - - - - - 1 - - - - - 1 - - - - - True - 4 - - - 350 - True - 0.1 - - PANGO_ELLIPSIZE_END - - - False - False - - - - - True - 0.000000 - True - PANGO_ELLIPSIZE_END - - - False - False - 1 - - - - - 2 - - - - - True - False - True - 4 - - - True - - - True - create_terminal - - - - - True - 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 - - - False - 1 - - - - - - - True - Terminal - - - label_item - - - - - 3 - - - - - - - - - 6 - False - GTK_WIN_POS_CENTER_ON_PARENT - 500 - 400 - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - True - False - - - True - 6 - - - True - 6 - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-question - 6 - - - False - - - - - True - 12 - - - True - True - 0.000000 - True - True - True - - - False - False - - - - - True - 0.000000 - True - True - - - False - False - 1 - - - - - True - True - 6 - - - 400 - 200 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - - - True - Details - - - label_item - - - - - 2 - - - - - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - _Start Upgrade - True - -8 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 6 - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - True - False - - - True - 12 - - - True - 6 - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-info - 6 - - - False - - - - - True - 0.000000 - 0.000000 - <b><big>Restart the system to complete the upgrade</big></b> - True - - - False - False - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - -8 - - - True - 0.000000 - 0.000000 - - - True - 2 - - - True - gtk-refresh - - - False - False - - - - - True - _Restart Now - True - - - False - False - 1 - - - - - - - - - - - True - True - True - gtk-close - True - -7 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 6 - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - True - False - - - True - 12 - - - True - 6 - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-error - 6 - - - False - - - - - True - 12 - - - True - True - 0.000000 - True - True - True - - - False - - - - - 400 - 200 - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - 4 - 4 - False - 4 - 4 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - _Report Bug - True - -8 - - - - - True - True - True - True - gtk-close - True - -7 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 6 - False - GTK_WIN_POS_CENTER_ON_PARENT - 500 - 400 - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - True - False - - - True - 6 - - - True - 6 - 12 - - - True - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-question - 6 - - - False - - - - - True - 12 - - - True - 0.000000 - 0.000000 - <b><big>Start the upgrade?</big></b> - True - True - - - False - False - - - - - True - 0.000000 - 0.000000 - The upgrade of your system requires + + + 6 + True + System Upgrade + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + True + + + + + + True + False + 12 + + + + 6 + True + False + 12 + + + + True + + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + 5 + 2 + False + 6 + 6 + + + + 18 + 18 + True + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + + + + + + + 18 + 18 + True + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + + + + + + + 18 + 18 + True + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + + + + + + + 18 + 18 + True + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + + + + + + + 18 + 18 + True + 0.5 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + + + + + + + True + Preparing the upgrade + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 0 + 1 + fill + + + + + + + True + Modifying the software channels + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + Fetching and installing the upgrades + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + Cleaning up + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + Restarting the system + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 1 + 2 + 4 + 5 + fill + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 4 + + + + 350 + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.10000000149 + + PANGO_ELLIPSIZE_END + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_END + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + True + False + True + False + 4 + + + + True + False + 0 + + + + True + create_terminal + 0 + 0 + Mon, 11 Sep 2006 12:48:22 GMT + + + 0 + True + True + + + + + + True + GTK_UPDATE_CONTINUOUS + False + 0 0 0 0 0 0 + + + 0 + False + True + + + + + + + + True + Terminal + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + 500 + 400 + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + _Start Upgrade + True + GTK_RELIEF_NORMAL + True + -8 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + True + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + False + 6 + + + + 400 + 200 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + False + False + False + + + + + + + + True + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + GTK_RELIEF_NORMAL + True + -8 + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-refresh + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Restart Now + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-info + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + <b><big>Restart the system to complete the upgrade</big></b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + _Report Bug + True + GTK_RELIEF_NORMAL + True + -8 + + + + + + True + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-error + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + True + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + + 400 + 200 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 4 + 4 + 0 + 4 + 4 + 0 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + 500 + 400 + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + _Continue + True + GTK_RELIEF_NORMAL + True + -8 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + <b><big>Start the upgrade?</big></b> + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + The upgrade of your system requires ... to download 2000 MByte @@ -729,502 +1208,739 @@ ... to update 200 packages This is you last chance to cancel the upgrade. - True - - - False - False - 1 - - - - - True - True - - - 400 - 200 - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - - - - - - True - Details - - - label_item - - - - - False - False - 2 - - - - - False - False - 1 - - - - - False - False - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - _Continue - True - -8 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 6 - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - True - False - - - True - 12 - - - True - 6 - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-question - 6 - - - False - - - - - True - 0.000000 - 0.000000 - <b><big>Cancel the running upgrade?</big></b> + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + False + 0 + + + + 400 + 200 + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + False + False + False + + + + + + + + True + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + _Cancel Upgrade + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + True + _Resume Upgrade + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + <b><big>Cancel the running upgrade?</big></b> The system could be in an unusable state if you cancel the upgrade. You are strongly adviced to resume the upgrade. - True - True - - - False - False - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - _Cancel Upgrade - True - -6 - - - - - True - True - True - True - _Resume Upgrade - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 5 - False - True - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - False - - - True - 12 - - - True - 6 - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-question - 6 - - - False - False - - - - - True - 12 - - - True - 0.000000 - True - True - - - False - False - - - - - 1 - - - - - 1 - - - - - True - True - - - True - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - 300 - True - True - False - False - - - - - False - False - - - - - - - True - Difference between the files - - - label_item - - - - - 2 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - True - True - -9 - - - True - 0.000000 - 0.000000 - - - True - 2 - - - True - gtk-cancel - - - False - False - - - - - True - _Keep - True - - - False - False - 1 - - - - - - - - - - - True - True - True - -8 - - - True - 0.000000 - 0.000000 - - - True - 2 - - - True - gtk-ok - - - False - False - - - - - True - _Replace - True - - - False - False - 1 - - - - - - - - - 1 - - - - - False - GTK_PACK_END - - - - - - - 6 - False - GTK_WIN_POS_CENTER_ON_PARENT - GDK_WINDOW_TYPE_HINT_DIALOG - True - True - True - False - - - True - 12 - - - True - 6 - 12 - - - True - 0.000000 - 0.000000 - gtk-dialog-info - 6 - - - False - - - - - True - 12 - - - True - True - 0.000000 - True - True - True - - - False - - - - - 400 - 200 - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - 4 - 4 - False - 4 - 4 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - True - gtk-close - True - -5 - - - - - False - GTK_PACK_END - - - - - + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + 5 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + False + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + False + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + True + True + GTK_RELIEF_NORMAL + True + -9 + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-cancel + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Keep + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + True + -8 + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-ok + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Replace + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-question + 6 + 0 + 0 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 + + + + True + + False + True + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + True + False + 0 + + + + True + False + 0 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + 300 + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + False + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 0 + False + False + + + + + + + + True + Difference between the files + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + True + True + + + + + + + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + False + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-info + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + True + + False + True + GTK_JUSTIFY_LEFT + True + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + True + + + + + + 400 + 200 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 4 + 4 + 0 + 4 + 4 + 0 + + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + -- cgit v1.2.3 From bacc395f5e0e9ae48883d4cdd1258f98ee6d9b21 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 15:20:33 +0200 Subject: * only show an gtk-yes icon for completed taks * the current tasks has got a gtk-arrow icon - since gtk 2.10 this icon is themable. * reuse a hardcoded title - this should be a config option * really remove the sample text --- DistUpgrade/DistUpgrade.glade | 347 ++++++++++++++++++++++++++------------ DistUpgrade/DistUpgradeViewGtk.py | 9 +- 2 files changed, 249 insertions(+), 107 deletions(-) diff --git a/DistUpgrade/DistUpgrade.glade b/DistUpgrade/DistUpgrade.glade index ba55ace0..598e12be 100644 --- a/DistUpgrade/DistUpgrade.glade +++ b/DistUpgrade/DistUpgrade.glade @@ -38,7 +38,7 @@ True - + <b><big>Upgrading Ubuntu to version 6.10</big></b> False True GTK_JUSTIFY_LEFT @@ -100,101 +100,6 @@ 6 6 - - - 18 - 18 - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 4 - 5 - - - - - - - 18 - 18 - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - - - - - - - 18 - 18 - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - - - - - - - 18 - 18 - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - - - - - - - 18 - 18 - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - - - - True @@ -334,6 +239,246 @@ + + + + True + False + 0 + + + + GTK_ARROW_RIGHT + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + 18 + 18 + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + 1 + 0 + 1 + fill + fill + + + + + + True + False + 0 + + + + GTK_ARROW_RIGHT + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + 18 + 18 + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + 1 + 1 + 2 + fill + fill + + + + + + True + False + 0 + + + + GTK_ARROW_RIGHT + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + 18 + 18 + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + 1 + 2 + 3 + fill + fill + + + + + + True + False + 0 + + + + GTK_ARROW_RIGHT + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + 18 + 18 + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + 1 + 3 + 4 + fill + fill + + + + + + True + False + 0 + + + + GTK_ARROW_RIGHT + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + + 18 + 18 + 0.5 + 0.5 + 0 + 0 + + + 0 + True + True + + + + + 0 + 1 + 4 + 5 + fill + fill + + 0 @@ -1199,15 +1344,7 @@ True - The upgrade of your system requires - - ... to download 2000 MByte - - ... to install 23 new packages - ... to remove 19 packages - ... to update 200 packages - -This is you last chance to cancel the upgrade. + False False GTK_JUSTIFY_LEFT diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 73440f3e..5fd8d560 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -417,11 +417,16 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): if step > 1: image = getattr(self,"image_step%i" % (step-1)) label = getattr(self,"label_step%i" % (step-1)) - image.set_from_stock(gtk.STOCK_APPLY, size) + arrow = getattr(self,"arrow_step%i" % (step-1)) label.set_property("attributes",attrlist) + image.set_from_stock(gtk.STOCK_YES, size) + image.show() + arrow.hide() image = getattr(self,"image_step%i" % step) label = getattr(self,"label_step%i" % step) - image.set_from_stock(gtk.STOCK_YES, size) + arrow = getattr(self,"arrow_step%i" % step) + arrow.show() + image.hide() attr = pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1) # we can't make it bold here without layout changes in the view :( #attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1) -- cgit v1.2.3 From d37a18474fd00a9cb3e57f13517628095c15bba7 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 16:04:40 +0200 Subject: * improve wording of some dialogs: no-longer-supported, no-upgrades-avaiable and replace-conf-file * introduce an abort method for the view to provide a visual feedback that the upgrade was canceled --- DistUpgrade/DistUpgradeControler.py | 17 +++++++++-------- DistUpgrade/DistUpgradeView.py | 3 +++ DistUpgrade/DistUpgradeViewGtk.py | 28 +++++++++++++++++----------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/DistUpgrade/DistUpgradeControler.py b/DistUpgrade/DistUpgradeControler.py index 02d25121..800590cb 100644 --- a/DistUpgrade/DistUpgradeControler.py +++ b/DistUpgrade/DistUpgradeControler.py @@ -485,15 +485,15 @@ class DistUpgradeControler(object): demoted = [pkg.name for pkg in installed_demotions] demoted.sort() logging.debug("demoted: '%s'" % " ".join(demoted)) - self._view.information(_("Some software no longer officially " - "supported"), - _("These installed packages are " - "no longer officially supported, " - "and are now only " - "community-supported ('universe').\n\n" - "If you don't have 'universe' enabled " + self._view.information(_("Support for some applications ended"), + _("Canonical Ltd. no longer provides " + "support for the following software " + "packages. You can still get support " + "from the community.\n\n" + "If you havn't enabled community " + "maintained software (universe), " "these packages will be suggested for " - "removal in the next step. "), + "removal in the next step."), "\n".join(demoted)) # mark packages that are now obsolete (and where not obsolete @@ -544,6 +544,7 @@ class DistUpgradeControler(object): self.aptcdrom.restoreBackup(self.sources_backup_ext) # generate a new cache self._view.updateStatus(_("Restoring original system state")) + self._view.abort() self.openCache() sys.exit(1) diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py index 9fda83d4..d5b430b8 100644 --- a/DistUpgrade/DistUpgradeView.py +++ b/DistUpgrade/DistUpgradeView.py @@ -72,6 +72,9 @@ class DistUpgradeView(object): on the current view """ pass + def abort(): + """ provide a visual feedback that the upgrade was aborted """ + pass def setStep(self, step): """ we have 5 steps current for a upgrade: 1. Analyzing the system diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index 5fd8d560..a61bbcaa 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -199,13 +199,10 @@ class GtkInstallProgressAdapter(InstallProgress): def conffile(self, current, new): logging.debug("got a conffile-prompt from dpkg for file: '%s'" % current) #self.expander.set_expanded(True) - prim = _("Replace configuration file\n'%s'?" % current) - sec = ("The configuration file %s was modified (by " - "you or by a script). An updated version is shipped " - "in this package. If you want to keep your current " - "version say 'Keep'. Do you want to replace the " - "current file and install the new package " - "maintainers version? " % current) + prim = _("Replace the customized configuration file\n'%s'?") % current + sec = _("You will loose all customizations, that have been made by " + "yourself or by a script, if you replace the file by its " + "latest version.") markup = "%s \n\n%s" % (prim, sec) self.parent.label_conffile.set_markup(markup) self.parent.dialog_conffile.set_transient_for(self.parent.window_main) @@ -410,7 +407,16 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): label = getattr(self,"label_step%i" % step) image.hide() label.hide() + def abort(self): + size = gtk.ICON_SIZE_MENU + step = self.step + image = getattr(self,"image_step%i" % step) + arrow = getattr(self,"arrow_step%i" % step) + image.set_from_stock(gtk.STOCK_NO, size) + image.show() + arrow.hide() def setStep(self, step): + self.step = step # first update the "last" step as completed size = gtk.ICON_SIZE_MENU attrlist=pango.AttrList() @@ -422,14 +428,13 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): image.set_from_stock(gtk.STOCK_YES, size) image.show() arrow.hide() + # show the an arrow for the current step and make the label bold image = getattr(self,"image_step%i" % step) label = getattr(self,"label_step%i" % step) arrow = getattr(self,"arrow_step%i" % step) arrow.show() image.hide() attr = pango.AttrWeight(pango.WEIGHT_BOLD, 0, -1) - # we can't make it bold here without layout changes in the view :( - #attr = pango.AttrStyle(pango.STYLE_ITALIC, 0, -1) attrlist.insert(attr) label.set_property("attributes",attrlist) @@ -508,8 +513,9 @@ class DistUpgradeViewGtk(DistUpgradeView,SimpleGladeApp): # Show an error if no actions are planned if (pkgs_upgrade + pkgs_inst + pkgs_remove) < 1: # FIXME: this should go into DistUpgradeController - summary = _("Could not find any upgrades") - msg = _("Your system has already been upgraded.") + summary = _("Your system is up-to-date") + msg = _("There are no upgrades available for your system. " + "The upgrade will now be canceled.") self.error(summary, msg) return False -- cgit v1.2.3 From 2e2c637be425f7ecb4cbaeb8aa27e92c47c54fa0 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 17:16:38 +0200 Subject: * Move the "run full dit upgrade" dialog into the UpdateManager class - to avoid spliting the UI stuff into several classes * Use a glade based dialog with better buttons instead of yes/no * Improved wording --- UpdateManager/UpdateManager.py | 46 ++++-------- data/glade/UpdateManager.glade | 163 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 32 deletions(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 343dcd85..69308ec6 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -219,7 +219,7 @@ class UpdateList: self.importance = importance self.description = desc - def __init__(self, parent_window): + def __init__(self): # a map of packages under their origin pipe = os.popen("lsb_release -c -s") dist = pipe.read().strip() @@ -236,14 +236,12 @@ class UpdateList: self.pkgs = {} self.matcher = {} self.num_updates = 0 - self.parent_window = parent_window for (origin, archive, desc, importance) in templates: self.matcher[(origin, archive)] = self.UpdateOrigin(desc, importance) self.unknown_origin = self.UpdateOrigin(_("Other updates"), -1) def update(self, cache): held_back = [] - broken = [] # do the upgrade cache.saveDistUpgrade() @@ -268,34 +266,7 @@ class UpdateList: held_back.append(pkg.name) for l in self.pkgs.keys(): self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) - - # check if we have held-back something - if cache._depcache.KeepCount > 0: - keepcount = cache._depcache.KeepCount - msg = ("%s\n\n%s" % \ - (_("Cannot install all available updates"), - _("Some of the updates require more extensive changes " - "than expected.\n\n" - "This usually means that you have enabled unoffical " - "repositories, that it is not " - "fully upgraded from the last distribution release or " - "that you run a development release " - "of the distribution.\n\n" - "Would you like to perform a full distribution upgrade " - "now?"))) - dialog = gtk.MessageDialog(self.parent_window, 0, - gtk.MESSAGE_QUESTION, - gtk.BUTTONS_YES_NO,"") - dialog.set_default_response(gtk.RESPONSE_NO) - dialog.set_markup(msg) - dialog.set_title("") - dialog.vbox.set_spacing(6) - res = dialog.run() - if res == gtk.RESPONSE_YES: - os.execl("/usr/bin/gksu", - "/usr/bin/gksu", - "/usr/bin/update-manager --dist-upgrade") - dialog.destroy() + self.keepcount = cache._depcache.KeepCount class UpdateManagerDbusControler(dbus.service.Object): @@ -811,7 +782,7 @@ class UpdateManager(SimpleGladeApp): self.dl_size = 0 self.store.clear() self.initCache() - self.list = UpdateList(self.window_main) + self.list = UpdateList() # fill them again self.list.update(self.cache) @@ -929,6 +900,16 @@ class UpdateManager(SimpleGladeApp): if res == gtk.RESPONSE_YES: self.on_button_reload_clicked(None) + def check_all_updates_installable(self): + """ Check if all available updates can be installed and suggest + to run a distribution upgrade if not """ + if self.list.keepcount > 0: + self.dialog_dist_upgrade.set_transient_for(self.window_main) + res = self.dialog_dist_upgrade.run() + if res == gtk.RESPONSE_YES: + os.execl("/usr/bin/gksu", + "/usr/bin/gksu", + "/usr/bin/update-manager --dist-upgrade") def main(self, options): gconfclient = gconf.client_get_default() @@ -945,5 +926,6 @@ class UpdateManager(SimpleGladeApp): gtk.main_iteration() self.fillstore() + self.check_all_updates_installable() self.check_auto_update() gtk.main() diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index bb78008c..e9fd6bfc 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -1453,4 +1453,167 @@ Software updates correct errors, eliminate security vulnerabilities and provide + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + _Distribution Upgrade + True + GTK_RELIEF_NORMAL + True + -8 + + + + + + True + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-warning + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + True + <big><b>Not all updates can be installed</b></big> + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + Run a distribution upgrade, to install as many updates as possible. + +This can be caused by an uncompleted upgrade, unofficial software packages or by running a development version. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + -- cgit v1.2.3 From 134c1c31fcbdc975d68ebb39e83c01830f078cc3 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 17:34:04 +0200 Subject: * show not installable updates as disabled in the update list * also check for non installable updates after an "apt-get update" --- UpdateManager/UpdateManager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 69308ec6..623b406d 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -241,14 +241,14 @@ class UpdateList: self.unknown_origin = self.UpdateOrigin(_("Other updates"), -1) def update(self, cache): - held_back = [] + self.held_back = [] # do the upgrade cache.saveDistUpgrade() # sort by origin for pkg in cache: - if pkg.markedUpgrade or pkg.markedInstall: + if pkg.markedUpgrade or pkg.markedInstall or pkg.isUpgradable: # TRANSLATORS: updates from an 'unknown' origin originstr = _("Other updates") for aorigin in pkg.candidateOrigin: @@ -262,8 +262,8 @@ class UpdateList: self.pkgs[origin_node] = [] self.pkgs[origin_node].append(pkg) self.num_updates = self.num_updates + 1 - elif pkg.isUpgradable: - held_back.append(pkg.name) + if pkg.isUpgradable: + self.held_back.append(pkg.name) for l in self.pkgs.keys(): self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) self.keepcount = cache._depcache.KeepCount @@ -390,6 +390,8 @@ class UpdateManager(SimpleGladeApp): return to_install = pkg.markedInstall or pkg.markedUpgrade renderer.set_property("active", to_install) + if pkg.name in self.list.held_back: + renderer.set_property("activatable", False) def package_column_view_func(self, cell_layout, renderer, model, iter): self.header_column_func(cell_layout, renderer, model, iter) @@ -705,6 +707,8 @@ class UpdateManager(SimpleGladeApp): self.window_main.set_sensitive(True) self.window_main.window.set_cursor(None) + self.check_all_updates_installable() + def inhibit_sleep(self): """Send a dbus signal to gnome-power-manager to not suspend the system""" -- cgit v1.2.3 From ae0d9a877711e2f12cf7e62899d5cc60d50e9bd0 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 17:58:30 +0200 Subject: * use a different label for the cache progress dialog if it gets reinitiated * clear the store after the long caching process to reduce visual noise * move the check_all_updates_installable call into fillstore itself --- UpdateManager/UpdateManager.py | 7 ++++--- data/glade/UpdateManager.glade | 29 ++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 623b406d..432a00e0 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -699,6 +699,7 @@ class UpdateManager(SimpleGladeApp): time.sleep(0.05) while gtk.events_pending(): gtk.main_iteration() + self.label_cache_progress_title.set_label("%s" % _("Checking for updates")) self.fillstore() # Allow suspend after synaptic is finished @@ -707,7 +708,6 @@ class UpdateManager(SimpleGladeApp): self.window_main.set_sensitive(True) self.window_main.window.set_cursor(None) - self.check_all_updates_installable() def inhibit_sleep(self): """Send a dbus signal to gnome-power-manager to not suspend @@ -784,8 +784,8 @@ class UpdateManager(SimpleGladeApp): # clean most objects self.dl_size = 0 - self.store.clear() self.initCache() + self.store.clear() self.list = UpdateList() # fill them again @@ -814,6 +814,7 @@ class UpdateManager(SimpleGladeApp): self.store.append([contents, pkg.name, pkg]) self.update_count() self.setBusy(False) + self.check_all_updates_installable() return False def dist_no_longer_supported(self, meta_release): @@ -910,6 +911,7 @@ class UpdateManager(SimpleGladeApp): if self.list.keepcount > 0: self.dialog_dist_upgrade.set_transient_for(self.window_main) res = self.dialog_dist_upgrade.run() + self.dialog_dist_upgrade.hide() if res == gtk.RESPONSE_YES: os.execl("/usr/bin/gksu", "/usr/bin/gksu", @@ -930,6 +932,5 @@ class UpdateManager(SimpleGladeApp): gtk.main_iteration() self.fillstore() - self.check_all_updates_installable() self.check_auto_update() gtk.main() diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index e9fd6bfc..2a4965fd 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -1371,11 +1371,34 @@ Your system does not check for updates automatically. You can configure this beh 12 - + True - <big><b>Starting update manager</b></big> + <big><b>Starting update manager</b></big> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + -Software updates correct errors, eliminate security vulnerabilities and provide new features. + + + True + Software updates correct errors, eliminate security vulnerabilities and provide new features. False True GTK_JUSTIFY_LEFT -- cgit v1.2.3