Author: rpmcruz Date: Thu Jul 28 07:12:27 2011 New Revision: 65055 URL: http://svn.opensuse.org/viewcvs/yast?rev=65055&view=rev Log: Backport: - don't show unsupported packages when the list is empty (bnc#704103). - showing mnemonics characters (bnc#704102). Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VERSION?rev=65055&r1=65054&r2=65055&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION Thu Jul 28 07:12:27 2011 @@ -1 +1 @@ -2.21.93 +2.21.94 Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake?rev=65055&r1=65054&r2=65055&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake Thu Jul 28 07:12:27 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "93") +SET(VERSION_PATCH "94") Modified: branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes?rev=65055&r1=65054&r2=65055&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes Thu Jul 28 07:12:27 2011 @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 28 05:57:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.94 +- don't show unsupported packages when the list is empty +(bnc#704103). +- showing mnemonics characters (bnc#704102). + +------------------------------------------------------------------- Fri Apr 01 00:09:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt - 2.21.93 Modified: branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc?rev=65055&r1=65054&r2=65055&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/YGPackageSelector.cc Thu Jul 28 07:12:27 2011 @@ -603,6 +603,13 @@ { return Ypp::Package (sel).support() <= 1; } }; + Ypp::PoolQuery query (Ypp::Selectable::PACKAGE); + query.addCriteria (new Ypp::StatusMatch (Ypp::StatusMatch::TO_MODIFY)); + query.addCriteria (new UnsupportedMatch()); + Ypp::List list (query); + if(list.size() == 0) + return true; + GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), GtkDialogFlags (0), GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, _("Unsupported packages")); @@ -615,11 +622,6 @@ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500); - Ypp::PoolQuery query (Ypp::Selectable::PACKAGE); - query.addCriteria (new Ypp::StatusMatch (Ypp::StatusMatch::TO_MODIFY)); - query.addCriteria (new UnsupportedMatch()); - Ypp::List list (query); - YGtkPkgListView view (true, Ypp::List::NAME_SORT, false, true); view.addCheckColumn (INSTALLED_CHECK_PROP); view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); @@ -629,7 +631,7 @@ view.setListener (this); view.setList (list); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), view.getWidget()); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), view.getWidget()); gtk_widget_show_all (dialog); int ret = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); Modified: branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc?rev=65055&r1=65054&r2=65055&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/src/pkg/ygtkpkgmenubar.cc Thu Jul 28 07:12:27 2011 @@ -745,7 +745,7 @@ append_menu_item (submenu, _("Install All Matching -_devel Packages"), NULL, G_CALLBACK (install_all_devel_pkgs_cb), this); // Translators: keep "-debug-_info" untranslated - append_menu_item (submenu, _("Install All Matching -debug-_sinfo Packages"), NULL, + append_menu_item (submenu, _("Install All Matching -debug-_info Packages"), NULL, G_CALLBACK (install_all_debug_info_pkgs_cb), this); // Translators: keep "-debug-_source" untranslated append_menu_item (submenu, _("Install All Matching -debug-_source Packages"), NULL, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org