From 36ebb1f2b70f35dd802e98a628df070cff4f4d09 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Sun, 30 Oct 2011 22:01:49 +0100 Subject: [PATCH] Use canonical macros for stock items rather than plain strings This makes the code more readable, potentially more future-proof (if the actual string changes) and better style (catches possible typos at build-time). --- plugins/saveactions.c | 2 +- src/build.c | 8 ++++---- src/gb.c | 12 ++++++------ src/msgwindow.c | 6 +++--- src/project.c | 4 ++-- src/search.c | 2 +- src/sidebar.c | 8 ++++---- src/ui_utils.c | 2 +- src/vte.c | 10 +++++----- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/plugins/saveactions.c b/plugins/saveactions.c index 07e87d577..8ac3c0a2b 100644 --- a/plugins/saveactions.c +++ b/plugins/saveactions.c @@ -671,7 +671,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) g_signal_connect(button, "clicked", G_CALLBACK(backupcopy_dir_button_clicked_cb), entry_dir); - image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); gtk_container_add(GTK_CONTAINER(button), image); hbox = gtk_hbox_new(FALSE, 6); diff --git a/src/build.c b/src/build.c index e9bed7650..8540620a0 100644 --- a/src/build.c +++ b/src/build.c @@ -1627,21 +1627,21 @@ static void set_stop_button(gboolean stop) if (run_button != NULL) button_stock_id = gtk_tool_button_get_stock_id(run_button); - if (stop && utils_str_equal(button_stock_id, "gtk-stop")) + if (stop && utils_str_equal(button_stock_id, GTK_STOCK_STOP)) return; - if (! stop && utils_str_equal(button_stock_id, "gtk-execute")) + if (! stop && utils_str_equal(button_stock_id, GTK_STOCK_EXECUTE)) return; /* use the run button also as stop button */ if (stop) { if (run_button != NULL) - gtk_tool_button_set_stock_id(run_button, "gtk-stop"); + gtk_tool_button_set_stock_id(run_button, GTK_STOCK_STOP); } else { if (run_button != NULL) - gtk_tool_button_set_stock_id(run_button, "gtk-execute"); + gtk_tool_button_set_stock_id(run_button, GTK_STOCK_EXECUTE); } } diff --git a/src/gb.c b/src/gb.c index 08c41254c..b8c48093e 100644 --- a/src/gb.c +++ b/src/gb.c @@ -90,15 +90,15 @@ static void create_window(GtkWindow *parent) gtk_box_pack_start(GTK_BOX(vbox1), hbox1, TRUE, FALSE, 5); gtk_container_set_border_width(GTK_CONTAINER(hbox1), 4); - image1 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON); + image1 = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON); gtk_widget_show(image1); gtk_box_pack_start(GTK_BOX(hbox1), image1, TRUE, FALSE, 0); - image2 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON); + image2 = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON); gtk_widget_show(image2); gtk_box_pack_start(GTK_BOX(hbox1), image2, TRUE, FALSE, 0); - image3 = gtk_image_new_from_stock("gtk-cancel", GTK_ICON_SIZE_BUTTON); + image3 = gtk_image_new_from_stock(GTK_STOCK_CANCEL, GTK_ICON_SIZE_BUTTON); gtk_widget_set_name(image3, "image3"); gtk_widget_show(image3); gtk_box_pack_start(GTK_BOX(hbox1), image3, TRUE, FALSE, 0); @@ -127,12 +127,12 @@ static void create_window(GtkWindow *parent) gtk_box_set_homogeneous(GTK_BOX(hbox2), TRUE); gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, FALSE, 0); - button4 = gtk_button_new_from_stock("gtk-help"); + button4 = gtk_button_new_from_stock(GTK_STOCK_HELP); gtk_widget_show(button4); gtk_box_pack_start(GTK_BOX(hbox2), button4, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(button4), 5); - button5 = gtk_button_new_from_stock("gtk-close"); + button5 = gtk_button_new_from_stock(GTK_STOCK_CLOSE); gtk_widget_show(button5); gtk_box_pack_start(GTK_BOX(hbox2), button5, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(button5), 5); @@ -188,7 +188,7 @@ static GtkWidget *create_help_dialog(GtkWindow *parent) gtk_widget_show(dialog_action_area1); gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END); - okbutton1 = gtk_button_new_from_stock("gtk-ok"); + okbutton1 = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_widget_show(okbutton1); gtk_dialog_add_action_widget(GTK_DIALOG(help_dialog), okbutton1, GTK_RESPONSE_OK); GTK_WIDGET_SET_FLAGS(okbutton1, GTK_CAN_DEFAULT); diff --git a/src/msgwindow.c b/src/msgwindow.c index 595186717..e009730ac 100644 --- a/src/msgwindow.c +++ b/src/msgwindow.c @@ -547,7 +547,7 @@ static GtkWidget *create_message_popup_menu(gint type) message_popup_menu = gtk_menu_new(); - clear = gtk_image_menu_item_new_from_stock("gtk-clear", NULL); + clear = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL); gtk_widget_show(clear); gtk_container_add(GTK_CONTAINER(message_popup_menu), clear); g_signal_connect(clear, "activate", @@ -556,7 +556,7 @@ static GtkWidget *create_message_popup_menu(gint type) copy = gtk_image_menu_item_new_with_mnemonic(_("C_opy")); gtk_widget_show(copy); gtk_container_add(GTK_CONTAINER(message_popup_menu), copy); - image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU); gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy), image); g_signal_connect(copy, "activate", @@ -565,7 +565,7 @@ static GtkWidget *create_message_popup_menu(gint type) copy_all = gtk_image_menu_item_new_with_mnemonic(_("Copy _All")); gtk_widget_show(copy_all); gtk_container_add(GTK_CONTAINER(message_popup_menu), copy_all); - image = gtk_image_new_from_stock("gtk-copy", GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU); gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_all), image); g_signal_connect(copy_all, "activate", diff --git a/src/project.c b/src/project.c index 6cb87866c..4a98ae1e5 100644 --- a/src/project.c +++ b/src/project.c @@ -120,7 +120,7 @@ void project_new(void) gtk_widget_set_name(e->dialog, "GeanyDialogProject"); bbox = gtk_hbox_new(FALSE, 0); button = gtk_button_new(); - image = gtk_image_new_from_stock("gtk-new", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_BUTTON); label = gtk_label_new_with_mnemonic(_("C_reate")); gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 3); @@ -152,7 +152,7 @@ void project_new(void) gtk_entry_set_width_chars(GTK_ENTRY(e->file_name), 30); button = gtk_button_new(); g_signal_connect(button, "clicked", G_CALLBACK(on_file_save_button_clicked), e); - image = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); gtk_container_add(GTK_CONTAINER(button), image); bbox = gtk_hbox_new(FALSE, 6); gtk_box_pack_start_defaults(GTK_BOX(bbox), e->file_name); diff --git a/src/search.c b/src/search.c index 315eb81d5..cd95a4500 100644 --- a/src/search.c +++ b/src/search.c @@ -874,7 +874,7 @@ static void create_fif_dialog(void) gtk_box_set_spacing(GTK_BOX(vbox), 9); gtk_widget_set_name(fif_dlg.dialog, "GeanyDialogSearch"); - gtk_dialog_add_button(GTK_DIALOG(fif_dlg.dialog), "gtk-find", GTK_RESPONSE_ACCEPT); + gtk_dialog_add_button(GTK_DIALOG(fif_dlg.dialog), GTK_STOCK_FIND, GTK_RESPONSE_ACCEPT); gtk_dialog_set_default_response(GTK_DIALOG(fif_dlg.dialog), GTK_RESPONSE_ACCEPT); diff --git a/src/sidebar.c b/src/sidebar.c index cbdd1b9e5..c2a14ba83 100644 --- a/src/sidebar.c +++ b/src/sidebar.c @@ -597,7 +597,7 @@ void sidebar_add_common_menu_items(GtkMenu *menu) item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU)); + gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(on_hide_sidebar), NULL); @@ -658,7 +658,7 @@ static void create_openfiles_popup_menu(void) openfiles_popup_menu = gtk_menu_new(); - item = gtk_image_menu_item_new_from_stock("gtk-close", NULL); + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLOSE, NULL); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); g_signal_connect(item, "activate", @@ -669,7 +669,7 @@ static void create_openfiles_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); - item = gtk_image_menu_item_new_from_stock("gtk-save", NULL); + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SAVE, NULL); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); g_signal_connect(item, "activate", @@ -678,7 +678,7 @@ static void create_openfiles_popup_menu(void) item = gtk_image_menu_item_new_with_mnemonic(_("_Reload")); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), - gtk_image_new_from_stock("gtk-revert-to-saved", GTK_ICON_SIZE_MENU)); + gtk_image_new_from_stock(GTK_STOCK_REVERT_TO_SAVED, GTK_ICON_SIZE_MENU)); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(openfiles_popup_menu), item); g_signal_connect(item, "activate", diff --git a/src/ui_utils.c b/src/ui_utils.c index e4f1b0142..c1d9237be 100644 --- a/src/ui_utils.c +++ b/src/ui_utils.c @@ -1427,7 +1427,7 @@ static void entry_clear_icon_release_cb(GtkEntry *entry, gint icon_pos, */ void ui_entry_add_clear_icon(GtkEntry *entry) { - g_object_set(entry, "secondary-icon-stock", "gtk-clear", NULL); + g_object_set(entry, "secondary-icon-stock", GTK_STOCK_CLEAR, NULL); g_signal_connect(entry, "icon-release", G_CALLBACK(entry_clear_icon_release_cb), NULL); } diff --git a/src/vte.c b/src/vte.c index 9bf7c6245..e357b039a 100644 --- a/src/vte.c +++ b/src/vte.c @@ -515,14 +515,14 @@ static GtkWidget *vte_create_popup_menu(void) accel_group = gtk_accel_group_new(); gtk_window_add_accel_group(GTK_WINDOW(main_widgets.window), accel_group); - item = gtk_image_menu_item_new_from_stock("gtk-copy", NULL); + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_COPY, NULL); gtk_widget_add_accelerator(item, "activate", accel_group, GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_COPY)); - item = gtk_image_menu_item_new_from_stock("gtk-paste", NULL); + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PASTE, NULL); gtk_widget_add_accelerator(item, "activate", accel_group, GDK_v, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_ACCEL_VISIBLE); gtk_widget_show(item); @@ -533,7 +533,7 @@ static GtkWidget *vte_create_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - item = gtk_image_menu_item_new_from_stock("gtk-select-all", NULL); + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SELECT_ALL, NULL); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_SELECTALL)); @@ -556,7 +556,7 @@ static GtkWidget *vte_create_popup_menu(void) gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - item = gtk_image_menu_item_new_from_stock("gtk-preferences", NULL); + item = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); g_signal_connect(item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PREFERENCES)); @@ -836,7 +836,7 @@ void vte_append_preferences_tab(void) (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - image_shell = gtk_image_new_from_stock("gtk-open", GTK_ICON_SIZE_BUTTON); + image_shell = gtk_image_new_from_stock(GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON); gtk_widget_show(image_shell); gtk_container_add(GTK_CONTAINER(button_shell), image_shell); -- 2.11.4.GIT