Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Mon Apr 18 10:51:40 CEST 2011.
-------- --- yast2-gtk/yast2-gtk.changes 2011-03-04 22:13:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2011-04-16 15:28:20.000000000 +0200 @@ -1,0 +2,20 @@ +Sat Apr 16 13:51:00 WET 2011 - [email protected] + +- 2.21.96 +- Tree widget: add recursiveSelection flag from yast2-libyui +2.20.3. + +------------------------------------------------------------------- +Fri Apr 15 20:45:00 WET 2011 - [email protected] + +- 2.21.95 +- use same keyboard string mnemonics as rest of yast2, to +avoid confusing translators. (bnc#686452). + +------------------------------------------------------------------- +Wed Mar 16 10:50:31 CET 2011 - [email protected] + +- 2.21.94 +- fixed dependencies (bnc#667938) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-gtk-2.21.93.tar.bz2 New: ---- yast2-gtk-2.21.96.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.qdMcWK/_old 2011-04-18 10:49:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qdMcWK/_new 2011-04-18 10:49:48.000000000 +0200 @@ -18,11 +18,11 @@ Name: yast2-gtk -Version: 2.21.93 +Version: 2.21.96 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.93.tar.bz2 +Source0: yast2-gtk-2.21.96.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST @@ -39,6 +39,7 @@ Requires: gtk2 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 +Requires: yast2-branding Requires: libzypp >= 6.3.0 Provides: yast2_ui yast2-ui-gtk Provides: yast2_ui_pkg ++++++ yast2-gtk-2.21.93.tar.bz2 -> yast2-gtk-2.21.96.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/README new/yast2-gtk-2.21.96/README --- old/yast2-gtk-2.21.93/README 2011-03-04 22:12:22.000000000 +0100 +++ new/yast2-gtk-2.21.96/README 2011-03-16 04:58:51.000000000 +0100 @@ -17,8 +17,7 @@ To make this compile you'll need the following packages installed (at a minimum): - gcc-c++, cmake, gtk2-devel, yast2-devtools, yast2-core-devel, - yast2-libyui-devel, and libzypp-devel + gcc-c++ cmake gtk2-devel yast2-devtools yast2-core-devel yast2-libyui-devel libzypp-devel They all are distributed with Suse's CDs. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/VERSION new/yast2-gtk-2.21.96/VERSION --- old/yast2-gtk-2.21.93/VERSION 2011-03-04 22:12:22.000000000 +0100 +++ new/yast2-gtk-2.21.96/VERSION 2011-03-16 04:58:51.000000000 +0100 @@ -1 +1 @@ -2.21.93 +2.21.96 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/VERSION.cmake new/yast2-gtk-2.21.96/VERSION.cmake --- old/yast2-gtk-2.21.93/VERSION.cmake 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/VERSION.cmake 2011-03-16 04:58:51.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "93") +SET(VERSION_PATCH "96") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/package/yast2-gtk.changes new/yast2-gtk-2.21.96/package/yast2-gtk.changes --- old/yast2-gtk-2.21.93/package/yast2-gtk.changes 2011-03-04 22:12:22.000000000 +0100 +++ new/yast2-gtk-2.21.96/package/yast2-gtk.changes 2011-03-16 04:58:51.000000000 +0100 @@ -1,4 +1,24 @@ ------------------------------------------------------------------- +Sat Apr 16 13:51:00 WET 2011 - [email protected] + +- 2.21.96 +- Tree widget: add recursiveSelection flag from yast2-libyui +2.20.3. + +------------------------------------------------------------------- +Fri Apr 15 20:45:00 WET 2011 - [email protected] + +- 2.21.95 +- use same keyboard string mnemonics as rest of yast2, to +avoid confusing translators. (bnc#686452). + +------------------------------------------------------------------- +Wed Mar 16 10:50:31 CET 2011 - [email protected] + +- 2.21.94 +- fixed dependencies (bnc#667938) + +------------------------------------------------------------------- Fri Mar 04 09:07:00 WET 2011 - [email protected] - 2.21.93 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/package/yast2-gtk.spec new/yast2-gtk-2.21.96/package/yast2-gtk.spec --- old/yast2-gtk-2.21.93/package/yast2-gtk.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.96/package/yast2-gtk.spec 2011-03-16 04:58:51.000000000 +0100 @@ -0,0 +1,69 @@ +# +# spec file for package yast2-gtk (Version 2.21.95) +# +# norootforbuild;, + + +Name: yast2-gtk +Version: 2.21.95 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-gtk-2.21.95.tar.bz2 +Url: http://en.opensuse.org/YaST2-GTK +Summary: YaST2 - GTK+ Graphical User Interface +Group: System/YaST +License: GPL v2.1 or later +BuildRequires: cmake +BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel +BuildRequires: gtk2-devel +%if 0%{?suse_version} > 1130 +BuildRequires: gdk-pixbuf-devel +%endif +BuildRequires: yast2-devtools >= 2.16.3 +BuildRequires: yast2-libyui-devel >= 2.18.8 +BuildRequires: libzypp-devel >= 6.3.0 +Requires: gtk2 +Requires: yast2-libyui >= 2.18.8 +Requires: yast2_theme >= 2.16.1 +Requires: yast2-branding +Requires: libzypp >= 6.3.0 +Provides: yast2_ui yast2-ui-gtk +Provides: yast2_ui_pkg +Source1: yast2-gtk-rpmlintrc + +%description +One of several user interfaces available for YaST2, based on GTK and +the X Window System. + +%prep +%setup + +%build +mkdir build +cd build +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$CFLAGS" +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB=%{_lib} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?_smp_mflags} VERBOSE=1 + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT +cd .. + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%files +%defattr (-, root, root) +%dir %_libdir/YaST2 +%_libdir/YaST2/plugin/ + +%changelog + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/YGTreeView.cc new/yast2-gtk-2.21.96/src/YGTreeView.cc --- old/yast2-gtk-2.21.93/src/YGTreeView.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/YGTreeView.cc 2011-03-16 04:58:51.000000000 +0100 @@ -202,18 +202,33 @@ virtual bool _immediateMode() { return true; } virtual bool _shrinkable() { return false; } + virtual bool _recursiveSelection() { return false; } + + void setMark (GtkTreeIter *iter, YItem *yitem, gint column, bool state, bool recursive) + { + setRowMark (iter, column, state); + yitem->setSelected (state); + + if (recursive) + for (YItemConstIterator it = yitem->childrenBegin(); + it != yitem->childrenEnd(); it++) { + GtkTreeIter _iter; + getTreeIter (*it, &_iter); + setMark (&_iter, *it, column, state, true); + } + } void toggleMark (GtkTreePath *path, gint column) { GtkTreeIter iter; if (!gtk_tree_model_get_iter (getModel(), &iter, path)) return; - gboolean state; gtk_tree_model_get (getModel(), &iter, column, &state, -1); state = !state; - setRowMark (&iter, column, state); - getYItem (&iter)->setSelected (state); + + YItem *yitem = getYItem (&iter); + setMark (&iter, yitem, column, state, _recursiveSelection()); syncCount(); emitEvent (YEvent::ValueChanged); } @@ -641,6 +656,10 @@ class YGTree : public YTree, public YGTreeView { public: +#if YAST2_VERSION >= 2020003 + YGTree (YWidget *parent, const string &label, bool multiselection, bool recursiveSelection) + : YTree (NULL, label, multiselection, recursiveSelection), +#else #if YAST2_VERSION >= 2019002 YGTree (YWidget *parent, const string &label, bool multiselection) : YTree (NULL, label, multiselection), @@ -648,6 +667,7 @@ YGTree (YWidget *parent, const string &label) : YTree (NULL, label), #endif +#endif YGTreeView (this, parent, label, true) { #if YAST2_VERSION >= 2019002 @@ -671,6 +691,10 @@ g_signal_connect (getWidget(), "row-expanded", G_CALLBACK (row_expanded_cb), this); } +#if YAST2_VERSION >= 2020003 + virtual bool _recursiveSelection() { return recursiveSelection(); } +#endif + void addNode (YItem *item, GtkTreeIter *parent) { GtkTreeIter iter; @@ -750,6 +774,19 @@ virtual YTreeItem *currentItem() { return (YTreeItem *) getFocusItem(); } + void _markItem (YItem *item, bool select, bool recursive) { + GtkTreeIter iter; + getTreeIter (item, &iter); + setRowMark (&iter, 2, select); + + if (recursive) { + YTreeItem *_item = (YTreeItem *) item; + for (YItemConstIterator it = _item->childrenBegin(); + it != _item->childrenEnd(); it++) + _markItem (*it, select, true); + } + } + // YGSelectionStore void doAddItem (YItem *item) {} // rebuild will be called anyway @@ -758,9 +795,11 @@ { #if YAST2_VERSION >= 2019002 if (hasMultiSelection()) { - GtkTreeIter iter; - getTreeIter (item, &iter); - setRowMark (&iter, 2, select); +#if YAST2_VERSION >= 2020003 + _markItem (item, select, recursiveSelection()); +#else + _markItem (item, select, false); +#endif syncCount(); } else @@ -816,6 +855,10 @@ YGSELECTION_WIDGET_IMPL (YTree) }; +#if YAST2_VERSION >= 2020003 +YTree *YGWidgetFactory::createTree (YWidget *parent, const string &label, bool multiselection, bool recursiveSelection) +{ return new YGTree (parent, label, multiselection, recursiveSelection); } +#else #if YAST2_VERSION >= 2019002 YTree *YGWidgetFactory::createTree (YWidget *parent, const string &label, bool multiselection) { return new YGTree (parent, label, multiselection); } @@ -823,4 +866,5 @@ YTree *YGWidgetFactory::createTree (YWidget *parent, const string &label) { return new YGTree (parent, label); } #endif +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/YGUI.h new/yast2-gtk-2.21.96/src/YGUI.h --- old/yast2-gtk-2.21.93/src/YGUI.h 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/YGUI.h 2011-03-16 04:58:51.000000000 +0100 @@ -89,11 +89,15 @@ virtual YRadioButton *createRadioButton (YWidget *parent, const string &label, bool isChecked); virtual YComboBox *createComboBox (YWidget *parent, const string & label, bool editable); virtual YSelectionBox *createSelectionBox (YWidget *parent, const string &label); +#if YAST2_VERSION >= 2020003 + virtual YTree *createTree (YWidget *parent, const string &label, bool multiselection, bool recursiveSelection); +#else #if YAST2_VERSION >= 2019002 virtual YTree *createTree (YWidget *parent, const string &label, bool multiselection); #else virtual YTree *createTree (YWidget *parent, const string &label); #endif +#endif virtual YTable *createTable (YWidget *parent, YTableHeader *headers, bool multiSelection); virtual YProgressBar *createProgressBar (YWidget *parent, const string &label, int maxValue); virtual YBusyIndicator *createBusyIndicator (YWidget *parent, const string &label, int timeout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/YGUtils.cc new/yast2-gtk-2.21.96/src/YGUtils.cc --- old/yast2-gtk-2.21.93/src/YGUtils.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/YGUtils.cc 2011-03-16 04:58:51.000000000 +0100 @@ -312,6 +312,12 @@ return str; } +char *ygutils_mapKBAccel (const char *src) +{ + std::string ret (YGUtils::mapKBAccel (src)); + return strdup (ret.c_str()); +} + void YGUtils::setFilter (GtkEntry *entry, const string &validChars) { struct inner { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/YGUtils.h new/yast2-gtk-2.21.96/src/YGUtils.h --- old/yast2-gtk-2.21.93/src/YGUtils.h 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/YGUtils.h 2011-03-16 04:58:51.000000000 +0100 @@ -71,6 +71,8 @@ }; extern "C" { + char *ygutils_mapKBAccel (const char *src); + void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/pkg/YGPackageSelector.cc new/yast2-gtk-2.21.96/src/pkg/YGPackageSelector.cc --- old/yast2-gtk-2.21.93/src/pkg/YGPackageSelector.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/pkg/YGPackageSelector.cc 2011-03-16 04:58:51.000000000 +0100 @@ -687,10 +687,12 @@ dialog->setIcon (icon); ygtk_wizard_set_help_text (wizard, _("Please wait...")); - ygtk_wizard_set_button_label (wizard, wizard->abort_button, _("_Cancel"), GTK_STOCK_CANCEL); + std::string cancel_str (YGUtils::mapKBAccel ("&Cancel")); + std::string apply_str (YGUtils::mapKBAccel ("&Apply")); + ygtk_wizard_set_button_label (wizard, wizard->abort_button, _(cancel_str.c_str()), GTK_STOCK_CANCEL); ygtk_wizard_set_button_str_id (wizard, wizard->abort_button, "cancel"); ygtk_wizard_set_button_label (wizard, wizard->back_button, NULL, NULL); - ygtk_wizard_set_button_label (wizard, wizard->next_button, _("_Apply"), GTK_STOCK_APPLY); + ygtk_wizard_set_button_label (wizard, wizard->next_button, _(apply_str.c_str()), GTK_STOCK_APPLY); ygtk_wizard_set_button_str_id (wizard, wizard->next_button, "accept"); g_signal_connect (G_OBJECT (wizard), "action-triggered", G_CALLBACK (wizard_action_cb), this); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/pkg/ygtkpkgdetailview.cc new/yast2-gtk-2.21.96/src/pkg/ygtkpkgdetailview.cc --- old/yast2-gtk-2.21.93/src/pkg/ygtkpkgdetailview.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/pkg/ygtkpkgdetailview.cc 2011-03-16 04:58:51.000000000 +0100 @@ -187,7 +187,7 @@ GtkWidget *item; if (g_file_test (BROWSER_BIN, G_FILE_TEST_IS_EXECUTABLE)) { - std::string label ("_Open"); + std::string label (YGUtils::mapKBAccel ("&Open")); if (getuid() == 0) { const char *username = getenv ("USERNAME"); if (!username || !(*username)) @@ -1277,21 +1277,18 @@ gtk_adjustment_set_value (adj, value); } - static void fix_keybindings (GtkWidget *scroll, GtkWidget *widget) + static void fix_keys (GtkWidget *widget, void *_scroll) { + GtkWidget *scroll = (GtkWidget *) _scroll; if (GTK_IS_TEXT_VIEW (widget)) g_signal_connect (G_OBJECT (widget), "move-cursor", G_CALLBACK (move_cursor_cb), scroll); - else if (GTK_IS_CONTAINER (widget)) { - GList *children = gtk_container_get_children (GTK_CONTAINER (widget)); - for (GList *i = children; i; i = i->next) - fix_keybindings (scroll, (GtkWidget *) i->data); - g_list_free (children); - } + else if (GTK_IS_CONTAINER (widget)) + gtk_container_foreach (GTK_CONTAINER (widget), fix_keys, _scroll); } static void scroll_realize_cb (GtkWidget *widget, Impl *pThis) - { fix_keybindings (widget, widget); } + { fix_keys (widget, widget); } }; YGtkPkgDetailView::YGtkPkgDetailView() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/pkg/ygtkpkglistview.cc new/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc --- old/yast2-gtk-2.21.93/src/pkg/ygtkpkglistview.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc 2011-03-16 04:58:51.000000000 +0100 @@ -393,14 +393,17 @@ static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGtkPkgListView *pThis) { struct inner { - static void appendItem (GtkWidget *menu, const char *label, + static void appendItem (GtkWidget *menu, const char *_label, const char *tooltip, const char *stock, bool sensitive, void (& callback) (GtkMenuItem *item, YGtkPkgListView *pThis), YGtkPkgListView *pThis) { GtkWidget *item; + std::string label; + if (_label) + label = YGUtils::mapKBAccel (_label); if (stock) { - if (label) { - item = gtk_image_menu_item_new_with_mnemonic (label); + if (_label) { + item = gtk_image_menu_item_new_with_mnemonic (label.c_str()); GtkWidget *image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); } @@ -408,7 +411,7 @@ item = gtk_image_menu_item_new_from_stock (stock, NULL); } else - item = gtk_menu_item_new_with_mnemonic (label); + item = gtk_menu_item_new_with_mnemonic (label.c_str()); if (tooltip) gtk_widget_set_tooltip_markup (item, tooltip); gtk_widget_set_sensitive (item, sensitive); @@ -469,29 +472,29 @@ bool modified = props.toModify(); bool locked = !unlocked && canLock; if (props.isNotInstalled() && !modified) - inner::appendItem (menu, _("_Install"), 0, GTK_STOCK_SAVE, + inner::appendItem (menu, _("&Install"), 0, GTK_STOCK_SAVE, !locked, inner::install_cb, pThis); if (props.hasUpgrade() && !modified) - inner::appendItem (menu, _("_Upgrade"), 0, GTK_STOCK_GO_UP, + inner::appendItem (menu, _("&Upgrade"), 0, GTK_STOCK_GO_UP, !locked, inner::install_cb, pThis); if (type == Ypp::Selectable::PACKAGE && list.size() == 1 && inner::hasReinstall (list.get(0)) && !modified) - inner::appendItem (menu, _("_Re-install"), 0, GTK_STOCK_REFRESH, + inner::appendItem (menu, _("&Re-install"), 0, GTK_STOCK_REFRESH, !locked, inner::reinstall_cb, pThis); if (props.isInstalled() && !modified) - inner::appendItem (menu, _("_Remove"), 0, GTK_STOCK_DELETE, + inner::appendItem (menu, _("&Remove"), 0, GTK_STOCK_DELETE, !locked && props.canRemove(), inner::remove_cb, pThis); if (modified) - inner::appendItem (menu, _("_Undo"), 0, GTK_STOCK_UNDO, + inner::appendItem (menu, _("&Undo"), 0, GTK_STOCK_UNDO, true, inner::undo_cb, pThis); if (canLock) { static const char *lock_tooltip = "<b>Package lock:</b> prevents the package status from being modified by " "the dependencies resolver."; if (props.isLocked()) - inner::appendItem (menu, _("_Unlock"), _(lock_tooltip), + inner::appendItem (menu, _("&Unlock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION, true, inner::unlock_cb, pThis); if (unlocked) - inner::appendItem (menu, _("_Lock"), _(lock_tooltip), + inner::appendItem (menu, _("&Lock"), _(lock_tooltip), GTK_STOCK_DIALOG_AUTHENTICATION, !modified, inner::lock_cb, pThis); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/pkg/ygtkpkgmenubar.cc new/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc --- old/yast2-gtk-2.21.93/src/pkg/ygtkpkgmenubar.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc 2011-03-16 04:58:51.000000000 +0100 @@ -68,17 +68,20 @@ // utilities -static GtkWidget *append_menu_item (GtkWidget *menu, const char *text, +static GtkWidget *append_menu_item (GtkWidget *menu, const char *_text, const char *stock, GCallback callback, gpointer callback_data) { + std::string text; + if (_text) + text = YGUtils::mapKBAccel (_text); GtkWidget *item; - if (stock && text) { + if (stock && _text) { GtkWidget *icon = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); - item = gtk_image_menu_item_new_with_mnemonic (text); + item = gtk_image_menu_item_new_with_mnemonic (text.c_str()); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), icon); } - else if (text) - item = gtk_menu_item_new_with_mnemonic (text); + else if (_text) + item = gtk_menu_item_new_with_mnemonic (text.c_str()); else if (stock) item = gtk_image_menu_item_new_from_stock (stock, NULL); else @@ -687,73 +690,73 @@ Flags flags; GtkWidget *menu_bar = m_menu, *item, *submenu; - item = append_menu_item (menu_bar, _("F_ile"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("F&ile"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("_Import..."), NULL, + append_menu_item (submenu, _("&Import..."), NULL, G_CALLBACK (import_file_cb), this); - append_menu_item (submenu, _("_Export..."), NULL, + append_menu_item (submenu, _("&Export..."), NULL, G_CALLBACK (export_file_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); append_menu_item (submenu, NULL, GTK_STOCK_APPLY, G_CALLBACK (accept_item_cb), selector); append_menu_item (submenu, NULL, GTK_STOCK_QUIT, G_CALLBACK (reject_item_cb), selector); if (selector->repoMgrEnabled()) { - item = append_menu_item (menu_bar, _("_Configuration"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("&Configuration"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("_Repositories..."), NULL, + append_menu_item (submenu, _("&Repositories..."), NULL, G_CALLBACK (repoManager), this); if (selector->onlineUpdateMode()) - append_menu_item (submenu, _("_Online Update..."), NULL, + append_menu_item (submenu, _("&Online Update..."), NULL, G_CALLBACK (onlineUpdateConfiguration), this); else - append_menu_item (submenu, _("Search Packages on _Web..."), NULL, + append_menu_item (submenu, _("Search Packages on &Web..."), NULL, G_CALLBACK (webpinSearch), this); } - item = append_menu_item (menu_bar, _("_Dependencies"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("&Dependencies"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("_Check Now"), NULL, + append_menu_item (submenu, _("&Check Now"), NULL, G_CALLBACK (manualResolvePackageDependencies), this); - new AutoCheckItem (submenu, _("_Autocheck"), &flags); + new AutoCheckItem (submenu, _("&Autocheck"), &flags); if (!selector->onlineUpdateMode()) { - item = append_menu_item (menu_bar, _("_Options"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("&Options"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); // Translators: don't translate the "-devel" - new ShowDevelCheckItem (submenu, _("Show -de_vel Packages"), &flags); + new ShowDevelCheckItem (submenu, _("Show -de&vel Packages"), &flags); // Translators: don't translate the "-debuginfo/-debugsource" part - new ShowDebugCheckItem (submenu, _("Show -_debuginfo/-debugsource Packages"), &flags); - new SystemVerificationCheckItem (submenu, _("_System Verification Mode"), &flags); - new CleanupDepsCheckItem (submenu, _("_Cleanup when deleting packages"), &flags); - new AllowVendorChangeCheckItem (submenu, _("_Allow vendor change"), &flags); + new ShowDebugCheckItem (submenu, _("Show -&debuginfo/-debugsource Packages"), &flags); + new SystemVerificationCheckItem (submenu, _("&System Verification Mode"), &flags); + new CleanupDepsCheckItem (submenu, _("&Cleanup when deleting packages"), &flags); + new AllowVendorChangeCheckItem (submenu, _("&Allow vendor change"), &flags); } - item = append_menu_item (menu_bar, _("E_xtras"), NULL, NULL, NULL); + item = append_menu_item (menu_bar, _("E&xtras"), NULL, NULL, NULL); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new())); - append_menu_item (submenu, _("Show _Products"), NULL, + append_menu_item (submenu, _("Show &Products"), NULL, G_CALLBACK (show_products_cb), this); - append_menu_item (submenu, _("Show _Changes"), NULL, + append_menu_item (submenu, _("Show &Changes"), NULL, G_CALLBACK (show_pkg_changes_cb), this); if (!selector->onlineUpdateMode()) { - append_menu_item (submenu, _("Show _History"), NULL, + append_menu_item (submenu, _("Show &History"), NULL, G_CALLBACK (show_log_changes_cb), this); #ifdef HAS_VESTIGIAL_DIALOG - append_menu_item (submenu, _("Show _Unneeded Dependencies"), NULL, + append_menu_item (submenu, _("Show &Unneeded Dependencies"), NULL, G_CALLBACK (show_vestigial_packages_cb), this); #endif } append_menu_item (submenu, NULL, NULL, NULL, NULL); // Translators: keep "-_devel" untranslated - append_menu_item (submenu, _("Install All Matching -_devel Packages"), NULL, + 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-&sinfo 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, + append_menu_item (submenu, _("Install All Matching -debug-&source Packages"), NULL, G_CALLBACK (install_all_debug_source_pkgs_cb), this); append_menu_item (submenu, NULL, NULL, NULL, NULL); - append_menu_item (submenu, _("Generate Dependencies Resolver _Testcase"), NULL, + append_menu_item (submenu, _("Generate Dependencies Resolver &Testcase"), NULL, G_CALLBACK (create_solver_testcase_cb), this); - append_menu_item (submenu, _("Reset _Ignored Dependencies Conflicts"), NULL, + append_menu_item (submenu, _("Reset &Ignored Dependencies Conflicts"), NULL, G_CALLBACK (reset_ignored_dependency_conflicts_cb), this); //** TEMP: work-around global-menubar-applet: see bug 595560 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/pkg/ygtkpkgpatternview.cc new/yast2-gtk-2.21.96/src/pkg/ygtkpkgpatternview.cc --- old/yast2-gtk-2.21.93/src/pkg/ygtkpkgpatternview.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/pkg/ygtkpkgpatternview.cc 2011-03-16 04:58:51.000000000 +0100 @@ -247,11 +247,14 @@ static void remove_cb (GtkWidget *widget, ZyppSelectablePtr zsel) { Ypp::Selectable (zsel).remove(); } -static GtkWidget *menu_item_append (GtkWidget *menu, const char *label, const char *stock, bool sensitive) +static GtkWidget *menu_item_append (GtkWidget *menu, const char *_label, const char *stock, bool sensitive) { + std::string label; + if (_label) + label = YGUtils::mapKBAccel (_label); GtkWidget *item; - if (label) { - item = gtk_image_menu_item_new_with_mnemonic (label); + if (_label) { + item = gtk_image_menu_item_new_with_mnemonic (label.c_str()); if (stock) { GtkWidget *icon = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), icon); @@ -285,7 +288,7 @@ else { if (sel.isInstalled()) { if (sel.canRemove()) { - item = menu_item_append (menu, _("_Remove"), GTK_STOCK_REMOVE, true); + item = menu_item_append (menu, _("&Remove"), GTK_STOCK_REMOVE, true); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (remove_cb), zsel); } @@ -293,7 +296,7 @@ menu_item_append (menu, _("Remove: cannot remove patterns"), NULL, false); } else { - item = menu_item_append (menu, _("_Install"), GTK_STOCK_ADD, true); + item = menu_item_append (menu, _("&Install"), GTK_STOCK_ADD, true); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (install_cb), zsel); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/pkg/ygtkpkgsearchentry.cc new/yast2-gtk-2.21.96/src/pkg/ygtkpkgsearchentry.cc --- old/yast2-gtk-2.21.93/src/pkg/ygtkpkgsearchentry.cc 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/pkg/ygtkpkgsearchentry.cc 2011-03-16 04:58:51.000000000 +0100 @@ -94,7 +94,8 @@ GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); gtk_entry_set_icon_activatable (GTK_ENTRY (impl->entry), GTK_ENTRY_ICON_PRIMARY, TRUE); - GtkWidget *label = gtk_label_new_with_mnemonic (_("_Find:")); + std::string label_str (YGUtils::mapKBAccel (_("&Find:"))); + GtkWidget *label = gtk_label_new_with_mnemonic (label_str.c_str()); gtk_label_set_mnemonic_widget (GTK_LABEL (label), impl->entry); impl->combo = gtk_combo_box_new_text(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/ygtktreeview.c new/yast2-gtk-2.21.96/src/ygtktreeview.c --- old/yast2-gtk-2.21.93/src/ygtktreeview.c 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/ygtktreeview.c 2011-03-16 04:58:51.000000000 +0100 @@ -14,6 +14,8 @@ #define YGI18N_C #include "YGi18n.h" +extern char *ygutils_mapKBAccel (const char *src); + static guint right_click_signal = 0; G_DEFINE_TYPE (YGtkTreeView, ygtk_tree_view, GTK_TYPE_TREE_VIEW) @@ -209,7 +211,9 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new()); GtkWidget *submenu = ygtk_tree_view_create_show_columns_menu (view); - GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Show column")); + char *label = ygutils_mapKBAccel (_("&Show column")); + GtkWidget *item = gtk_menu_item_new_with_mnemonic (label); + g_free (label); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); return menu; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/src/ygtkwizard.c new/yast2-gtk-2.21.96/src/ygtkwizard.c --- old/yast2-gtk-2.21.93/src/ygtkwizard.c 2011-03-04 22:12:21.000000000 +0100 +++ new/yast2-gtk-2.21.96/src/ygtkwizard.c 2011-03-16 04:58:51.000000000 +0100 @@ -24,6 +24,7 @@ #define HELP_IMG_BG "yelp-icon-big" // YGUtils bridge +extern char *ygutils_mapKBAccel (const char *src); extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); extern void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); @@ -153,7 +154,9 @@ GtkWidget *close_box = gtk_hbutton_box_new(); gtk_container_add (GTK_CONTAINER (close_box), dialog->close_button); - GtkWidget *bottom_box, *label = gtk_label_new_with_mnemonic (_("_Find:")); + char *label_str = ygutils_mapKBAccel (_("&Find:")); + GtkWidget *bottom_box, *label = gtk_label_new_with_mnemonic (label_str); + g_free (label_str); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_label_set_mnemonic_widget (GTK_LABEL (label), dialog->search_entry); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.93/yast2-gtk.spec.in new/yast2-gtk-2.21.96/yast2-gtk.spec.in --- old/yast2-gtk-2.21.93/yast2-gtk.spec.in 2011-03-04 22:12:22.000000000 +0100 +++ new/yast2-gtk-2.21.96/yast2-gtk.spec.in 2011-03-16 04:58:51.000000000 +0100 @@ -18,6 +18,7 @@ Requires: gtk2 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 +Requires: yast2-branding Requires: libzypp >= 6.3.0 Provides: yast2_ui yast2-ui-gtk Provides: yast2_ui_pkg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
