Hello community, here is the log from the commit of package libyui-gtk for openSUSE:Factory checked in at 2013-08-10 12:18:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-gtk (Old) and /work/SRC/openSUSE:Factory/.libyui-gtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-gtk/libyui-gtk.changes 2013-07-07 22:19:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-gtk.new/libyui-gtk.changes 2013-08-10 12:18:18.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Aug 6 14:38:13 CEST 2013 - [email protected] + +- fixed dependencies +- Version 2.43.7 + +------------------------------------------------------------------- +Fri Aug 2 13:24:25 CEST 2013 - [email protected] + +- fixed deprecated stock items +- Version 2.43.6 + +------------------------------------------------------------------- Old: ---- libyui-gtk-2.43.6.tar.bz2 New: ---- libyui-gtk-2.43.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-gtk-doc.spec ++++++ --- /var/tmp/diff_new_pack.MaRCTV/_old 2013-08-10 12:18:19.000000000 +0200 +++ /var/tmp/diff_new_pack.MaRCTV/_new 2013-08-10 12:18:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-gtk-doc -Version: 2.43.6 +Version: 2.43.7 Release: 0 Source: libyui-gtk-%{version}.tar.bz2 ++++++ libyui-gtk.spec ++++++ --- /var/tmp/diff_new_pack.MaRCTV/_old 2013-08-10 12:18:19.000000000 +0200 +++ /var/tmp/diff_new_pack.MaRCTV/_new 2013-08-10 12:18:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-gtk -Version: 2.43.6 +Version: 2.43.7 Release: 0 Source: libyui-gtk-%{version}.tar.bz2 @@ -27,7 +27,7 @@ BuildRequires: gtk3-devel BuildRequires: libyui-devel >= 3.0.4 BuildRequires: pkg-config -Provides: yui_backend +Provides: yui_backend = 5 Url: http://github.com/libyui/ Summary: Libyui - Gtk User Interface ++++++ libyui-gtk-2.43.6.tar.bz2 -> libyui-gtk-2.43.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/ChangeLog new/libyui-gtk-2.43.7/ChangeLog --- old/libyui-gtk-2.43.6/ChangeLog 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/ChangeLog 2013-08-06 16:03:27.000000000 +0200 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Aug 6 14:38:13 CEST 2013 - [email protected] + +- fixed dependencies +- Version 2.43.7 + +------------------------------------------------------------------- +Fri Aug 2 13:24:25 CEST 2013 - [email protected] + +- fixed deprecated stock items +- Version 2.43.6 + +------------------------------------------------------------------- Thu Jul 4 17:39:43 CEST 2013 - [email protected] - fixed misplaced countries in map (in time zone selection) (bnc #775672) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/VERSION.cmake new/libyui-gtk-2.43.7/VERSION.cmake --- old/libyui-gtk-2.43.6/VERSION.cmake 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/VERSION.cmake 2013-08-06 16:03:27.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "43" ) -SET( VERSION_PATCH "6" ) +SET( VERSION_PATCH "7" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/libyui-gtk.spec.in new/libyui-gtk-2.43.7/libyui-gtk.spec.in --- old/libyui-gtk-2.43.6/libyui-gtk.spec.in 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/libyui-gtk.spec.in 2013-08-06 16:03:27.000000000 +0200 @@ -29,7 +29,7 @@ BuildRequires: pkg-config BuildRequires: libyui-devel >= 3.0.4 BuildRequires: gtk3-devel -Provides: yui_backend +Provides: yui_backend = 5 URL: @URL@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGDialog.cc new/libyui-gtk-2.43.7/src/YGDialog.cc --- old/libyui-gtk-2.43.6/src/YGDialog.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGDialog.cc 2013-08-06 16:03:27.000000000 +0200 @@ -310,9 +310,10 @@ if (colorMode != YDialogNormalColor) { // emulate a warning / info dialog - GtkWidget *icon = gtk_image_new_from_stock - (colorMode == YDialogWarnColor ? GTK_STOCK_DIALOG_WARNING : GTK_STOCK_DIALOG_INFO, + GtkWidget *icon = gtk_image_new_from_icon_name + (colorMode == YDialogWarnColor ? "dialog-warning" : "dialog-information", GTK_ICON_SIZE_DIALOG); + gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0); gtk_misc_set_padding (GTK_MISC (icon), 0, 12); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGImage.cc new/libyui-gtk-2.43.7/src/YGImage.cc --- old/libyui-gtk-2.43.6/src/YGImage.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGImage.cc 2013-08-06 16:03:27.000000000 +0200 @@ -26,21 +26,18 @@ YGWidget (this, parent, YGTK_TYPE_IMAGE, NULL) { YGtkImage *image = YGTK_IMAGE (getWidget()); - const char *stock = NULL; + const char *iconname = NULL; if (endsWith (filename, "/msg_question.png")) - stock = GTK_STOCK_DIALOG_QUESTION; + iconname = "dialog-question"; else if (endsWith (filename, "/msg_info.png")) - stock = GTK_STOCK_DIALOG_INFO; + iconname = "dialog-information"; else if (endsWith (filename, "/msg_warning.png")) - stock = GTK_STOCK_DIALOG_WARNING; + iconname = "dialog-warning"; else if (endsWith (filename, "/msg_error.png")) - stock = GTK_STOCK_DIALOG_ERROR; + iconname = "dialog-error"; - GtkStyleContext *ctx; - ctx = gtk_widget_get_style_context(m_widget); - - if (stock && gtk_style_context_lookup_icon_set (ctx, stock)) { - GdkPixbuf *pixbuf = gtk_widget_render_icon_pixbuf (m_widget, stock, GTK_ICON_SIZE_DIALOG); + if (iconname && gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), iconname, GTK_ICON_SIZE_DIALOG, GTK_ICON_LOOKUP_USE_BUILTIN)) { + GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), iconname, GTK_ICON_SIZE_DIALOG, GTK_ICON_LOOKUP_USE_BUILTIN,NULL); ygtk_image_set_from_pixbuf (image, pixbuf); } else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGMenuButton.cc new/libyui-gtk-2.43.7/src/YGMenuButton.cc --- old/libyui-gtk-2.43.6/src/YGMenuButton.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGMenuButton.cc 2013-08-06 16:03:27.000000000 +0200 @@ -22,28 +22,10 @@ static void doCreateMenu (GtkWidget *parent, YItemIterator begin, YItemIterator end) { for (YItemIterator it = begin; it != end; it++) { - GtkWidget *entry, *image = 0; + GtkWidget *entry; std::string str = YGUtils::mapKBAccel ((*it)->label()); - if ((*it)->hasIconName()) { - GdkPixbuf *pixbuf = YGUtils::loadPixbuf ((*it)->iconName()); - if (pixbuf) { - image = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref (G_OBJECT (pixbuf)); - } - } - else { - const char *stock = YGUtils::mapStockIcon (str); - if (stock) - image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU); - } - - if (image) { - entry = gtk_image_menu_item_new_with_mnemonic (str.c_str()); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (entry), image); - } - else - entry = gtk_menu_item_new_with_mnemonic (str.c_str()); + entry = gtk_menu_item_new_with_mnemonic (str.c_str()); gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGPushButton.cc new/libyui-gtk-2.43.7/src/YGPushButton.cc --- old/libyui-gtk-2.43.6/src/YGPushButton.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGPushButton.cc 2013-08-06 16:03:27.000000000 +0200 @@ -32,29 +32,29 @@ void setStockIcon (const std::string &label) { if (!m_customIcon) { - const char *stock = NULL; + const char *icon = NULL; switch (functionKey()) { - case 1: stock = GTK_STOCK_HELP; break; - case 2: stock = GTK_STOCK_INFO; break; // Info - case 3: stock = GTK_STOCK_ADD; break; - case 4: stock = GTK_STOCK_EDIT; break; - case 5: stock = GTK_STOCK_DELETE; break; - case 6: stock = GTK_STOCK_EXECUTE; break; // Test - case 7: stock = GTK_STOCK_EDIT; break; // Expert + case 1: icon = "help-contents"; break; + case 2: icon = "dialog-information"; break; // Info + case 3: icon = "list-add"; break; + case 4: icon = "edit-copy"; break; + case 5: icon = "edit-delete"; break; + case 6: icon = "system-run"; break; // Test + case 7: icon = "edit-copy"; break; // Expert // old expert icon: GTK_STOCK_PREFERENCES - //case 8: stock = GTK_STOCK_GO_BACK; break; - case 9: stock = GTK_STOCK_CANCEL; break; - case 10: stock = GTK_STOCK_OK; break; // Next/Finish/OK + // case 8: icon = "go-previous"; break; + case 9: icon = "application-exit"; break; + case 10: icon = "application-exit"; break; // Next/Finish/OK default: break; } switch (role()) { - case YOKButton: stock = GTK_STOCK_OK; break; - case YApplyButton: stock = GTK_STOCK_APPLY; break; - case YCancelButton: stock = GTK_STOCK_CANCEL; break; - case YHelpButton: stock = GTK_STOCK_HELP; break; + case YOKButton: icon = "document-save"; break; + case YApplyButton: icon = "document-save"; break; + case YCancelButton: icon = "document-revert"; break; + case YHelpButton: icon = "help-contents"; break; case YCustomButton: case YMaxButtonRole: break; } - m_labelIcon = YGUtils::setStockIcon (getWidget(), label, stock); + m_labelIcon = YGUtils::setStockIcon (getWidget(), label, icon); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGTreeView.cc new/libyui-gtk-2.43.7/src/YGTreeView.cc --- old/libyui-gtk-2.43.6/src/YGTreeView.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGTreeView.cc 2013-08-06 16:03:27.000000000 +0200 @@ -487,7 +487,7 @@ YWidget *button = YGDialog::currentDialog()->getFunctionWidget (key); if (button) { GtkWidget *item; - item = gtk_image_menu_item_new_from_stock (stock, NULL); + item = gtk_menu_item_new_with_mnemonic (stock); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (key_activate_cb), button); @@ -501,13 +501,13 @@ // if more than one table exists, function keys would be ambiguous if (outreach) { if (dialog->getFunctionWidget(3)) - inner::appendItem (menu, GTK_STOCK_ADD, 3); + inner::appendItem (menu, "list-add", 3); } else { if (dialog->getFunctionWidget(4)) - inner::appendItem (menu, GTK_STOCK_EDIT, 4); + inner::appendItem (menu, "edit-cut", 4); if (dialog->getFunctionWidget(5)) - inner::appendItem (menu, GTK_STOCK_DELETE, 5); + inner::appendItem (menu, "list-remove", 5); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGUI.cc new/libyui-gtk-2.43.7/src/YGUI.cc --- old/libyui-gtk-2.43.6/src/YGUI.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGUI.cc 2013-08-06 16:03:27.000000000 +0200 @@ -496,9 +496,9 @@ const char *button; switch (action) { case GTK_FILE_CHOOSER_ACTION_SAVE: - button = GTK_STOCK_SAVE; break; + button = "document-save"; break; case GTK_FILE_CHOOSER_ACTION_OPEN: - button = GTK_STOCK_OPEN; break; + button = "folder-open"; break; case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: default: @@ -506,7 +506,7 @@ } GtkWidget *dialog; dialog = gtk_file_chooser_dialog_new (title.c_str(), - parent, action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + parent, action, "application-exit", GTK_RESPONSE_CANCEL, button, GTK_RESPONSE_ACCEPT, NULL); GtkFileChooser *fileChooser = GTK_FILE_CHOOSER (dialog); gtk_file_chooser_set_local_only (fileChooser, TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGUtils.cc new/libyui-gtk-2.43.7/src/YGUtils.cc --- old/libyui-gtk-2.43.6/src/YGUtils.cc 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGUtils.cc 2013-08-06 16:03:27.000000000 +0200 @@ -618,93 +618,59 @@ GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity, gboolean useAlpha) { return YGUtils::setOpacity (src, opacity, useAlpha); } + +struct StockMap { + const char *english, *locale, *stock; +}; +static const StockMap stock_map[] = { + { "Apply", _("Apply"), "application-exit" }, + { "Accept", _("Accept"), "application-exit" }, + { "Install", _("Install"), "application-exit" }, + { "OK", _("OK"), "document-save" }, + { "Cancel", _("Cancel"), "application-exit" }, + { "Abort", _("Abort"), "application-exit" }, + { "Close", _("Close"), "window-close" }, + { "Yes", _("Yes"), "document-save" }, + { "No", _("No"), "application-exit" }, + { "Add", _("Add"), "list-add" }, + { "Edit", _("Edit"), "edit-paste" }, + { "Delete", _("Delete"), "list-remove" }, + { "Up", _("Up"), "go-up" }, + { "Down", _("Down"), "go-down" }, + { "Enable", _("Enable"), "document-save" }, + { "Disable", _("Disable"), "application-exit" }, + { "Exit", _("Exit"), "application-exit" }, + { "Back", _("Back"), "go-previous" }, + { "Next", _("Next"), "go-next" }, +}; +#define stock_map_length (sizeof (stock_map) / sizeof (StockMap)) + static std::string cutUnderline (const std::string &str) { - std::string ret (str); - std::string::size_type i = 0; - if ((i = ret.find ('_', i)) != std::string::npos) - ret.erase (i, 1); - return ret; + std::string ret (str); + std::string::size_type i = 0; + if ((i = ret.find ('_', i)) != std::string::npos) + ret.erase (i, 1); + return ret; } static void stripStart (std::string &str, char ch) { - while (!str.empty() && str[0] == ch) - str.erase (0, 1); + while (!str.empty() && str[0] == ch) + str.erase (0, 1); } + static void stripEnd (std::string &str, char ch) { - while (!str.empty() && str[str.size()-1] == ch) - str.erase (str.size()-1, 1); + while (!str.empty() && str[str.size()-1] == ch) + str.erase (str.size()-1, 1); } -struct StockMap { - const char *english, *locale, *stock; -}; -static const StockMap stock_map[] = { - { "Apply", _("Apply"), GTK_STOCK_APPLY }, - { "Accept", _("Accept"), GTK_STOCK_APPLY }, - { "Install", _("Install"), GTK_STOCK_APPLY }, - { "OK", _("OK"), GTK_STOCK_OK }, - { "Cancel", _("Cancel"), GTK_STOCK_CANCEL }, - { "Abort", _("Abort"), GTK_STOCK_CANCEL }, - { "Close", _("Close"), GTK_STOCK_CLOSE }, - { "Yes", _("Yes"), GTK_STOCK_YES }, - { "No", _("No"), GTK_STOCK_NO }, - { "Add", _("Add"), GTK_STOCK_ADD }, - { "Edit", _("Edit"), GTK_STOCK_EDIT }, - { "Delete", _("Delete"), GTK_STOCK_DELETE }, - { "Up", _("Up"), GTK_STOCK_GO_UP }, - { "Down", _("Down"), GTK_STOCK_GO_DOWN }, - { "Enable", _("Enable"), GTK_STOCK_YES }, - { "Disable", _("Disable"), GTK_STOCK_NO }, - { "Exit", _("Exit"), GTK_STOCK_QUIT }, -}; -#define stock_map_length (sizeof (stock_map) / sizeof (StockMap)) - -const char *YGUtils::mapStockIcon (const std::string &label) +const char *YGUtils::mapIconname(const std::string &label ) { - static bool firstTime = true; static std::map <std::string, std::string> stockMap; - if (firstTime) { - firstTime = false; - - // match GTK stock labels to yast ones - GSList *list = gtk_stock_list_ids(); - for (GSList *i = list; i; i = i->next) { - gchar *id = (gchar *) i->data; - GtkStockItem item; - if (gtk_stock_lookup (id, &item)) { - const gchar *_id = id; - if (!strcmp (id, GTK_STOCK_MEDIA_NEXT) || !strcmp (id, GTK_STOCK_MEDIA_FORWARD)) - _id = GTK_STOCK_GO_FORWARD; - else if (!strcmp (id, GTK_STOCK_MEDIA_PREVIOUS) || !strcmp (id, GTK_STOCK_MEDIA_REWIND)) - _id = GTK_STOCK_GO_BACK; - else if (!strcmp (id, GTK_STOCK_MEDIA_RECORD)) - _id = GTK_STOCK_SAVE; - else if (!strcmp (id, GTK_STOCK_CLEAR)) - _id = GTK_STOCK_DELETE; - else if (!strcmp (id, GTK_STOCK_QUIT)) - _id = GTK_STOCK_APPLY; - else if (!strcmp (id, GTK_STOCK_JUMP_TO)) - _id = GTK_STOCK_OK; - else if (!strncmp (id, "gtk-dialog-", 11)) - _id = 0; + std::map <std::string, std::string> stockMap; - if (_id) - stockMap[cutUnderline (item.label)] = _id; - } - // some may not have a stock item because they can't be set on a label - // e.g.: gtk-directory, gtk-missing-image, gtk-dnd - g_free (id); - } - g_slist_free (list); - - for (unsigned int j = 0; j < 2; j++) // add both current locale & english terms - for (unsigned int i = 0; i < stock_map_length; i++) - stockMap [stock_map[i].english+j] = stock_map[i].stock; - } - - std::string id = cutUnderline (label); + std::string id = cutUnderline (std::string(label)); stripStart (id, ' '); stripEnd (id, ' '); stripEnd (id, '.'); @@ -713,21 +679,22 @@ it = stockMap.find (id); if (it != stockMap.end()) return it->second.c_str(); + return NULL; } const char *YGUtils::setStockIcon (GtkWidget *button, const std::string &label, const char *fallbackIcon) { - const char *icon = mapStockIcon (label); - GtkStyleContext *ctx = gtk_widget_get_style_context(button); + const char *icon = mapIconname (label); if (!icon && label.size() < 22) icon = fallbackIcon; if (icon) { - if (gtk_style_context_lookup_icon_set (ctx, icon)) { + if (gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default(), icon, GTK_ICON_SIZE_BUTTON, GTK_ICON_LOOKUP_USE_BUILTIN )) { // we want to use GtkImage stock mode so it honors sensitive - GtkWidget *image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_BUTTON); + GtkWidget *image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_BUTTON); + gtk_button_set_always_show_image(GTK_BUTTON (button),true); gtk_button_set_image (GTK_BUTTON (button), image); } } @@ -832,8 +799,10 @@ return g_string_free (str, FALSE); } -const char *ygutils_mapStockIcon (const char *label) -{ return YGUtils::mapStockIcon (label); } + +const char *ygutils_mapIconname (const std::string &label) +{ return YGUtils::mapIconname (label); } + const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallback) { return YGUtils::setStockIcon (button, label, fallback); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/YGUtils.h new/libyui-gtk-2.43.7/src/YGUtils.h --- old/libyui-gtk-2.43.6/src/YGUtils.h 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/YGUtils.h 2013-08-06 16:03:27.000000000 +0200 @@ -57,9 +57,10 @@ GdkPixbuf *setGray (const GdkPixbuf *src); /* Tries to make sense out of the string, applying some stock icon to the button. */ - const char *mapStockIcon (const std::string &label); const char *setStockIcon (GtkWidget *button, const std::string &label, const char *fallbackIcon); + const char *mapIconname(const std::string &label); + /* For empty model rows, render a separator (can be used for GtkTreeView and GtkComboBox */ gboolean empty_row_is_separator_cb ( @@ -79,7 +80,7 @@ void ygutils_scrollAdj (GtkAdjustment *vadj, gboolean top); - const char *ygutils_mapStockIcon (const char *label); + const char *ygutils_mapIconname (const std::string &label); const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/ygtkimage.c new/libyui-gtk-2.43.7/src/ygtkimage.c --- old/libyui-gtk-2.43.6/src/ygtkimage.c 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/ygtkimage.c 2013-08-06 16:03:27.000000000 +0200 @@ -210,24 +210,6 @@ *minimal_height = *natural_height = requisition.height; } -static GdkPixbuf *ygtk_image_render_state (GtkWidget *widget, GdkPixbuf *pixbuf) -{ // as in GtkImage - GtkIconSource *source = gtk_icon_source_new(); - GtkStyleContext *style = gtk_widget_get_style_context (widget); - gtk_style_context_save (style); - gtk_style_context_set_state (style, gtk_widget_get_state_flags (widget)); - - GdkPixbuf *rendered; - gtk_icon_source_set_pixbuf (source, pixbuf); - gtk_icon_source_set_size (source, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_icon_source_set_size_wildcarded (source, FALSE); - rendered = gtk_render_icon_pixbuf (style, source, (GtkIconSize)-1); - - gtk_style_context_restore (style); - gtk_icon_source_free (source); - return rendered; -} - static gboolean ygtk_image_draw_event (GtkWidget *widget, cairo_t *cr) { YGtkImage *image = YGTK_IMAGE (widget); @@ -261,9 +243,6 @@ else pixbuf = image->pixbuf; - gboolean needs_transform = gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_INSENSITIVE; - if (needs_transform) - pixbuf = ygtk_image_render_state (widget, pixbuf); int x = 0, y = 0; if (image->align == CENTER_IMAGE_ALIGN) { x = (width - req.width) / 2; @@ -292,8 +271,6 @@ cairo_rectangle (cr, x, y, width, height); cairo_fill (cr); - if (needs_transform) - g_object_unref (G_OBJECT (pixbuf)); return FALSE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/ygtktextview.c new/libyui-gtk-2.43.7/src/ygtktextview.c --- old/libyui-gtk-2.43.6/src/ygtktextview.c 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/ygtktextview.c 2013-08-06 16:03:27.000000000 +0200 @@ -55,7 +55,7 @@ g_list_free (items); GtkWidget *item; - item = gtk_image_menu_item_new_from_stock (GTK_STOCK_COPY, NULL); + item = gtk_menu_item_new(); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); if (gtk_text_buffer_get_has_selection (buffer)) g_signal_connect (item, "activate", G_CALLBACK (copy_activate_cb), buffer); @@ -63,7 +63,7 @@ gtk_widget_set_sensitive (item, FALSE); item = gtk_separator_menu_item_new(); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - item = gtk_image_menu_item_new_from_stock (GTK_STOCK_SELECT_ALL, NULL); + item = gtk_menu_item_new(); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", G_CALLBACK (select_all_activate_cb), buffer); gtk_widget_show_all (GTK_WIDGET (menu)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/ygtktimezonepicker.c new/libyui-gtk-2.43.7/src/ygtktimezonepicker.c --- old/libyui-gtk-2.43.6/src/ygtktimezonepicker.c 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/ygtktimezonepicker.c 2013-08-06 16:03:27.000000000 +0200 @@ -125,7 +125,7 @@ else if (picker->closeup) ygtk_time_zone_picker_set_cursor_type (picker, GDK_CROSS); else - ygtk_time_zone_picker_set_cursor_stock (picker, GTK_STOCK_ZOOM_IN); + ygtk_time_zone_picker_set_cursor_stock (picker, "zoom-in"); } static void ygtk_time_zone_picker_scroll_to (YGtkTimeZonePicker *picker, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.43.6/src/ygtkwizard.c new/libyui-gtk-2.43.7/src/ygtkwizard.c --- old/libyui-gtk-2.43.6/src/ygtkwizard.c 2013-07-05 10:16:48.000000000 +0200 +++ new/libyui-gtk-2.43.7/src/ygtkwizard.c 2013-08-06 16:03:27.000000000 +0200 @@ -28,7 +28,6 @@ extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); extern void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); -extern const char *ygutils_mapStockIcon (const char *label); extern const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); extern GdkPixbuf *ygutils_setOpacity (const GdkPixbuf *src, int opacity, gboolean alpha); @@ -76,8 +75,9 @@ if (showIcon != gtk_entry_get_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY)) { gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, showIcon); - gtk_entry_set_icon_from_stock (entry, - GTK_ENTRY_ICON_SECONDARY, showIcon ? GTK_STOCK_CLEAR : NULL); + gtk_entry_set_icon_from_icon_name( entry, + GTK_ENTRY_ICON_SECONDARY, showIcon ? "edit-clear" : NULL); + if (showIcon) gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY, _("Clear")); @@ -105,8 +105,9 @@ gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_title (GTK_WINDOW (dialog), _("Help")); - GdkPixbuf *icon = gtk_widget_render_icon_pixbuf ( - GTK_WIDGET (dialog), GTK_STOCK_HELP, GTK_ICON_SIZE_MENU); + + GdkPixbuf *icon = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), + "help-contents", GTK_ICON_SIZE_MENU, 0, NULL); gtk_window_set_icon (GTK_WINDOW (dialog), icon); g_object_unref (G_OBJECT (icon)); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 450); @@ -139,8 +140,9 @@ // bottom part (search entry + close button) dialog->search_entry = gtk_entry_new(); gtk_widget_set_size_request (dialog->search_entry, 140, -1); - gtk_entry_set_icon_from_stock (GTK_ENTRY (dialog->search_entry), - GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); + gtk_entry_set_icon_from_icon_name( GTK_ENTRY (dialog->search_entry), + GTK_ENTRY_ICON_PRIMARY, "edit-find"); + gtk_entry_set_icon_activatable (GTK_ENTRY (dialog->search_entry), GTK_ENTRY_ICON_PRIMARY, TRUE); g_signal_connect (G_OBJECT (dialog->search_entry), "icon-press", @@ -150,7 +152,7 @@ g_signal_connect (G_OBJECT (dialog->search_entry), "activate", G_CALLBACK (search_entry_activated_cb), dialog); - dialog->close_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + dialog->close_button = gtk_button_new_with_label(_("Close")); gtk_widget_set_can_default(dialog->close_button, TRUE); GtkWidget *close_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); @@ -614,7 +616,8 @@ button = gtk_toggle_button_new(); gtk_button_set_label (GTK_BUTTON (button), _("Help")); gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE); - image = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name ("help-contents", GTK_ICON_SIZE_BUTTON); + gtk_button_set_always_show_image(GTK_BUTTON (button), 1); gtk_button_set_image (GTK_BUTTON (button), image); return button; } @@ -995,9 +998,9 @@ gtk_button_set_label (GTK_BUTTON (button), label); ENABLE_WIDGET_STR (label, button); if (button == wizard->abort_button) - stock = GTK_STOCK_CANCEL; + stock = "application-exit"; else if (button == wizard->release_notes_button) - stock = GTK_STOCK_EDIT; + stock = "edit-copy"; const char *_stock = ygutils_setStockIcon (button, label, stock); g_object_set_data (G_OBJECT (button), "icon-fallback", _stock ? 0 : GINT_TO_POINTER (1)); @@ -1052,14 +1055,7 @@ return FALSE; GtkWidget *entry; - const char *icon = ygutils_mapStockIcon (text); - if (icon) { - GtkWidget *image = gtk_image_new_from_stock (icon, GTK_ICON_SIZE_MENU); - entry = gtk_image_menu_item_new_with_mnemonic (text); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (entry), image); - } - else - entry = gtk_menu_item_new_with_mnemonic (text); + entry = gtk_menu_item_new_with_mnemonic (text); gtk_menu_shell_append (GTK_MENU_SHELL (parent), entry); gtk_widget_show (entry); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
