From fe3677526ec65d560240f346b36a460b941b1241 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 19 Mar 2008 18:38:59 -0400 Subject: [PATCH] Rework the update viewer ui to be a bit friendlier --- data/pk-update-viewer.glade | 265 ++++++++++++++++--------------------------- src/pk-update-viewer.c | 78 ++++--------- 2 files changed, 125 insertions(+), 218 deletions(-) diff --git a/data/pk-update-viewer.glade b/data/pk-update-viewer.glade index f0d9b40..60d75f6 100644 --- a/data/pk-update-viewer.glade +++ b/data/pk-update-viewer.glade @@ -14,9 +14,8 @@ True - + True - True True @@ -65,12 +64,10 @@ True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Time since last refresh: @@ -81,7 +78,6 @@ True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Unknown.... @@ -110,9 +106,6 @@ True 0 - - True - @@ -275,25 +268,13 @@ - - True - Preview - - - tab - False - - - - True 12 12 True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True @@ -383,9 +364,6 @@ True 0 - - True - @@ -505,45 +483,40 @@ - - True - Details - - - tab - 1 - False - - - - True 12 6 - + True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - True - True - False - - + 0 + 0 + True + + False + False + - + True 0.10000000149 False False + 1 + + + + + True + PANGO_ELLIPSIZE_END + + + False + False 2 @@ -560,9 +533,6 @@ True 0 - - True - @@ -628,7 +598,7 @@ False False GTK_PACK_END - 1 + 3 @@ -637,103 +607,111 @@ - - True - Progress - - - tab - 2 - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 5 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 18 + 12 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>System Update Completed!</b> - True - - - False - False - - + gtk-dialog-info + 6 False - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 10 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - All selected updates have been successfully installed + + + True + <b>System Update Completed</b> + True + + + False + False + + False - False - - - False - 1 - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - gtk-dialog-info - 6 + + + True + All selected updates have been successfully installed + + + False + False + + False + 1 - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - <b>A system restart is recommended</b> - True + 12 + + + True + gtk-dialog-warning + 2 + + + False + False + + + + + True + A system restart is recommended + True + + + False + False + 1 + + False False - 1 + 2 + + + + + True + + + + 3 - False - False - 2 + 1 @@ -751,9 +729,6 @@ True 0 - - True - @@ -827,31 +802,16 @@ - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Confirm - - - tab - 3 - False - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 12 5 True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 12 True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK gtk-dialog-error 6 @@ -864,16 +824,13 @@ True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 10 True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Update was cancelled</b> True @@ -890,11 +847,9 @@ True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK The transaction was cancelled before any actions were taken @@ -912,15 +867,12 @@ True True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Geeky information about the error... True True @@ -934,7 +886,6 @@ True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>More details:</b> True @@ -950,6 +901,15 @@ 2 + + + True + + + + 3 + + False @@ -962,7 +922,7 @@ True - 5 + 6 GTK_BUTTONBOX_END @@ -972,9 +932,6 @@ True 0 - - True - @@ -1001,29 +958,7 @@ 4 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Error - - - tab - 4 - False - - - - - - - True - - False - False - 1 - diff --git a/src/pk-update-viewer.c b/src/pk-update-viewer.c index b78ace3..e6d961d 100644 --- a/src/pk-update-viewer.c +++ b/src/pk-update-viewer.c @@ -46,13 +46,11 @@ static GladeXML *glade_xml = NULL; static GtkListStore *list_store_preview = NULL; -static GtkListStore *list_store_history = NULL; static GtkListStore *list_store_details = NULL; static GtkListStore *list_store_description = NULL; static PkClient *client = NULL; static PkTaskList *tlist = NULL; static gchar *package = NULL; -static PkStatusbar *statusbar = NULL; enum { PREVIEW_COLUMN_ICON, @@ -106,9 +104,19 @@ pk_button_help_cb (GtkWidget *widget, gboolean data) static void pk_updates_set_page (PkPageEnum page) { + GList *list, *l; GtkWidget *widget; - widget = glade_xml_get_widget (glade_xml, "notebook_hidden"); - gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), page); + int i; + + widget = glade_xml_get_widget (glade_xml, "hbox_hidden"); + list = gtk_container_get_children (GTK_CONTAINER (widget)); + for (l = list, i = 0; l; l = l->next, i++) { + if (i == page) { + gtk_widget_show (l->data); + } else { + gtk_widget_hide (l->data); + } + } /* some pages are resizeable */ widget = glade_xml_get_widget (glade_xml, "window_updates"); @@ -287,7 +295,6 @@ pk_updates_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_i PkRoleEnum role; const gchar *icon_name; GtkWidget *widget; - GtkTreePath *path; pk_client_get_role (client, &role, NULL, NULL); pk_debug ("role = %s, package = %s:%s:%s", pk_role_enum_to_text (role), @@ -310,19 +317,9 @@ pk_updates_package_cb (PkClient *client, PkInfoEnum info, const gchar *package_i if (role == PK_ROLE_ENUM_UPDATE_SYSTEM || role == PK_ROLE_ENUM_UPDATE_PACKAGES) { - text = pk_package_id_pretty (package_id, summary); - icon_name = pk_info_enum_to_icon_name (info); - pk_debug ("text=%s", text); - gtk_list_store_prepend (list_store_history, &iter); - gtk_list_store_set (list_store_history, &iter, - HISTORY_COLUMN_TEXT, text, - HISTORY_COLUMN_ICON, icon_name, - -1); - - /* move focus to top entry */ - widget = glade_xml_get_widget (glade_xml, "treeview_history"); - path = gtk_tree_path_new_from_indices (0, -1); - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (widget), path, NULL, FALSE, 0.0, 0.0); + text = pk_package_id_pretty_oneline (package_id, summary); + widget = glade_xml_get_widget (glade_xml, "progress_package_label"); + gtk_label_set_markup (GTK_LABEL (widget), text); g_free (text); return; @@ -498,7 +495,13 @@ pk_updates_update_detail_cb (PkClient *client, const gchar *package_id, static void pk_updates_status_changed_cb (PkClient *client, PkStatusEnum status, gpointer data) { - pk_statusbar_set_status (statusbar, status); + GtkWidget *widget; + gchar *text; + + widget = glade_xml_get_widget (glade_xml, "progress_part_label"); + text = g_strdup_printf ("%s", pk_status_enum_to_localised_text (status)); + gtk_label_set_markup (GTK_LABEL (widget), text); + g_free (text); } /** @@ -753,9 +756,6 @@ pk_updates_finished_cb (PkClient *client, PkExitEnum exit, guint runtime, gpoint pk_client_get_role (client, &role, NULL, NULL); - /* hide widget */ - pk_statusbar_hide (statusbar); - if (role == PK_ROLE_ENUM_REFRESH_CACHE) { pk_client_reset (client, NULL); @@ -918,17 +918,11 @@ pk_updates_progress_changed_cb (PkClient *client, guint percentage, guint subper guint elapsed, guint remaining, gpointer data) { GtkWidget *widget; - widget = glade_xml_get_widget (glade_xml, "progressbar_subpercent"); + widget = glade_xml_get_widget (glade_xml, "progressbar_percent"); - if (subpercentage == PK_CLIENT_PERCENTAGE_INVALID) { - gtk_widget_hide (widget); - } else { + if (subpercentage != PK_CLIENT_PERCENTAGE_INVALID) { gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), (gfloat) subpercentage / 100.0); - gtk_widget_show (widget); } - - pk_statusbar_set_percentage (statusbar, percentage); - pk_statusbar_set_remaining (statusbar, remaining); } /** @@ -1088,11 +1082,6 @@ main (int argc, char *argv[]) /* Hide window first so that the dialogue resizes itself without redrawing */ gtk_widget_hide (main_window); - /* hide the tabs */ - widget = glade_xml_get_widget (glade_xml, "notebook_hidden"); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); - gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); - /* hide until we have updates */ widget = glade_xml_get_widget (glade_xml, "hbox_reboot"); gtk_widget_hide (widget); @@ -1173,7 +1162,6 @@ main (int argc, char *argv[]) list_store_details = gtk_list_store_new (PACKAGES_COLUMN_LAST, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_BOOLEAN); list_store_preview = gtk_list_store_new (PREVIEW_COLUMN_LAST, G_TYPE_STRING, G_TYPE_STRING); - list_store_history = gtk_list_store_new (PREVIEW_COLUMN_LAST, G_TYPE_STRING, G_TYPE_STRING); list_store_description = gtk_list_store_new (DESC_COLUMN_LAST, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); /* sorted */ @@ -1189,12 +1177,7 @@ main (int argc, char *argv[]) pk_treeview_add_columns (GTK_TREE_VIEW (widget)); gtk_tree_view_columns_autosize (GTK_TREE_VIEW (widget)); - /* create history tree view */ - widget = glade_xml_get_widget (glade_xml, "treeview_history"); - gtk_tree_view_set_model (GTK_TREE_VIEW (widget), - GTK_TREE_MODEL (list_store_history)); - - /* create history tree view */ + /* create description tree view */ widget = glade_xml_get_widget (glade_xml, "treeview_description"); gtk_tree_view_set_model (GTK_TREE_VIEW (widget), GTK_TREE_MODEL (list_store_description)); @@ -1216,19 +1199,10 @@ main (int argc, char *argv[]) pk_treeview_add_columns_update (GTK_TREE_VIEW (widget)); gtk_tree_view_columns_autosize (GTK_TREE_VIEW (widget)); - /* use the in-statusbar for progress */ - statusbar = pk_statusbar_new (); - widget = glade_xml_get_widget (glade_xml, "statusbar_status"); - pk_statusbar_set_widget (statusbar, widget); - /* make the refresh button non-clickable until we get completion */ widget = glade_xml_get_widget (glade_xml, "button_refresh"); gtk_widget_set_sensitive (widget, FALSE); - /* assume we don't get this yet */ - widget = glade_xml_get_widget (glade_xml, "progressbar_subpercent"); - gtk_widget_hide (widget); - /* set the last updated text */ pk_update_update_last_refreshed_time (client); @@ -1248,13 +1222,11 @@ main (int argc, char *argv[]) g_object_unref (glade_xml); g_object_unref (list_store_preview); - g_object_unref (list_store_history); g_object_unref (list_store_description); g_object_unref (list_store_details); g_object_unref (client); g_object_unref (pconnection); g_object_unref (role_list); - g_object_unref (statusbar); g_free (package); return 0; -- 1.5.4.4