diff options
Diffstat (limited to 'plugins/publish-calendar')
-rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 20 | ||||
-rw-r--r-- | plugins/publish-calendar/publish-calendar.ui | 86 | ||||
-rw-r--r-- | plugins/publish-calendar/url-editor-dialog.c | 4 |
3 files changed, 22 insertions, 88 deletions
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 67bfef945c..455c34a503 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -98,7 +98,7 @@ update_publish_notification (GtkMessageType msg_type, static gboolean can_notify = TRUE; #endif gboolean new_icon = !status_icon; - const gchar *stock_name; + const gchar *icon_name; g_return_if_fail (msg_text != NULL); @@ -114,13 +114,13 @@ update_publish_notification (GtkMessageType msg_type, switch (msg_type) { case GTK_MESSAGE_WARNING: - stock_name = GTK_STOCK_DIALOG_WARNING; + icon_name = "dialog-warning"; break; case GTK_MESSAGE_ERROR: - stock_name = GTK_STOCK_DIALOG_ERROR; + icon_name = "dialog-error"; break; default: - stock_name = GTK_STOCK_DIALOG_INFO; + icon_name = "dialog-information"; break; } @@ -131,20 +131,20 @@ update_publish_notification (GtkMessageType msg_type, g_string_append (actual_msg, msg_text); } - gtk_status_icon_set_from_stock (status_icon, stock_name); + gtk_status_icon_set_from_icon_name (status_icon, icon_name); gtk_status_icon_set_tooltip_text (status_icon, actual_msg->str); #ifdef HAVE_LIBNOTIFY if (can_notify) { if (notify) { - notify_notification_update (notify, _("Calendar Publishing"), actual_msg->str, stock_name); + notify_notification_update (notify, _("Calendar Publishing"), actual_msg->str, icon_name); } else { if (!notify_init ("evolution-publish-calendar")) { can_notify = FALSE; return; } - notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name); + notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, icon_name); notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); notify_notification_set_hint ( @@ -803,8 +803,8 @@ url_remove_clicked (GtkButton *button, NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, _("Are you sure you want to remove this location?")); - gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); - gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES); + gtk_dialog_add_button (GTK_DIALOG (confirm), _("_Cancel"), GTK_RESPONSE_NO); + gtk_dialog_add_button (GTK_DIALOG (confirm), _("_Remove"), GTK_RESPONSE_YES); gtk_dialog_set_default_response (GTK_DIALOG (confirm), GTK_RESPONSE_CANCEL); response = gtk_dialog_run (GTK_DIALOG (confirm)); @@ -933,7 +933,7 @@ publish_calendar_locations (EPlugin *epl, gtk_widget_set_sensitive (GTK_WIDGET (ui->url_remove), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_enable), FALSE); - gtk_button_set_image (GTK_BUTTON (ui->url_enable), gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_BUTTON)); + gtk_button_set_image (GTK_BUTTON (ui->url_enable), gtk_image_new_from_icon_name ("dialog-apply", GTK_ICON_SIZE_BUTTON)); gtk_button_set_use_underline (GTK_BUTTON (ui->url_enable), TRUE); l = publish_uris; diff --git a/plugins/publish-calendar/publish-calendar.ui b/plugins/publish-calendar/publish-calendar.ui index 88bce4265e..f59ba9fc03 100644 --- a/plugins/publish-calendar/publish-calendar.ui +++ b/plugins/publish-calendar/publish-calendar.ui @@ -716,12 +716,13 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="url add"> - <property name="label">gtk-add</property> + <property name="label" translatable="yes">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_stock">False</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -735,42 +736,8 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <child> - <object class="GtkAlignment" id="alignment2"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-properties</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> + <property name="label" translatable="yes">_Edit</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -780,12 +747,13 @@ </child> <child> <object class="GtkButton" id="url remove"> - <property name="label">gtk-remove</property> + <property name="label" translatable="yes">_Remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_stock">False</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -799,42 +767,8 @@ <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-apply</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">E_nable</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> + <property name="label" translatable="yes">E_nable</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 9173cdeb38..dfbbe69413 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -418,8 +418,8 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - dialog->cancel = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - dialog->ok = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_OK); + dialog->cancel = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Cancel"), GTK_RESPONSE_CANCEL); + dialog->ok = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_OK"), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); |