[zypp-commit] r7274 - in /trunk/updater-gnome: ./ images/16x16/apps/ images/16x16/status/ images/22x22/apps/ images/22x22/status/ src/ src/zypp/

Author: joshkress Date: Mon Sep 17 18:46:29 2007 New Revision: 7274 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7274&view=rev Log: * Updated icons (jimmac@novell.com) * Various fixes * Tooltips * i18n Modified: trunk/updater-gnome/images/16x16/apps/opensuseupdater.png trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg trunk/updater-gnome/images/16x16/status/opensuseupdater_green.png trunk/updater-gnome/images/22x22/apps/opensuseupdater.png trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg trunk/updater-gnome/images/22x22/status/opensuseupdater_green.png trunk/updater-gnome/opensuse-updater-gnome.spec trunk/updater-gnome/src/updater-applet-callbacks.c trunk/updater-gnome/src/updater-applet-support.c trunk/updater-gnome/src/updater-applet-support.h trunk/updater-gnome/src/updater-applet.c trunk/updater-gnome/src/updater-backend.c trunk/updater-gnome/src/updater-callbacks.c trunk/updater-gnome/src/updater-support.c trunk/updater-gnome/src/updater.c trunk/updater-gnome/src/updater.h trunk/updater-gnome/src/zypp/updater-zypper-gui.c Modified: trunk/updater-gnome/images/16x16/apps/opensuseupdater.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/16x16/apps/opensuseupdater.png?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg (original) +++ trunk/updater-gnome/images/16x16/apps/opensuseupdater.svg Mon Sep 17 18:46:29 2007 @@ -8,7 +8,7 @@ xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:x="adobe:ns:meta/" xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" + xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -25,14 +25,29 @@ xml:space="preserve" id="svg2" sodipodi:version="0.32" - inkscape:version="0.44.1" - sodipodi:docname="gekko-head-updater.svg" + inkscape:version="0.45+devel" + sodipodi:docname="opensuseupdater.svg" sodipodi:docbase="/suse/jkress/Desktop/local-home/contexts/artwork/updater/16x16td" version="1.0" inkscape:export-filename="/suse/jkress/Desktop/local-home/contexts/artwork/updater/16x16td/gekko-head-updater.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + showgrid="true" + borderlayer="true" + inkscape:showpageshadow="false"> ns:variableSets @@ -6659,14 +6678,14 @@ inkscape:label="Gekko" style="display:inline"> \ No newline at end of file Modified: trunk/updater-gnome/images/16x16/status/opensuseupdater_green.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/16x16/status/opensuseupdater_green.png?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/updater-gnome/images/22x22/apps/opensuseupdater.png URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/22x22/apps/opensuseupdater.png?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg (original) +++ trunk/updater-gnome/images/22x22/apps/opensuseupdater.svg Mon Sep 17 18:46:29 2007 @@ -8,7 +8,7 @@ xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/" xmlns:x="adobe:ns:meta/" xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" + xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -25,14 +25,29 @@ xml:space="preserve" id="svg2" sodipodi:version="0.32" - inkscape:version="0.44.1" - sodipodi:docname="gekko-head-updater.svg" + inkscape:version="0.45+devel" + sodipodi:docname="opensuseupdater.svg" sodipodi:docbase="/suse/jkress/Desktop/local-home/contexts/artwork/updater/22x22td" version="1.0" inkscape:export-filename="/suse/jkress/Desktop/local-home/contexts/artwork/updater/22x22td/gekko-head-updater.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + height="22px" + borderlayer="true" + inkscape:showpageshadow="false"> ns:variableSets @@ -6667,20 +6686,20 @@ inkscape:label="Gekko" style="display:inline">http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/images/22x22/status/opensuseupdater_green.png?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/updater-gnome/opensuse-updater-gnome.spec URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/opensuse-updater-gnome.spec?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/opensuse-updater-gnome.spec (original) +++ trunk/updater-gnome/opensuse-updater-gnome.spec Mon Sep 17 18:46:29 2007 @@ -1,5 +1,5 @@ # -# spec file for package opensuse-updater-gnome (Version 0.4.2) +# spec file for package opensuse-updater-gnome (Version 0.4.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,13 +16,13 @@ License: GPL v2 or later Group: System/Packages Summary: GNOME updater applet for OpenSUSE -Version: 0.4.2 +Version: 0.4.3 Release: 1 URL: http://en.opensuse.org/GNOME_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: /usr Source0: %{name}-%{version}.tar.bz2 -Requires: zypper >= 0.8.18 +Requires: zypper >= 0.8.20 Requires: libglade2 libgnome gnome-panel libgnomesu # No translations yet. # Requires: %{name}-lang = %{version} @@ -96,6 +96,9 @@ #%files lang -f %{name}.lang %changelog +* Mon Sep 17 2007 - jkress@suse.de +- v0.4.3 +- zypper dependency bumped to v0.8.20 * Mon Sep 03 2007 - jkress@suse.de - v0.4.2 - zypper dependency bumped to v0.8.18 Modified: trunk/updater-gnome/src/updater-applet-callbacks.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet-callbacks.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-applet-callbacks.c (original) +++ trunk/updater-gnome/src/updater-applet-callbacks.c Mon Sep 17 18:46:29 2007 @@ -162,6 +162,7 @@ updater_ui_set_for_active_operation(applet->updater, TRUE); updater_applet_set_icon(applet, ICON_BUSY); + gtk_status_icon_set_tooltip (GTK_STATUS_ICON (applet->applet_icon), _("Checking for updates...")); } /*-------------------------( verb_applet_quit )------------------------------*/ Modified: trunk/updater-gnome/src/updater-applet-support.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet-support.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-applet-support.c (original) +++ trunk/updater-gnome/src/updater-applet-support.c Mon Sep 17 18:46:29 2007 @@ -15,6 +15,11 @@ gtk_status_icon_set_from_stock (GTK_STATUS_ICON (applet->applet_icon), icon_stock_id); } +void updater_applet_set_tooltip(UpdaterApplet *applet, char *tooltip_message) +{ + gtk_status_icon_set_tooltip (GTK_STATUS_ICON (applet->applet_icon), tooltip_message); +} + void updater_applet_restart(UpdaterApplet *applet) { g_print ("updater_applet_restart: calling updater_destroy!\n"); Modified: trunk/updater-gnome/src/updater-applet-support.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet-support.h?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-applet-support.h (original) +++ trunk/updater-gnome/src/updater-applet-support.h Mon Sep 17 18:46:29 2007 @@ -36,6 +36,8 @@ /** Sets applet icon to \a icon_stock_id. See ICON_* stock IDs definitions. */ void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id); +void updater_applet_set_tooltip(UpdaterApplet *applet, char *tooltip_message); + void updater_applet_restart(UpdaterApplet *applet); #endif /*UPDATERAPPLET_H_*/ Modified: trunk/updater-gnome/src/updater-applet.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-applet.c (original) +++ trunk/updater-gnome/src/updater-applet.c Mon Sep 17 18:46:29 2007 @@ -176,6 +176,7 @@ // create applet widgets (initial applet icon) applet->applet_icon = (GtkWidget *) gtk_status_icon_new_from_stock (ICON_GREEN); + updater_applet_set_tooltip(applet, _("System is up-to-date")); // create applet menus applet->popup_factory = gtk_item_factory_new (GTK_TYPE_MENU, "<main>", NULL); @@ -248,7 +249,7 @@ // sleep(5); gtk_init (&argc, &argv); - g_set_application_name (_("OpenSuSE Updater")); + g_set_application_name (_("openSuSE Updater")); /* if (!have_tray ()) Modified: trunk/updater-gnome/src/updater-backend.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backend.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-backend.c (original) +++ trunk/updater-gnome/src/updater-backend.c Mon Sep 17 18:46:29 2007 @@ -191,11 +191,20 @@ } if (mandatory_count > 0) + { updater_applet_set_icon(updater->applet, ICON_RED); + updater_applet_set_tooltip(updater->applet, _("Mandatory updates available")); + } else if (optional_count > 0) + { updater_applet_set_icon(updater->applet, ICON_YELLOW); + updater_applet_set_tooltip(updater->applet, _("Additional updates available")); + } else + { updater_applet_set_icon(updater->applet, ICON_GREEN); + updater_applet_set_tooltip(updater->applet, _("Your system is up-to-date")); + } // update the ui elements with new data Modified: trunk/updater-gnome/src/updater-callbacks.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-callbacks.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-callbacks.c (original) +++ trunk/updater-gnome/src/updater-callbacks.c Mon Sep 17 18:46:29 2007 @@ -6,6 +6,7 @@ #include "updater-backend.h" #include "updater.h" #include +#include "updater-applet-support.h" void on_mainWindow_destroy (GtkWidget *widget, gpointer user_data) @@ -203,6 +204,7 @@ gtk_widget_destroy(updater->simple_window); updater_ui_set_for_active_operation(updater, TRUE); + updater_applet_set_tooltip(updater->applet, _("Installing updates...")); } } Modified: trunk/updater-gnome/src/updater-support.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-support.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-support.c (original) +++ trunk/updater-gnome/src/updater-support.c Mon Sep 17 18:46:29 2007 @@ -280,66 +280,76 @@ */ if (all_count == 0) { + gchar *markup; + markup = g_markup_printf_escaped ("%s</span>", + _("Your system is up-to-date.")); gtk_label_set_markup (GTK_LABEL (updater->simple_window_labelTitle), - "Your system is up-to-date.</span>"); - gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), "There are no updates that need to be installed."); - gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), "No optional updates available"); + markup); + gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), _("There are no updates that need to be installed.")); + gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), _("No optional updates available")); gtk_widget_set_sensitive (updater->simple_window_checkbuttonRecommended, FALSE); gtk_widget_hide (updater->simple_window_checkbuttonRestart); gtk_widget_set_sensitive (updater->simple_window_buttonDetails, FALSE); gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); + g_free (markup); } else { - gtk_label_set_markup (GTK_LABEL (updater->simple_window_labelTitle), - "New software for your system is available</span>"); - /* Restart are excluded */ - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRestart))) - { - str = g_strdup_printf("%d mandatory updates are about to be installed", - (mandatory_count - mandatory_restart_count)); - gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str); - g_free(str); - - str = g_strdup_printf("include %d additional updates", - (optional_count - optional_restart_count)); - gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str); - g_free(str); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended))) - { - if ((mandatory_count == mandatory_restart_count) && (optional_count == optional_restart_count)) - { + gchar *markup; + markup = g_markup_printf_escaped ("%s</span>", + _("New software for your system is available")); + gtk_label_set_markup (GTK_LABEL (updater->simple_window_labelTitle), + markup); + g_free(markup); + /* Restart are excluded */ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRestart))) + { + str = g_strdup_printf(ngettext ("%d mandatory update is about to be installed", + "%d mandatory updates are about to be installed", + (mandatory_count - mandatory_restart_count)), + (mandatory_count - mandatory_restart_count)); + gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str); + g_free(str); + + str = g_strdup_printf("include %d additional updates", + (optional_count - optional_restart_count)); + gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str); + g_free(str); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended))) + { + if ((mandatory_count == mandatory_restart_count) && (optional_count == optional_restart_count)) + { + gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); + } + } + else + { + if ((mandatory_count == mandatory_restart_count)) + { + gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); + } + } + } + else /* Restart updates are included */ + { + str = g_strdup_printf("%d mandatory updates are about to be installed", + mandatory_count); + gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str); + g_free(str); + + str = g_strdup_printf("include %d additional updates", + optional_count); + gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str); + g_free(str); + + /* We have only additional updates */ + if ((mandatory_count == 0) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended))) + { + /* Only additional available and they are deselected */ gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); - } - } - else - { - if ((mandatory_count == mandatory_restart_count)) - { - gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); - } - } - } - else /* Restart updates are included */ - { - str = g_strdup_printf("%d mandatory updates are about to be installed", - mandatory_count); - gtk_label_set_text (GTK_LABEL (updater->simple_window_labelUpdates), str); - g_free(str); - - str = g_strdup_printf("include %d additional updates", - optional_count); - gtk_button_set_label (GTK_BUTTON (updater->simple_window_checkbuttonRecommended), str); - g_free(str); - - /* We have only additional updates */ - if ((mandatory_count == 0) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended))) - { - /* Only additional available and they are deselected */ - gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE); - } - } + } + } } } Modified: trunk/updater-gnome/src/updater.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater.c (original) +++ trunk/updater-gnome/src/updater.c Mon Sep 17 18:46:29 2007 @@ -5,6 +5,7 @@ #include "updater.h" #include "updater-support.h" #include "updater-callbacks.h" +#include "updater-applet-support.h" // ---------------------------------------------------------------------------- @@ -425,6 +426,7 @@ g_print ("DONE\n"); updater_ui_set_for_active_operation(updater, TRUE); + updater_applet_set_tooltip(updater->applet, _("Checking for updates...")); } // ---------------------------------------------------------------------------- Modified: trunk/updater-gnome/src/updater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.h?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/updater.h (original) +++ trunk/updater-gnome/src/updater.h Mon Sep 17 18:46:29 2007 @@ -13,6 +13,7 @@ #include #include #include +#include #include "updater-backend.h" Modified: trunk/updater-gnome/src/zypp/updater-zypper-gui.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-zypper-gui.c?rev=7274&r1=7273&r2=7274&view=diff ============================================================================== --- trunk/updater-gnome/src/zypp/updater-zypper-gui.c (original) +++ trunk/updater-gnome/src/zypp/updater-zypper-gui.c Mon Sep 17 18:46:29 2007 @@ -2,6 +2,7 @@ #include #include #include +#include /* --- Set up the variables ---------------------------------------------- */ GString *security_patch_line; @@ -37,30 +38,34 @@ recommended_patch_line = g_string_new(""); package_line = g_string_new(""); + /* printf("%d\n", *argc); printf("%s\n", argv[0][1]); + */ if (!g_ascii_strcasecmp(argv[0][1], "ZOPTIONS_RESTART_TRUE")) restart_included = TRUE; - printf("%s\n", argv[0][2]); + /* printf("%s\n", argv[0][2]); */ if (!g_ascii_strcasecmp(argv[0][2], "ZOPTIONS_RECOMMENDED_TRUE")) recommended_included = TRUE; - printf("%s\n", argv[0][3]); + /* printf("%s\n", argv[0][3]); */ if (!g_ascii_strcasecmp(argv[0][3], "ZOPTIONS_PACKAGES_TRUE")) packages_included = TRUE; - printf("%s\n", argv[0][4]); + /* printf("%s\n", argv[0][4]); */ spatch_count = (guint16) atoi(argv[0][4]); - printf("%s\n", argv[0][5]); + /* printf("%s\n", argv[0][5]);*/ rpatch_count = (guint16) atoi(argv[0][5]); - printf("%s\n", argv[0][6]); + /* printf("%s\n", argv[0][6]);*/ package_count = (guint16) atoi(argv[0][6]); + /* g_print("Security Count: %d\n", spatch_count); g_print("Recommended Count: %d\n", rpatch_count); g_print("Package Count: %d\n\n", package_count); + */ /* --- Create security patch line -------------------------------------- */ spatch_limit = 7 + spatch_count; @@ -74,8 +79,10 @@ g_string_append_printf(security_patch_line, " %s", argv[0][i]); } + /* g_print("Security Limit: %d\n", spatch_limit); g_print("Security Patches: %s\n\n", security_patch_line->str); + */ } /* --- Create recommended patch list if possible ----------------------- */ @@ -87,8 +94,10 @@ g_string_append_printf(recommended_patch_line, " %s", argv[0][i]); } + /* g_print("Recommended Limit: %d\n", rpatch_limit); g_print("Recommended Patches: %s\n\n", recommended_patch_line->str); + */ } /* --- Create package list if possible --------------------------------- */ @@ -100,8 +109,10 @@ g_string_append_printf(package_line, " %s", argv[0][i]); } + /* g_print("Package Limit: %d\n", package_limit); g_print("Packages: %s\n\n", package_line->str); + */ } } @@ -123,10 +134,11 @@ */ dialog = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (dialog), "Update Progress"); + gtk_window_set_title (GTK_WINDOW (dialog), _("Update Progress")); gtk_window_set_deletable (GTK_WINDOW (dialog), FALSE); gtk_window_set_icon_from_file (GTK_WINDOW (dialog), "/usr/share/opensuse-updater-gnome/images/updater_logo.png", NULL); gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS); + gtk_window_set_default_size (GTK_WINDOW (dialog), 200, -1); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); vbox = gtk_vbox_new (FALSE, 12); @@ -154,11 +166,14 @@ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), - "Update in progress</span>\n" - "\n" - "You're not able to stop this process in order to ensure\n" - "integrity of your system. Please be patient."); + gchar *label_markup; + label_markup = g_markup_printf_escaped ("%s</span>\n\n%s", + _("Update in progress"), + _("You're not able to stop this process in order to ensure integrity of your system. Please be patient.")); + gtk_label_set_markup (GTK_LABEL (label), label_markup); + g_free (label_markup); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_widget_set_size_request (label, 300, -1); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); @@ -177,9 +192,9 @@ gtk_box_pack_start (GTK_BOX (hbox), imageSecurity, FALSE, FALSE, 0); if (spatch_count == 0) - label = gtk_label_new ("No mandatory updates to apply"); + label = gtk_label_new (_("No mandatory updates to apply")); else - label = gtk_label_new ("Applying mandatory updates"); + label = gtk_label_new (_("Applying mandatory updates")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); @@ -196,9 +211,9 @@ gtk_box_pack_start (GTK_BOX (hbox), imageRecommended, FALSE, FALSE, 0); if (recommended_included || packages_included) - label = gtk_label_new ("Applying additional updates"); + label = gtk_label_new (_("Applying additional updates")); else - label = gtk_label_new ("No additional updates to apply"); + label = gtk_label_new (_("No additional updates to apply")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); @@ -233,18 +248,18 @@ { if (security_patches_done) { - if (!recommended_patches_done) + gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + if (!recommended_patches_done && recommended_included) { - gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Applying additional updates..."); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Applying additional updates...")); } else - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Applying additional package updates..."); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Applying additional package updates...")); } else { gtk_image_set_from_stock (GTK_IMAGE (imageSecurity), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Applying mandatory updates..."); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Applying mandatory updates...")); } while (gtk_events_pending ()) gtk_main_iteration(); @@ -258,7 +273,7 @@ { gtk_image_set_from_stock (GTK_IMAGE (imageRecommended), GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar), 1.0); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Additonal updates done."); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Additonal updates done.")); while (gtk_events_pending ()) gtk_main_iteration(); g_usleep (1000000); @@ -268,7 +283,7 @@ { GtkWidget *successdialog, *successlabel, *vbox; - successdialog = gtk_dialog_new_with_buttons ("Updates installed", + successdialog = gtk_dialog_new_with_buttons (_("Updates installed"), NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_OK, @@ -310,7 +325,7 @@ { GtkWidget *successdialog, *successlabel, *vbox; - successdialog = gtk_dialog_new_with_buttons ("Updates installed", + successdialog = gtk_dialog_new_with_buttons (_("Updates installed"), NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_OK, @@ -349,13 +364,13 @@ else { recommended_patches_done = TRUE; - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Checking for additional package updates"); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Checking for additional package updates")); } } else { gtk_image_set_from_stock (GTK_IMAGE (imageSecurity), GTK_STOCK_APPLY, GTK_ICON_SIZE_MENU); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), "Mandatory updates done."); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar), _("Mandatory updates done.")); security_patches_done = TRUE; if (!recommended_included && !packages_included) @@ -365,7 +380,7 @@ { GtkWidget *successdialog, *successlabel, *vbox; - successdialog = gtk_dialog_new_with_buttons ("Updates installed", + successdialog = gtk_dialog_new_with_buttons (_("Updates installed"), NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_OK, @@ -407,7 +422,7 @@ { GtkWidget *successdialog, *successlabel, *vbox; - successdialog = gtk_dialog_new_with_buttons ("Updates installed", + successdialog = gtk_dialog_new_with_buttons (_("Updates installed"), NULL, GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_OK, @@ -502,7 +517,7 @@ if (spatch_count > 0) { command_security = g_string_prepend(security_patch_line, "zypper -q --terse --non-interactive in -l -t patch --name "); - g_print("%s\n", command_security->str); + /* g_print("%s\n", command_security->str); */ /* DEBUGGING */ /* @@ -519,7 +534,7 @@ if (rpatch_count > 0) { command_recommended = g_string_prepend(recommended_patch_line, "zypper -q --terse --non-interactive in -l -t patch --name "); - g_print("%s\n", command_recommended->str); + /* g_print("%s\n", command_recommended->str); */ /* DEBUGGING */ /* @@ -538,7 +553,7 @@ if (package_count > 0) { command_packages = g_string_prepend(package_line, "zypper -q --terse --non-interactive in -l -t package --name "); - g_print("%s\n", command_packages->str); + /* g_print("%s\n", command_packages->str); */ /* DEBUGGING */ /* @@ -557,22 +572,22 @@ /* --- Spawning zypper ----------------------------------------------- */ fp = g_fopen("/tmp/spawn-zypper", "w+"); - g_printf("Command complete: %s\n", command_complete->str); + /* g_printf("Command complete: %s\n", command_complete->str); */ gint cc = g_fprintf(fp, "%s \n", command_complete->str); fclose(fp); - g_print("Character Count written to file: %d\n", cc); + /* g_print("Character Count written to file: %d\n", cc); */ g_chmod("/tmp/spawn-zypper", 0700); g_shell_parse_argv ("sh /tmp/spawn-zypper", &argc, &argv, NULL); - /* Debug output */ + /* Debug output g_print("Spawning zypper\n %d\n ", argc); for (i=0; ivbox), vbox); + + errorlabel = gtk_label_new (NULL); + gchar *markup; + markup = g_markup_printf_escaped ("%s</span>\n\n%s\n%s", + _("Error"), + _("Could not call zypper."), + _("Please ensure you have zypper instlled correctly.")); + gtk_label_set_markup (GTK_LABEL (errorlabel), markup); + g_free (markup); + + gtk_container_add (GTK_CONTAINER (vbox), + errorlabel); + + gtk_widget_show_all(errordialog); + if (gtk_dialog_run (GTK_DIALOG (errordialog)) == GTK_RESPONSE_OK) + gtk_main_quit(); + } else { channel = g_io_channel_unix_new (fout); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org