summaryrefslogtreecommitdiff
path: root/src/dialogs
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2014-11-25 22:20:59 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2014-11-25 22:20:59 (GMT)
commitb4d1a25a22371fa67c5d73bc8fcca08e045556f3 (patch)
tree9223e3de1e2d05933fe4230bd1b099df72712a1e /src/dialogs
parent7a42f3772ab31bb9c756fc5c5c86c531c04b1d70 (diff)
Removed all references to old GTK stock icons and thus removed GCC warnings.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@428 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/dialogs')
-rw-r--r--src/dialogs/binparts.c10
-rw-r--r--src/dialogs/export.c4
-rw-r--r--src/dialogs/goto.c4
-rw-r--r--src/dialogs/plugins.c12
-rw-r--r--src/dialogs/shellcode.c4
-rw-r--r--src/dialogs/storage.c6
6 files changed, 19 insertions, 21 deletions
diff --git a/src/dialogs/binparts.c b/src/dialogs/binparts.c
index 708f364..2d86432 100644
--- a/src/dialogs/binparts.c
+++ b/src/dialogs/binparts.c
@@ -24,6 +24,9 @@
#include "binparts.h"
+#include <i18n.h>
+
+
#include <stdio.h>
@@ -32,9 +35,6 @@
-#define _(str) str
-
-
/* Colonnes de la liste des symboles */
typedef enum _PartsColumn
@@ -269,10 +269,10 @@ GtkWidget *create_sections_dialog(GLoadedBinary *binary, GtkWindow *parent)
/* Boutons de contrĂ´le principaux */
- button = qck_create_button_from_stock(NULL, NULL, "gtk-ok", G_CALLBACK(save_current_selection), ref);
+ button = qck_create_button(NULL, NULL, _("_Ok"), G_CALLBACK(save_current_selection), ref);
gtk_container_add(GTK_CONTAINER(hbuttonbox1), button);
- button = qck_create_button_from_stock(NULL, NULL, "gtk-cancel", G_CALLBACK(close_editor), result);
+ button = qck_create_button(NULL, NULL, _("_Cancel"), G_CALLBACK(close_editor), result);
gtk_container_add(GTK_CONTAINER(hbuttonbox1), button);
/* Actualisation de l'interface */
diff --git a/src/dialogs/export.c b/src/dialogs/export.c
index 67a3b7c..76cdcfd 100644
--- a/src/dialogs/export.c
+++ b/src/dialogs/export.c
@@ -388,8 +388,8 @@ static void on_filename_browsing_clicked(GtkButton *button, GObject *ref)
dialog = gtk_file_chooser_dialog_new(_("Choose an output filename"), GTK_WINDOW(ref),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_ACCEPT,
NULL);
entry = GTK_ENTRY(g_object_get_data(ref, "filename"));
diff --git a/src/dialogs/goto.c b/src/dialogs/goto.c
index 1844712..537179e 100644
--- a/src/dialogs/goto.c
+++ b/src/dialogs/goto.c
@@ -208,10 +208,10 @@ GtkWidget *create_goto_dialog(GtkWindow *parent)
gtk_widget_show(action_area);
gtk_button_box_set_layout(GTK_BUTTON_BOX(action_area), GTK_BUTTONBOX_END);
- button = qck_create_button_from_stock(NULL, NULL, "gtk-cancel", NULL, NULL);
+ button = qck_create_button(NULL, NULL, _("_Cancel"), NULL, NULL);
gtk_dialog_add_action_widget(GTK_DIALOG(result), button, GTK_RESPONSE_CANCEL);
- button = qck_create_button_from_stock(NULL, NULL, "gtk-ok", NULL, NULL);
+ button = qck_create_button(NULL, NULL, _("_Ok"), NULL, NULL);
gtk_dialog_add_action_widget(GTK_DIALOG(result), button, GTK_RESPONSE_OK);
gtk_entry_set_text(GTK_ENTRY(entry), "0x");
diff --git a/src/dialogs/plugins.c b/src/dialogs/plugins.c
index ea9c9e2..4e7bfaf 100644
--- a/src/dialogs/plugins.c
+++ b/src/dialogs/plugins.c
@@ -147,7 +147,7 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *binary, GtkWindow *par
gtk_widget_show(button7);
gtk_container_add(GTK_CONTAINER(vbuttonbox1), button7);
- image3 = gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_BUTTON);
+ image3 = gtk_image_new_from_icon_name("gtk-add", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(image3);
gtk_container_add(GTK_CONTAINER(button7), image3);
@@ -155,7 +155,7 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *binary, GtkWindow *par
gtk_widget_show(button8);
gtk_container_add(GTK_CONTAINER(vbuttonbox1), button8);
- image4 = gtk_image_new_from_stock("gtk-remove", GTK_ICON_SIZE_BUTTON);
+ image4 = gtk_image_new_from_icon_name("gtk-remove", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(image4);
gtk_container_add(GTK_CONTAINER(button8), image4);
@@ -173,7 +173,7 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *binary, GtkWindow *par
gtk_widget_show(button9);
gtk_container_add(GTK_CONTAINER(vbuttonbox2), button9);
- image5 = gtk_image_new_from_stock("gtk-go-up", GTK_ICON_SIZE_BUTTON);
+ image5 = gtk_image_new_from_icon_name("gtk-go-up", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(image5);
gtk_container_add(GTK_CONTAINER(button9), image5);
@@ -181,7 +181,7 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *binary, GtkWindow *par
gtk_widget_show(button10);
gtk_container_add(GTK_CONTAINER(vbuttonbox2), button10);
- image6 = gtk_image_new_from_stock("gtk-go-down", GTK_ICON_SIZE_BUTTON);
+ image6 = gtk_image_new_from_icon_name("gtk-go-down", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(image6);
gtk_container_add(GTK_CONTAINER(button10), image6);
@@ -281,7 +281,7 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *binary, GtkWindow *par
gtk_widget_show(hbox1);
gtk_container_add(GTK_CONTAINER(alignment1), hbox1);
- image1 = gtk_image_new_from_stock("gtk-apply", GTK_ICON_SIZE_BUTTON);
+ image1 = gtk_image_new_from_icon_name("gtk-apply", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(image1);
gtk_box_pack_start(GTK_BOX(hbox1), image1, FALSE, FALSE, 0);
@@ -301,7 +301,7 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *binary, GtkWindow *par
gtk_widget_show(hbox2);
gtk_container_add(GTK_CONTAINER(alignment2), hbox2);
- image2 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON);
+ image2 = gtk_image_new_from_icon_name("gtk-cancel", GTK_ICON_SIZE_BUTTON);
gtk_widget_show(image2);
gtk_box_pack_start(GTK_BOX(hbox2), image2, FALSE, FALSE, 0);
diff --git a/src/dialogs/shellcode.c b/src/dialogs/shellcode.c
index c6087b8..514386f 100644
--- a/src/dialogs/shellcode.c
+++ b/src/dialogs/shellcode.c
@@ -694,8 +694,8 @@ static void on_filename_browsing_clicked(GtkButton *button, GObject *ref)
dialog = gtk_file_chooser_dialog_new(_("Choose an output filename"), GTK_WINDOW(ref),
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Save"), GTK_RESPONSE_ACCEPT,
NULL);
entry = GTK_ENTRY(g_object_get_data(ref, "filename"));
diff --git a/src/dialogs/storage.c b/src/dialogs/storage.c
index 9962d03..cffc2e2 100644
--- a/src/dialogs/storage.c
+++ b/src/dialogs/storage.c
@@ -283,12 +283,10 @@ GtkWidget *create_storage_dialog(GLoadedBinary *binary, GtkWindow *parent)
gtk_widget_show(action_area);
gtk_button_box_set_layout(GTK_BUTTON_BOX(action_area), GTK_BUTTONBOX_END);
-
- button = qck_create_button_from_stock(NULL, NULL, "gtk-cancel", NULL, NULL);
+ button = qck_create_button(NULL, NULL, _("_Cancel"), NULL, NULL);
gtk_dialog_add_action_widget(GTK_DIALOG(result), button, GTK_RESPONSE_CANCEL);
- button = qck_create_button_from_stock(NULL, NULL, "gtk-ok",
- G_CALLBACK(save_storage_params), result);
+ button = qck_create_button(NULL, NULL, _("_Ok"), G_CALLBACK(save_storage_params), result);
gtk_dialog_add_action_widget(GTK_DIALOG(result), button, GTK_RESPONSE_OK);
/* Chargement des données actuelles */