[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 11/13: Replace deprecated GtkStock items
noreply at xfce.org
noreply at xfce.org
Thu May 24 04:05:15 CEST 2018
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository thunar-plugins/thunar-vcs-plugin.
commit 447d0b18319bb3800e8bab32dbdf68e1b85fbb67
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Thu May 17 23:20:10 2018 +0200
Replace deprecated GtkStock items
---
tvp-git-helper/tgh-blame-dialog.c | 7 +++---
tvp-git-helper/tgh-branch-dialog.c | 23 ++++++++++----------
tvp-git-helper/tgh-clean-dialog.c | 4 ++--
tvp-git-helper/tgh-file-selection-dialog.c | 4 ++--
tvp-git-helper/tgh-log-dialog.c | 11 +++++-----
tvp-git-helper/tgh-move.c | 4 ++--
tvp-git-helper/tgh-notify-dialog.c | 15 ++++++-------
tvp-git-helper/tgh-stash-dialog.c | 29 ++++++++++++-------------
tvp-git-helper/tgh-status-dialog.c | 15 ++++++-------
tvp-git-helper/tgh-transfer-dialog.c | 12 +++++-----
tvp-svn-helper/tsh-blame-dialog.c | 19 ++++++++--------
tvp-svn-helper/tsh-copy.c | 4 ++--
tvp-svn-helper/tsh-diff-dialog.c | 12 +++++-----
tvp-svn-helper/tsh-file-dialog.c | 4 ++--
tvp-svn-helper/tsh-file-selection-dialog.c | 4 ++--
tvp-svn-helper/tsh-lock-dialog.c | 4 ++--
tvp-svn-helper/tsh-log-dialog.c | 25 ++++++++++-----------
tvp-svn-helper/tsh-log-message-dialog.c | 4 ++--
tvp-svn-helper/tsh-login-dialog.c | 4 ++--
tvp-svn-helper/tsh-move.c | 4 ++--
tvp-svn-helper/tsh-notify-dialog.c | 17 +++++++--------
tvp-svn-helper/tsh-properties-dialog.c | 35 +++++++++++++++---------------
tvp-svn-helper/tsh-relocate-dialog.c | 23 +++++++++-----------
tvp-svn-helper/tsh-status-dialog.c | 19 ++++++++--------
tvp-svn-helper/tsh-transfer-dialog.c | 14 +++++-------
tvp-svn-helper/tsh-trust-dialog.c | 4 ++--
26 files changed, 151 insertions(+), 169 deletions(-)
diff --git a/tvp-git-helper/tgh-blame-dialog.c b/tvp-git-helper/tgh-blame-dialog.c
index 896f9a3..b31cece 100644
--- a/tvp-git-helper/tgh-blame-dialog.c
+++ b/tvp-git-helper/tgh-blame-dialog.c
@@ -128,10 +128,10 @@ tgh_blame_dialog_init (TghBlameDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Blame"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic(_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -159,7 +159,7 @@ tgh_blame_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flag
return GTK_WIDGET(dialog);
}
-void
+void
tgh_blame_dialog_add (TghBlameDialog *dialog, gint64 line_no, const gchar *revision, const gchar *author, const gchar *date, const gchar *line)
{
GtkTreeModel *model;
@@ -198,4 +198,3 @@ cancel_clicked (GtkButton *button, gpointer user_data)
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
-
diff --git a/tvp-git-helper/tgh-branch-dialog.c b/tvp-git-helper/tgh-branch-dialog.c
index 643f68e..5b69f97 100644
--- a/tvp-git-helper/tgh-branch-dialog.c
+++ b/tvp-git-helper/tgh-branch-dialog.c
@@ -102,7 +102,7 @@ tgh_branch_dialog_init (TghBranchDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_toggle_new ();
gtk_cell_renderer_toggle_set_radio (GTK_CELL_RENDERER_TOGGLE(renderer), TRUE);
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@@ -127,22 +127,22 @@ tgh_branch_dialog_init (TghBranchDialog *dialog)
gtk_widget_show (tree_view);
gtk_widget_show (scroll_window);
- dialog->checkout = button = gtk_button_new_from_stock(GTK_STOCK_JUMP_TO);
+ dialog->checkout = button = gtk_button_new_with_mnemonic (_("Jump to"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (checkout_clicked), dialog);
gtk_widget_show (button);
- dialog->create = button = gtk_button_new_from_stock(GTK_STOCK_NEW);
+ dialog->create = button = gtk_button_new_with_mnemonic (_("_New"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (create_clicked), dialog);
gtk_widget_show (button);
gtk_window_set_title (GTK_WINDOW (dialog), _("Branch"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -172,7 +172,7 @@ tgh_branch_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags fla
return GTK_WIDGET(dialog);
}
-void
+void
tgh_branch_dialog_add (TghBranchDialog *dialog, const gchar *branch, gboolean active)
{
GtkTreeModel *model;
@@ -205,7 +205,7 @@ cancel_clicked (GtkButton *button, gpointer user_data)
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
@@ -248,19 +248,19 @@ create_clicked (GtkButton *button, gpointer user_data)
TghBranchDialog *dialog = TGH_BRANCH_DIALOG (user_data);
- name_dialog = gtk_dialog_new_with_buttons (NULL, GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_NEW, GTK_RESPONSE_ACCEPT, NULL);
+ name_dialog = gtk_dialog_new_with_buttons (NULL, GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("_New"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
gtk_window_set_resizable (GTK_WINDOW (name_dialog), FALSE);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (name_dialog), TRUE);
label = gtk_label_new (_("Branch name:"));
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
-
+
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
name_entry = gtk_entry_new ();
-
+
hbox = gtk_hbox_new (FALSE, 12);
vbox = gtk_vbox_new (FALSE, 12);
@@ -309,4 +309,3 @@ create_clicked (GtkButton *button, gpointer user_data)
g_free (name);
}
-
diff --git a/tvp-git-helper/tgh-clean-dialog.c b/tvp-git-helper/tgh-clean-dialog.c
index c6e6fb3..fb9fe20 100644
--- a/tvp-git-helper/tgh-clean-dialog.c
+++ b/tvp-git-helper/tgh-clean-dialog.c
@@ -96,8 +96,8 @@ tgh_clean_dialog_init (TghCleanDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Clean"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-git-helper/tgh-file-selection-dialog.c b/tvp-git-helper/tgh-file-selection-dialog.c
index 245413d..2c64012 100644
--- a/tvp-git-helper/tgh-file-selection-dialog.c
+++ b/tvp-git-helper/tgh-file-selection-dialog.c
@@ -121,8 +121,8 @@ tgh_file_selection_dialog_init (TghFileSelectionDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-git-helper/tgh-log-dialog.c b/tvp-git-helper/tgh-log-dialog.c
index 9bb6bad..77dc04e 100644
--- a/tvp-git-helper/tgh-log-dialog.c
+++ b/tvp-git-helper/tgh-log-dialog.c
@@ -173,7 +173,7 @@ tgh_log_dialog_init (TghLogDialog *dialog)
g_object_unref (model);
- g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
+ g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
gtk_paned_pack1 (GTK_PANED(pane), scroll_window, TRUE, FALSE);
@@ -244,17 +244,17 @@ tgh_log_dialog_init (TghLogDialog *dialog)
gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
- dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_show (button);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
@@ -333,7 +333,7 @@ add_n_check_node (TghGraphNode *node_iter, TghGraphNode **node_list, const gchar
return node_iter;
}
-void
+void
tgh_log_dialog_add (TghLogDialog *dialog, GSList *files, const gchar *revision, gchar **parents, const gchar *author, const gchar *author_date, const gchar *commit, const gchar *commit_date, const gchar *message)
{
GtkTreeModel *model;
@@ -512,4 +512,3 @@ refresh_clicked (GtkButton *button, gpointer user_data)
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->file_view));
gtk_list_store_clear (GTK_LIST_STORE (model));
}
-
diff --git a/tvp-git-helper/tgh-move.c b/tvp-git-helper/tgh-move.c
index b031d29..084e650 100644
--- a/tvp-git-helper/tgh-move.c
+++ b/tvp-git-helper/tgh-move.c
@@ -145,8 +145,8 @@ gboolean tgh_move (gchar **files, GPid *pid)
dialog = gtk_file_chooser_dialog_new (_("Move To"), NULL,
multiple?GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
diff --git a/tvp-git-helper/tgh-notify-dialog.c b/tvp-git-helper/tgh-notify-dialog.c
index 70022d6..aa476d5 100644
--- a/tvp-git-helper/tgh-notify-dialog.c
+++ b/tvp-git-helper/tgh-notify-dialog.c
@@ -80,13 +80,13 @@ tgh_notify_dialog_init (TghNotifyDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Action"),
renderer, "text",
COLUMN_ACTION, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Path"),
@@ -106,10 +106,10 @@ tgh_notify_dialog_init (TghNotifyDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Notify"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -137,7 +137,7 @@ tgh_notify_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags fla
return GTK_WIDGET(dialog);
}
-void
+void
tgh_notify_dialog_add (TghNotifyDialog *dialog, const gchar *action, const gchar *file)
{
GtkTreeModel *model;
@@ -173,10 +173,9 @@ static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
TghNotifyDialog *dialog = TGH_NOTIFY_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
-
diff --git a/tvp-git-helper/tgh-stash-dialog.c b/tvp-git-helper/tgh-stash-dialog.c
index 9f38f98..ea1ecb6 100644
--- a/tvp-git-helper/tgh-stash-dialog.c
+++ b/tvp-git-helper/tgh-stash-dialog.c
@@ -179,7 +179,7 @@ tgh_stash_dialog_init (TghStashDialog *dialog)
g_object_unref (model);
- g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
+ g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
gtk_paned_pack1 (GTK_PANED(vpane), scroll_window, TRUE, FALSE);
@@ -218,37 +218,37 @@ tgh_stash_dialog_init (TghStashDialog *dialog)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vpane, TRUE, TRUE, 0);
gtk_widget_show (vpane);
- dialog->save = button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
+ dialog->save = button = gtk_button_new_with_mnemonic (_("_Save"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (save_clicked), dialog);
gtk_widget_show (button);
- dialog->apply = button = gtk_button_new_from_stock(GTK_STOCK_APPLY);
+ dialog->apply = button = gtk_button_new_with_mnemonic (_("_Apply"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (apply_clicked), dialog);
gtk_widget_show (button);
- dialog->pop = button = gtk_button_new_from_stock(GTK_STOCK_OK);
+ dialog->pop = button = gtk_button_new_with_mnemonic (_("_OK"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (pop_clicked), dialog);
gtk_widget_show (button);
- dialog->drop = button = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+ dialog->drop = button = gtk_button_new_with_mnemonic (_("_Delete"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (drop_clicked), dialog);
gtk_widget_show (button);
- dialog->clear = button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
+ dialog->clear = button = gtk_button_new_with_mnemonic (_("Clear"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (clear_clicked), dialog);
gtk_widget_show (button);
gtk_window_set_title (GTK_WINDOW (dialog), _("Stash"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -278,7 +278,7 @@ tgh_stash_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flag
return GTK_WIDGET(dialog);
}
-void
+void
tgh_stash_dialog_add (TghStashDialog *dialog, const gchar *name, const gchar *branch, const gchar *description)
{
GtkTreeModel *model;
@@ -296,7 +296,7 @@ tgh_stash_dialog_add (TghStashDialog *dialog, const gchar *name, const gchar *br
-1);
}
-void
+void
tgh_stash_dialog_add_file (TghStashDialog *dialog, guint insertions, guint deletions, const gchar *file)
{
GtkTreeModel *model;
@@ -377,19 +377,19 @@ save_clicked (GtkButton *button, gpointer user_data)
gchar *name;
gint result;
- name_dialog = gtk_dialog_new_with_buttons (NULL, GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+ name_dialog = gtk_dialog_new_with_buttons (NULL, GTK_WINDOW (dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, _("_Cancel"), GTK_RESPONSE_CANCEL, _("_Save"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
gtk_window_set_resizable (GTK_WINDOW (name_dialog), FALSE);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (name_dialog), TRUE);
label = gtk_label_new (_("Stash description:"));
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+ image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
-
+
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
desc_entry = gtk_entry_new ();
-
+
hbox = gtk_hbox_new (FALSE, 12);
vbox = gtk_vbox_new (FALSE, 12);
@@ -562,4 +562,3 @@ clear_clicked (GtkButton *button, gpointer user_data)
g_signal_emit (dialog, signals[SIGNAL_CLEAR], 0);
}
-
diff --git a/tvp-git-helper/tgh-status-dialog.c b/tvp-git-helper/tgh-status-dialog.c
index 3481506..f4962fe 100644
--- a/tvp-git-helper/tgh-status-dialog.c
+++ b/tvp-git-helper/tgh-status-dialog.c
@@ -91,7 +91,7 @@ tgh_status_dialog_init (TghStatusDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_toggle_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Commit"),
@@ -103,7 +103,7 @@ tgh_status_dialog_init (TghStatusDialog *dialog)
-1, _("Path"),
renderer, "text",
COLUMN_PATH, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("State"),
@@ -125,17 +125,17 @@ tgh_status_dialog_init (TghStatusDialog *dialog)
gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
- dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_show (button);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
@@ -161,7 +161,7 @@ tgh_status_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags fla
return GTK_WIDGET(dialog);
}
-void
+void
tgh_status_dialog_add (TghStatusDialog *dialog, const gchar *file, const gchar *state, gboolean commit)
{
GtkTreeModel *model;
@@ -195,7 +195,7 @@ cancel_clicked (GtkButton *button, gpointer user_data)
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->refresh);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
@@ -213,4 +213,3 @@ refresh_clicked (GtkButton *button, gpointer user_data)
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_clear (GTK_LIST_STORE (model));
}
-
diff --git a/tvp-git-helper/tgh-transfer-dialog.c b/tvp-git-helper/tgh-transfer-dialog.c
index 211d12a..bd476af 100644
--- a/tvp-git-helper/tgh-transfer-dialog.c
+++ b/tvp-git-helper/tgh-transfer-dialog.c
@@ -74,12 +74,11 @@ tgh_transfer_dialog_init (TghTransferDialog *dialog)
dialog->repository = gtk_entry_new();
dialog->filechooser = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
- GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button), image);
g_signal_connect(button, "clicked", G_CALLBACK(browse_callback), dialog);
@@ -122,8 +121,8 @@ tgh_transfer_dialog_init (TghTransferDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Transfer"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -221,4 +220,3 @@ browse_callback(GtkButton *button, TghTransferDialog *dialog)
}
gtk_widget_hide(dialog->filechooser);
}
-
diff --git a/tvp-svn-helper/tsh-blame-dialog.c b/tvp-svn-helper/tsh-blame-dialog.c
index 76228e6..11033b3 100644
--- a/tvp-svn-helper/tsh-blame-dialog.c
+++ b/tvp-svn-helper/tsh-blame-dialog.c
@@ -93,25 +93,25 @@ tsh_blame_dialog_init (TshBlameDialog *dialog)
-1, _("Line"), renderer,
"text", COLUMN_LINE_NO,
NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Revision"), renderer,
"text", COLUMN_REVISION,
NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Author"), renderer,
"text", COLUMN_AUTHOR,
NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Date"), renderer,
"text", COLUMN_DATE,
NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, NULL, renderer,
@@ -131,10 +131,10 @@ tsh_blame_dialog_init (TshBlameDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Blame"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -162,7 +162,7 @@ tsh_blame_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flag
return GTK_WIDGET(dialog);
}
-void
+void
tsh_blame_dialog_add (TshBlameDialog *dialog, gint64 line_no, glong revision, const gchar *author, const gchar *date, const gchar *line)
{
GtkTreeModel *model;
@@ -195,10 +195,9 @@ static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
TshBlameDialog *dialog = TSH_BLAME_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
-
diff --git a/tvp-svn-helper/tsh-copy.c b/tvp-svn-helper/tsh-copy.c
index a5dfb7c..320dc53 100644
--- a/tvp-svn-helper/tsh-copy.c
+++ b/tvp-svn-helper/tsh-copy.c
@@ -158,8 +158,8 @@ GThread *tsh_copy (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
dialog = gtk_file_chooser_dialog_new (_("Copy To"), NULL,
/*isdir?GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:*/GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), isdir?(absolute?absolute:from):g_path_get_dirname(absolute?absolute:from));
diff --git a/tvp-svn-helper/tsh-diff-dialog.c b/tvp-svn-helper/tsh-diff-dialog.c
index 1818cd8..a20e623 100644
--- a/tvp-svn-helper/tsh-diff-dialog.c
+++ b/tvp-svn-helper/tsh-diff-dialog.c
@@ -136,15 +136,15 @@ tsh_diff_dialog_init (TshDiffDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Diff"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
- dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
@@ -240,7 +240,7 @@ tsh_diff_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags
return GTK_WIDGET(dialog);
}
-void
+void
tsh_diff_dialog_add (TshDiffDialog *dialog, const char *line, gint len)
{
GtkTextBuffer *text_buffer;
@@ -282,11 +282,11 @@ static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
TshDiffDialog *dialog = TSH_DIFF_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
gtk_widget_show (dialog->refresh);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
diff --git a/tvp-svn-helper/tsh-file-dialog.c b/tvp-svn-helper/tsh-file-dialog.c
index c337721..8685386 100644
--- a/tvp-svn-helper/tsh-file-dialog.c
+++ b/tvp-svn-helper/tsh-file-dialog.c
@@ -85,8 +85,8 @@ tsh_file_dialog_init (TshFileDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-svn-helper/tsh-file-selection-dialog.c b/tvp-svn-helper/tsh-file-selection-dialog.c
index e3f94de..ba7bfc9 100644
--- a/tvp-svn-helper/tsh-file-selection-dialog.c
+++ b/tvp-svn-helper/tsh-file-selection-dialog.c
@@ -151,8 +151,8 @@ tsh_file_selection_dialog_init (TshFileSelectionDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Status"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-svn-helper/tsh-lock-dialog.c b/tvp-svn-helper/tsh-lock-dialog.c
index 0b4fa3d..e6c8f18 100644
--- a/tvp-svn-helper/tsh-lock-dialog.c
+++ b/tvp-svn-helper/tsh-lock-dialog.c
@@ -71,8 +71,8 @@ tsh_lock_dialog_init (TshLockDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Lock"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-svn-helper/tsh-log-dialog.c b/tvp-svn-helper/tsh-log-dialog.c
index b5d019e..6ba6749 100644
--- a/tvp-svn-helper/tsh-log-dialog.c
+++ b/tvp-svn-helper/tsh-log-dialog.c
@@ -122,25 +122,25 @@ tsh_log_dialog_init (TshLogDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Revision"),
renderer, "text",
COLUMN_REVISION, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Author"),
renderer, "text",
COLUMN_AUTHOR, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Date"),
renderer, "text",
COLUMN_DATE, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Message"),
@@ -153,7 +153,7 @@ tsh_log_dialog_init (TshLogDialog *dialog)
g_object_unref (model);
- g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
+ g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
gtk_paned_pack1 (GTK_PANED(pane), scroll_window, TRUE, FALSE);
@@ -184,7 +184,7 @@ tsh_log_dialog_init (TshLogDialog *dialog)
-1, _("Action"),
renderer, "text",
FILE_COLUMN_ACTION, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
n_columns = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (file_view),
-1, _("Path"),
@@ -226,17 +226,17 @@ tsh_log_dialog_init (TshLogDialog *dialog)
gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
- dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_show (button);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
@@ -262,7 +262,7 @@ tsh_log_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags flags)
return GTK_WIDGET(dialog);
}
-gchar*
+gchar*
tsh_log_dialog_add (TshLogDialog *dialog, const gchar *parent, GSList *files, glong revision, const char *author, const char *date, const char *message)
{
GtkTreeModel *model;
@@ -380,7 +380,7 @@ selection_changed (GtkTreeView *tree_view, gpointer user_data)
TshLogDialog *dialog = TSH_LOG_DIALOG (user_data);
selection = gtk_tree_view_get_selection (tree_view);
-
+
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, COLUMN_FULL_MESSAGE, &message, COLUMN_FILE_LIST, &files, -1);
@@ -410,7 +410,7 @@ cancel_clicked (GtkButton *button, gpointer user_data)
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->refresh);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
@@ -449,4 +449,3 @@ move_info (GtkTreeStore *store, GtkTreeIter *dest, GtkTreeIter *src)
g_free (action);
}
-
diff --git a/tvp-svn-helper/tsh-log-message-dialog.c b/tvp-svn-helper/tsh-log-message-dialog.c
index ca328dc..2b2f668 100644
--- a/tvp-svn-helper/tsh-log-message-dialog.c
+++ b/tvp-svn-helper/tsh-log-message-dialog.c
@@ -117,8 +117,8 @@ tsh_log_message_dialog_init (TshLogMessageDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Log Message"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-svn-helper/tsh-login-dialog.c b/tvp-svn-helper/tsh-login-dialog.c
index c3ecac0..1b60f63 100644
--- a/tvp-svn-helper/tsh-login-dialog.c
+++ b/tvp-svn-helper/tsh-login-dialog.c
@@ -105,8 +105,8 @@ tsh_login_dialog_init (TshLoginDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Login"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
diff --git a/tvp-svn-helper/tsh-move.c b/tvp-svn-helper/tsh-move.c
index a079244..a47c7af 100644
--- a/tvp-svn-helper/tsh-move.c
+++ b/tvp-svn-helper/tsh-move.c
@@ -149,8 +149,8 @@ GThread *tsh_move (gchar **files, svn_client_ctx_t *ctx, apr_pool_t *pool)
dialog = gtk_file_chooser_dialog_new (_("Move To"), NULL,
/*isdir?GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER:*/GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), isdir?(absolute?absolute:from):g_path_get_dirname(absolute?absolute:from));
diff --git a/tvp-svn-helper/tsh-notify-dialog.c b/tvp-svn-helper/tsh-notify-dialog.c
index d9d55e4..5ff6a34 100644
--- a/tvp-svn-helper/tsh-notify-dialog.c
+++ b/tvp-svn-helper/tsh-notify-dialog.c
@@ -81,13 +81,13 @@ tsh_notify_dialog_init (TshNotifyDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Action"),
renderer, "text",
COLUMN_ACTION, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Path"),
@@ -113,10 +113,10 @@ tsh_notify_dialog_init (TshNotifyDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Notification"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -144,7 +144,7 @@ tsh_notify_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags fla
return GTK_WIDGET(dialog);
}
-void
+void
tsh_notify_dialog_add (TshNotifyDialog *dialog, const char *action, const char *file, const char *mime_type)
{
GtkTreeModel *model;
@@ -159,7 +159,7 @@ tsh_notify_dialog_add (TshNotifyDialog *dialog, const char *action, const char *
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
COLUMN_ACTION, action,
COLUMN_PATH, file,
- COLUMN_MIME, mime_type,
+ COLUMN_MIME, mime_type,
-1);
path = gtk_tree_model_get_path (model, &iter);
@@ -181,10 +181,9 @@ static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
TshNotifyDialog *dialog = TSH_NOTIFY_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
-
diff --git a/tvp-svn-helper/tsh-properties-dialog.c b/tvp-svn-helper/tsh-properties-dialog.c
index 7ba6439..b634c7e 100644
--- a/tvp-svn-helper/tsh-properties-dialog.c
+++ b/tvp-svn-helper/tsh-properties-dialog.c
@@ -119,13 +119,13 @@ tsh_properties_dialog_init (TshPropertiesDialog *dialog)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
dialog->tree_view = tree_view = gtk_tree_view_new ();
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Name"),
renderer, "text",
COLUMN_NAME, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Value"),
@@ -138,7 +138,7 @@ tsh_properties_dialog_init (TshPropertiesDialog *dialog)
g_object_unref (model);
- g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
+ g_signal_connect (G_OBJECT (tree_view), "cursor-changed", G_CALLBACK (selection_changed), dialog);
gtk_container_add (GTK_CONTAINER (scroll_window), tree_view);
gtk_paned_pack1 (GTK_PANED(vpane), scroll_window, TRUE, FALSE);
@@ -237,22 +237,22 @@ tsh_properties_dialog_init (TshPropertiesDialog *dialog)
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vpane, TRUE, TRUE, 0);
gtk_widget_show (vpane);
- dialog->set = button = gtk_button_new_from_stock(GTK_STOCK_ADD);
+ dialog->set = button = gtk_button_new_with_mnemonic (_("_Add"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (set_clicked), dialog);
gtk_widget_show (button);
- dialog->delete = button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+ dialog->delete = button = gtk_button_new_with_mnemonic (_("_Remove"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, "");
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (delete_clicked), dialog);
gtk_widget_show (button);
gtk_window_set_title (GTK_WINDOW (dialog), _("Properties"));
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_hide (button);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
@@ -314,7 +314,7 @@ tsh_make_homogeneous (GtkWidget *first, ...)
va_end (ap);
}
-void
+void
tsh_properties_dialog_add (TshPropertiesDialog *dialog, const char *name, const char *value)
{
GtkTreeModel *model;
@@ -394,7 +394,7 @@ tsh_properties_dialog_get_selected_key (TshPropertiesDialog *dialog)
g_return_val_if_fail (TSH_IS_PROPERTIES_DIALOG (dialog), NULL);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->tree_view));
-
+
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gtk_tree_model_get (model, &iter, COLUMN_NAME, &name, -1);
@@ -453,7 +453,7 @@ selection_changed (GtkTreeView *tree_view, gpointer user_data)
TshPropertiesDialog *dialog = TSH_PROPERTIES_DIALOG (user_data);
selection = gtk_tree_view_get_selection (tree_view);
-
+
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
gint column;
@@ -473,7 +473,7 @@ selection_changed (GtkTreeView *tree_view, gpointer user_data)
g_free (text);
if (cmp)
continue;
-
+
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (dialog->combo_box), &iter);
found = TRUE;
@@ -500,10 +500,10 @@ static void
cancel_clicked (GtkButton *button, gpointer user_data)
{
TshPropertiesDialog *dialog = TSH_PROPERTIES_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->close);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
@@ -512,10 +512,10 @@ set_clicked (GtkButton *button, gpointer user_data)
{
GtkTreeModel *model;
TshPropertiesDialog *dialog = TSH_PROPERTIES_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->close);
gtk_widget_show (dialog->cancel);
-
+
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_clear (GTK_LIST_STORE (model));
@@ -527,13 +527,12 @@ delete_clicked (GtkButton *button, gpointer user_data)
{
GtkTreeModel *model;
TshPropertiesDialog *dialog = TSH_PROPERTIES_DIALOG (user_data);
-
+
gtk_widget_hide (dialog->close);
gtk_widget_show (dialog->cancel);
-
+
model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->tree_view));
gtk_list_store_clear (GTK_LIST_STORE (model));
g_signal_emit (dialog, signals[SIGNAL_DELETE], 0);
}
-
diff --git a/tvp-svn-helper/tsh-relocate-dialog.c b/tvp-svn-helper/tsh-relocate-dialog.c
index 3d3891b..524fb20 100644
--- a/tvp-svn-helper/tsh-relocate-dialog.c
+++ b/tvp-svn-helper/tsh-relocate-dialog.c
@@ -96,8 +96,8 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
dialog->from = gtk_entry_new();
dialog->filechooser_from = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
#else
dialog->from = gtk_file_chooser_entry_new(_("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);//tsh_file_chooser_entry_new ();
@@ -105,8 +105,7 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
#endif
#ifdef USE_FILE_ENTRY_REPLACEMENT
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
- GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button), image);
g_signal_connect(button, "clicked", G_CALLBACK(browse_callback_from), dialog);
@@ -116,7 +115,7 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
gtk_widget_show(dialog->from);
gtk_widget_show(button);
-
+
gtk_table_attach (GTK_TABLE (table), box,
1, 2, 0, 1,
GTK_EXPAND | GTK_FILL,
@@ -151,8 +150,8 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
dialog->to = gtk_entry_new();
dialog->filechooser_to = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
#else
dialog->to = gtk_file_chooser_entry_new(_("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);//tsh_file_chooser_entry_new ();
@@ -160,8 +159,7 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
#endif
#ifdef USE_FILE_ENTRY_REPLACEMENT
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
- GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button), image);
g_signal_connect(button, "clicked", G_CALLBACK(browse_callback_to), dialog);
@@ -171,7 +169,7 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
gtk_widget_show(dialog->to);
gtk_widget_show(button);
-
+
gtk_table_attach (GTK_TABLE (table), box,
1, 2, 1, 2,
GTK_EXPAND | GTK_FILL,
@@ -216,8 +214,8 @@ tsh_relocate_dialog_init (TshRelocateDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Relocate"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -384,4 +382,3 @@ browse_callback_to(GtkButton *button, TshRelocateDialog *dialog)
gtk_widget_hide(dialog->filechooser_to);
}
#endif
-
diff --git a/tvp-svn-helper/tsh-status-dialog.c b/tvp-svn-helper/tsh-status-dialog.c
index cab2395..c92e1a4 100644
--- a/tvp-svn-helper/tsh-status-dialog.c
+++ b/tvp-svn-helper/tsh-status-dialog.c
@@ -117,25 +117,25 @@ tsh_status_dialog_init (TshStatusDialog *dialog)
-1, _("Path"),
renderer, "text",
COLUMN_PATH, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("State"),
renderer, "text",
COLUMN_TEXT_STAT, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Prop state"),
renderer, "text",
COLUMN_PROP_STAT, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Repo state"),
renderer, "text",
COLUMN_REPO_TEXT_STAT, NULL);
-
+
renderer = gtk_cell_renderer_text_new ();
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, _("Repo prop state"),
@@ -247,17 +247,17 @@ tsh_status_dialog_init (TshStatusDialog *dialog)
gtk_button_box_set_layout(GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), GTK_BUTTONBOX_EDGE);
- dialog->cancel = button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ dialog->cancel = button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (cancel_clicked), dialog);
gtk_widget_show (button);
- dialog->refresh = button = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ dialog->refresh = button = gtk_button_new_with_mnemonic (_("_Refresh"));
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (refresh_clicked), dialog);
gtk_widget_hide (button);
- dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ dialog->close = button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Close"), GTK_RESPONSE_CLOSE);
gtk_widget_show (button);
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 400);
@@ -283,7 +283,7 @@ tsh_status_dialog_new (const gchar *title, GtkWindow *parent, GtkDialogFlags fla
return GTK_WIDGET(dialog);
}
-void
+void
tsh_status_dialog_add (TshStatusDialog *dialog, const char *file, const char *text, const char *prop, const char *repo_text, const char *repo_prop)
{
GtkTreeModel *model;
@@ -385,7 +385,7 @@ cancel_clicked (GtkButton *button, gpointer user_data)
gtk_widget_hide (dialog->cancel);
gtk_widget_show (dialog->refresh);
-
+
g_signal_emit (dialog, signals[SIGNAL_CANCEL], 0);
}
@@ -428,4 +428,3 @@ move_info (GtkTreeStore *store, GtkTreeIter *dest, GtkTreeIter *src)
g_free (repo_text);
g_free (repo_prop);
}
-
diff --git a/tvp-svn-helper/tsh-transfer-dialog.c b/tvp-svn-helper/tsh-transfer-dialog.c
index 013e267..921ada9 100644
--- a/tvp-svn-helper/tsh-transfer-dialog.c
+++ b/tvp-svn-helper/tsh-transfer-dialog.c
@@ -90,8 +90,8 @@ tsh_transfer_dialog_init (TshTransferDialog *dialog)
dialog->repository = gtk_entry_new();
dialog->filechooser = gtk_file_chooser_dialog_new(_("Select a folder"), GTK_WINDOW(dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
#else
dialog->repository = gtk_file_chooser_entry_new(_("Select a folder"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);//tsh_file_chooser_entry_new ();
@@ -99,8 +99,7 @@ tsh_transfer_dialog_init (TshTransferDialog *dialog)
#endif
#ifdef USE_FILE_ENTRY_REPLACEMENT
- image = gtk_image_new_from_stock (GTK_STOCK_OPEN,
- GTK_ICON_SIZE_MENU);
+ image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(button), image);
g_signal_connect(button, "clicked", G_CALLBACK(browse_callback), dialog);
@@ -110,7 +109,7 @@ tsh_transfer_dialog_init (TshTransferDialog *dialog)
gtk_widget_show(dialog->repository);
gtk_widget_show(button);
-
+
gtk_table_attach (GTK_TABLE (table), box,
1, 2, 0, 1,
GTK_EXPAND | GTK_FILL,
@@ -155,8 +154,8 @@ tsh_transfer_dialog_init (TshTransferDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Transfer"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -272,4 +271,3 @@ browse_callback(GtkButton *button, TshTransferDialog *dialog)
gtk_widget_hide(dialog->filechooser);
}
#endif
-
diff --git a/tvp-svn-helper/tsh-trust-dialog.c b/tvp-svn-helper/tsh-trust-dialog.c
index f79d1c8..ebb497a 100644
--- a/tvp-svn-helper/tsh-trust-dialog.c
+++ b/tvp-svn-helper/tsh-trust-dialog.c
@@ -79,8 +79,8 @@ tsh_trust_dialog_init (TshTrustDialog *dialog)
gtk_window_set_title (GTK_WINDOW (dialog), _("Trust"));
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("OK"), GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list