Rm some deprecated Gtk::Stock usage

(bzr r15366)

9 files changed, 22 insertions, 32 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 552500fe8..b7a48e859 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -102,7 +102,7 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) {
 
     tabs->show_all();
 
-    add_button(Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
+    add_button(_("_Close"), Gtk::RESPONSE_CLOSE);
     set_default_response(Gtk::RESPONSE_CLOSE);
 
     Gtk::Label *label=new Gtk::Label();
diff --git a/src/ui/dialog/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp
index 50dae0fd8..0835043ab 100644
--- a/src/ui/dialog/calligraphic-profile-rename.cpp
+++ b/src/ui/dialog/calligraphic-profile-rename.cpp
@@ -46,17 +46,17 @@ CalligraphicProfileRename::CalligraphicProfileRename() :
 
     mainVBox->pack_start(*_layout_table, false, false, 4);
     // Buttons
-    _close_button.set_use_stock(true);
-    _close_button.set_label(Gtk::Stock::CANCEL.id);
+    _close_button.set_use_underline();
+    _close_button.set_label(_("_Cancel"));
     _close_button.set_can_default();
 
     _delete_button.set_use_underline(true);
-    _delete_button.set_label(_("Delete"));
+    _delete_button.set_label(_("_Delete"));
     _delete_button.set_can_default();
     _delete_button.set_visible(false);
 
     _apply_button.set_use_underline(true);
-    _apply_button.set_label(_("Save"));
+    _apply_button.set_label(_("_Save"));
     _apply_button.set_can_default();
 
     _close_button.signal_clicked()
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 053549b73..8593223c1 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -44,9 +44,6 @@
 #include "color-profile.h"
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 
-#include <gtkmm/stock.h>
-#include <gtkmm/imagemenuitem.h>
-
 #include "ui/icon-names.h"
 
 using std::pair;
@@ -558,7 +555,7 @@ void DocumentProperties::linked_profiles_list_button_release(GdkEventButton* eve
 
 void DocumentProperties::cms_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
 {
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Remove"), true));
     _EmbProfContextMenu.append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
@@ -568,7 +565,7 @@ void DocumentProperties::cms_create_popup_menu(Gtk::Widget& parent, sigc::slot<v
 
 void DocumentProperties::external_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
 {
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Remove"), true));
     _ExternalScriptsContextMenu.append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
@@ -577,7 +574,7 @@ void DocumentProperties::external_create_popup_menu(Gtk::Widget& parent, sigc::s
 
 void DocumentProperties::embedded_create_popup_menu(Gtk::Widget& parent, sigc::slot<void> rem)
 {
-    Gtk::MenuItem* mi = Gtk::manage(new Gtk::ImageMenuItem(Gtk::Stock::REMOVE));
+    Gtk::MenuItem* mi = Gtk::manage(new Gtk::MenuItem(_("_Remove"), true));
     _EmbeddedScriptsContextMenu.append(*mi);
     mi->signal_activate().connect(rem);
     mi->show();
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 98ecf6db7..9bebde00f 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -26,7 +26,6 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/grid.h>
 #include <gtkmm/spinbutton.h>
-#include <gtkmm/stock.h>
 
 #ifdef WITH_GNOME_VFS
 # include <libgnomevfs/gnome-vfs-init.h>  // gnome_vfs_initialized
@@ -142,7 +141,7 @@ Export::Export (void) :
     units_label(_("Units:")),
     filename_box(false, 5),
     browse_label(_("_Export As..."), 1),
-    browse_image(Gtk::StockID(Gtk::Stock::INDEX), Gtk::ICON_SIZE_BUTTON),
+    browse_image(),
     batch_box(false, 5),
     batch_export(_("B_atch export all selected objects"), _("Export each selected object into its own PNG file, using export hints if any (caution, overwrites without asking!)")),
     interlacing(_("Use interlacing"),_("Enables ADAM7 interlacing for PNG output. This results in slightly heavier images, but big images will look better sooner when loading the file")),
@@ -156,8 +155,6 @@ Export::Export (void) :
     hide_export(_("Hide a_ll except selected"), _("In the exported image, hide all objects except those that are selected")),
     closeWhenDone(_("Close when complete"), _("Once the export completes, close this dialog")),
     button_box(false, 3),
-    export_label(_("_Export"), 1),
-    export_image(Gtk::StockID(Gtk::Stock::APPLY), Gtk::ICON_SIZE_BUTTON),
     _prog(),
     prog_dlg(NULL),
     interrupted(false),
@@ -290,6 +287,7 @@ Export::Export (void) :
         filename_box.pack_start (filename_entry, true, true, 0);
 
         Gtk::HBox* browser_im_label = new Gtk::HBox(false, 3);
+        browse_image.set_from_icon_name("folder", Gtk::ICON_SIZE_BUTTON);
         browser_im_label->pack_start(browse_image);
         browser_im_label->pack_start(browse_label);
         browse_button.add(*browser_im_label);
@@ -318,11 +316,8 @@ Export::Export (void) :
 
     /* Export Button row */
     button_box.set_border_width(3);
-    Gtk::HBox* export_image_label = new Gtk::HBox(false, 3);
-    export_image_label->pack_start(export_image);
-    export_image_label->pack_start(export_label);
-
-    export_button.add(*export_image_label);
+    export_button.set_label(_("_Export"));
+    export_button.set_use_underline();
     export_button.set_tooltip_text (_("Export the bitmap file with these settings"));
 
     button_box.pack_start(closeWhenDone, true, true, 0 );
@@ -906,7 +901,7 @@ Gtk::Dialog * Export::create_progress_dialog (Glib::ustring progress_text) {
     auto CA = dlg->get_content_area();
     CA->pack_start(*prg, FALSE, FALSE, 4);
 
-    Gtk::Button* btn = dlg->add_button (Gtk::Stock::CANCEL,Gtk::RESPONSE_CANCEL );
+    Gtk::Button* btn = dlg->add_button (_("_Cancel"),Gtk::RESPONSE_CANCEL );
 
     btn->signal_clicked().connect( sigc::mem_fun(*this, &Export::onProgressCancel) );
     dlg->signal_delete_event().connect( sigc::mem_fun(*this, &Export::onProgressDelete) );
diff --git a/src/ui/dialog/export.h b/src/ui/dialog/export.h
index 112f42312..f64d92341 100644
--- a/src/ui/dialog/export.h
+++ b/src/ui/dialog/export.h
@@ -331,8 +331,6 @@ private:
     /* Export Button widgets */
     Gtk::HBox button_box;
     Gtk::Button export_button;
-    Gtk::Label export_label;
-    Gtk::Image export_image;
 
     Gtk::ProgressBar _prog;
 
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 39110f47a..5919fcaeb 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -15,8 +15,8 @@
 # include <config.h>
 #endif
 
+#include <glibmm/i18n.h>
 #include <gtkmm/dialog.h>
-#include <gtkmm/stock.h>
 
 #include "verbs.h"
 #include "dialog.h"
@@ -165,7 +165,7 @@ PanelDialog<B>::PanelDialog(Widget::Panel &panel, char const *prefs_path, int co
             panel.addResponseButton(apply_label, Gtk::RESPONSE_APPLY);
             panel.setDefaultResponse(Gtk::RESPONSE_APPLY);
         }
-        panel.addResponseButton(Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
+        panel.addResponseButton(_("_Close"), Gtk::RESPONSE_CLOSE);
     }
 
     show_all_children();
@@ -214,7 +214,7 @@ PanelDialog<Behavior::FloatingBehavior>::PanelDialog(UI::Widget::Panel &panel, c
             panel.addResponseButton(apply_label, Gtk::RESPONSE_APPLY);
             panel.setDefaultResponse(Gtk::RESPONSE_APPLY);
         }
-        panel.addResponseButton(Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE);
+        panel.addResponseButton(_("_Close"), Gtk::RESPONSE_CLOSE);
     }
 
     show_all_children();
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index b838b0842..79747a798 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -291,12 +291,12 @@ PixelArtDialogImpl::PixelArtDialogImpl() :
         mainResetButton ->set_tooltip_text(_("Reset all settings to defaults"));
 
         //## The OK button
-        mainCancelButton = addResponseButton(Gtk::Stock::STOP, GTK_RESPONSE_CANCEL);
+        mainCancelButton = addResponseButton(_("_Stop"), GTK_RESPONSE_CANCEL);
         if (mainCancelButton) {
             mainCancelButton->set_tooltip_text(_("Abort a trace in progress"));
             mainCancelButton->set_sensitive(false);
         }
-        mainOkButton = addResponseButton(Gtk::Stock::OK, GTK_RESPONSE_OK);
+        mainOkButton = addResponseButton(_("_OK"), GTK_RESPONSE_OK);
         mainOkButton->set_tooltip_text(_("Execute the trace"));
 
         contents->pack_start(buttonsHBox);
diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp
index 1c0cb5708..6f31935a4 100644
--- a/src/ui/dialog/tracedialog.cpp
+++ b/src/ui/dialog/tracedialog.cpp
@@ -813,12 +813,12 @@ TraceDialogImpl::TraceDialogImpl() :
     mainResetButton ->set_tooltip_text(_("Reset all settings to defaults"));
 
     //## The OK button
-    mainCancelButton = addResponseButton(Gtk::Stock::STOP, GTK_RESPONSE_CANCEL);
+    mainCancelButton = addResponseButton(_("_Stop"), GTK_RESPONSE_CANCEL);
     if (mainCancelButton) {
 	mainCancelButton->set_tooltip_text(_("Abort a trace in progress"));
 	mainCancelButton->set_sensitive(false);
     }
-    mainOkButton = addResponseButton(Gtk::Stock::OK, GTK_RESPONSE_OK);
+    mainOkButton = addResponseButton(_("_OK"), GTK_RESPONSE_OK);
     mainOkButton->set_tooltip_text(_("Execute the trace"));
 
     show_all_children();
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 5ec47b0dc..475c3a9c6 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -134,14 +134,14 @@ Transformation::Transformation()
 
     updateSelection(PAGE_MOVE, _getSelection());
 
-    resetButton = addResponseButton(Gtk::Stock::CLEAR, 0);
+    resetButton = addResponseButton(_("_Clear"), 0);
     if (resetButton) {
         resetButton->set_tooltip_text(_("Reset the values on the current tab to defaults"));
         resetButton->set_sensitive(true);
         resetButton->signal_clicked().connect(sigc::mem_fun(*this, &Transformation::onClear));
     }
 
-    applyButton = addResponseButton(Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
+    applyButton = addResponseButton(_("_Apply"), Gtk::RESPONSE_APPLY);
     if (applyButton) {
         applyButton->set_tooltip_text(_("Apply transformation to selection"));
         applyButton->set_sensitive(false);