[shotwell] Remove a portion of the Gtk.Stock symbols: Bug #719188
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Remove a portion of the Gtk.Stock symbols: Bug #719188
- Date: Tue, 17 Feb 2015 19:38:10 +0000 (UTC)
commit d031376722b68fc4d7289e7c300a400b31cb626a
Author: Wolfgang Steitz <wolfer7 web de>
Date: Tue Feb 17 11:36:13 2015 -0800
Remove a portion of the Gtk.Stock symbols: Bug #719188
src/AppWindow.vala | 2 +-
src/CollectionPage.vala | 2 +-
src/Dialogs.vala | 28 ++++++++++++++--------------
src/MediaPage.vala | 10 +++++-----
src/PhotoPage.vala | 16 ++++++++--------
src/Resources.vala | 20 ++++++++++++++++++++
src/SlideshowPage.vala | 4 ++--
src/camera/ImportPage.vala | 2 +-
src/direct/DirectPhotoPage.vala | 16 ++++++++--------
src/editing_tools/EditingTools.vala | 6 +++---
src/editing_tools/StraightenTool.vala | 2 +-
src/library/LibraryWindow.vala | 8 ++++----
src/library/OfflinePage.vala | 2 +-
src/library/TrashPage.vala | 4 ++--
src/searches/SavedSearchDialog.vala | 4 ++--
15 files changed, 73 insertions(+), 53 deletions(-)
---
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 08d2d0f..b694aae 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -518,7 +518,7 @@ public abstract class AppWindow : PageWindow {
fullscreen.label = _("Fulls_creen");
actions += fullscreen;
- Gtk.ActionEntry help_contents = { "CommonHelpContents", Gtk.Stock.HELP,
+ Gtk.ActionEntry help_contents = { "CommonHelpContents", Resources.HELP_LABEL,
TRANSLATABLE, "F1", TRANSLATABLE, on_help_contents };
help_contents.label = _("_Contents");
actions += help_contents;
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index b892b78..49f5d01 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -215,7 +215,7 @@ public abstract class CollectionPage : MediaPage {
adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
actions += adjust_date_time;
- Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE, "<Ctrl>Return",
+ Gtk.ActionEntry external_edit = { "ExternalEdit", Resources.EDIT_LABEL, TRANSLATABLE, "<Ctrl>Return",
TRANSLATABLE, on_external_edit };
external_edit.label = Resources.EXTERNAL_EDIT_MENU;
actions += external_edit;
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index d1d780d..9ece7aa 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -35,7 +35,7 @@ public bool confirm_warn_developer_changed(int number) {
"<span weight=\"bold\" size=\"larger\">%s</span>".printf(ngettext("Switching developers will undo
all changes you have made to this photo in Shotwell",
"Switching developers will undo all changes you have made to these photos in Shotwell", number)));
- dialog.add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
+ dialog.add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
dialog.add_buttons(_("_Switch Developer"), Gtk.ResponseType.YES);
int response = dialog.run();
@@ -58,7 +58,7 @@ public File? choose_file(string current_file_basename) {
_("Export Video") : _("Export Photo");
Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog(file_chooser_title,
- AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Gtk.Stock.CANCEL,
+ AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Resources.CANCEL_LABEL,
Gtk.ResponseType.CANCEL, Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT, null);
chooser.set_do_overwrite_confirmation(true);
chooser.set_current_folder(current_export_dir.get_path());
@@ -87,8 +87,8 @@ public File? choose_dir(string? user_title = null) {
user_title = _("Export Photos");
Gtk.FileChooserDialog chooser = new Gtk.FileChooserDialog(user_title,
- AppWindow.get_instance(), Gtk.FileChooserAction.SELECT_FOLDER, Gtk.Stock.CANCEL,
- Gtk.ResponseType.CANCEL, Gtk.Stock.OK, Gtk.ResponseType.ACCEPT, null);
+ AppWindow.get_instance(), Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL,
+ Gtk.ResponseType.CANCEL, Resources.OK_LABEL, Gtk.ResponseType.ACCEPT, null);
chooser.set_current_folder(current_export_dir.get_path());
chooser.set_local_only(false);
@@ -233,8 +233,8 @@ public class ExportDialog : Gtk.Dialog {
((Gtk.Box) get_content_area()).add(table);
// add buttons to action area
- add_button(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
- ok_button = add_button(Gtk.Stock.OK, Gtk.ResponseType.OK);
+ add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
+ ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
set_default_response(Gtk.ResponseType.OK);
ok_button.set_can_default(true);
@@ -851,7 +851,7 @@ public bool report_manifest(ImportManifest manifest, bool show_dest_id,
Gtk.Widget save_results_button = dialog.add_button(ImportUI.SAVE_RESULTS_BUTTON_NAME,
ImportUI.SAVE_RESULTS_RESPONSE_ID);
save_results_button.set_visible(manifest.success.size < manifest.all.size);
- Gtk.Widget ok_button = dialog.add_button(Gtk.Stock.OK, Gtk.ResponseType.OK);
+ Gtk.Widget ok_button = dialog.add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
dialog.set_default(ok_button);
Gtk.Window dialog_parent = (Gtk.Window) dialog.get_parent();
@@ -890,7 +890,7 @@ public bool report_manifest(ImportManifest manifest, bool show_dest_id,
internal void save_import_results(Gtk.Window? chooser_dialog_parent, string results_log) {
Gtk.FileChooserDialog chooser_dialog = new Gtk.FileChooserDialog(
ImportUI.SAVE_RESULTS_FILE_CHOOSER_TITLE, chooser_dialog_parent, Gtk.FileChooserAction.SAVE,
- Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT, null);
+ Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, Gtk.Stock.SAVE, Gtk.ResponseType.ACCEPT, null);
chooser_dialog.set_do_overwrite_confirmation(true);
chooser_dialog.set_current_folder(Environment.get_home_dir());
chooser_dialog.set_current_name("Shotwell Import Log.txt");
@@ -1217,7 +1217,7 @@ public class TextEntryDialog : Gtk.Dialog {
action_area_box = (Gtk.ButtonBox) get_action_area();
action_area_box.set_layout(Gtk.ButtonBoxStyle.END);
- button1 = (Gtk.Button) add_button(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
+ button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
button2 = (Gtk.Button) add_button(Gtk.Stock.SAVE, Gtk.ResponseType.OK);
set_default_response(Gtk.ResponseType.OK);
@@ -1289,7 +1289,7 @@ public class MultiTextEntryDialog : Gtk.Dialog {
action_area_box = (Gtk.ButtonBox) get_action_area();
action_area_box.set_layout(Gtk.ButtonBoxStyle.END);
- button1 = (Gtk.Button) add_button(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
+ button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
button2 = (Gtk.Button) add_button(Gtk.Stock.SAVE, Gtk.ResponseType.OK);
set_default_response(Gtk.ResponseType.OK);
@@ -1478,7 +1478,7 @@ public class ProgressDialog : Gtk.Window {
vbox_bar.pack_start(progress_bar, true, false, 0);
if (cancellable != null) {
- cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
cancel_button.clicked.connect(on_cancel);
delete_event.connect(on_window_closed);
}
@@ -1655,8 +1655,8 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
set_resizable(false);
set_transient_for(AppWindow.get_instance());
- add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
- Gtk.Stock.OK, Gtk.ResponseType.OK);
+ add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL,
+ Resources.OK_LABEL, Gtk.ResponseType.OK);
set_title(Resources.ADJUST_DATE_TIME_LABEL);
calendar = new Gtk.Calendar();
@@ -2072,7 +2072,7 @@ public class WelcomeDialog : Gtk.Dialog {
public WelcomeDialog(Gtk.Window owner) {
import_meta_host = new Spit.DataImports.WelcomeImportMetaHost(this);
bool show_system_pictures_import = is_system_pictures_import_possible();
- Gtk.Widget ok_button = add_button(Gtk.Stock.OK, Gtk.ResponseType.OK);
+ Gtk.Widget ok_button = add_button(Resources.OK_LABEL, Gtk.ResponseType.OK);
set_title(_("Welcome!"));
set_resizable(false);
set_type_hint(Gdk.WindowTypeHint.DIALOG);
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index b3e7e13..6a9b873 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -302,7 +302,7 @@ public abstract class MediaPage : CheckerboardPage {
send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
actions += send_to_context_menu;
- Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
+ Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE,
"<Shift>Delete", TRANSLATABLE, on_remove_from_library };
remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
actions += remove_from_library;
@@ -334,13 +334,13 @@ public abstract class MediaPage : CheckerboardPage {
modify_tags.label = Resources.MODIFY_TAGS_MENU;
actions += modify_tags;
- Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
+ Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
"<Ctrl>plus", TRANSLATABLE, on_increase_size };
increase_size.label = _("Zoom _In");
increase_size.tooltip = _("Increase the magnification of the thumbnails");
actions += increase_size;
- Gtk.ActionEntry decrease_size = { "DecreaseSize", Gtk.Stock.ZOOM_OUT, TRANSLATABLE,
+ Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
"<Ctrl>minus", TRANSLATABLE, on_decrease_size };
decrease_size.label = _("Zoom _Out");
decrease_size.tooltip = _("Decrease the magnification of the thumbnails");
@@ -503,13 +503,13 @@ public abstract class MediaPage : CheckerboardPage {
// Sort order.
Gtk.RadioActionEntry[] sort_order_actions = new Gtk.RadioActionEntry[0];
- Gtk.RadioActionEntry ascending = { "SortAscending", Gtk.Stock.SORT_ASCENDING,
+ Gtk.RadioActionEntry ascending = { "SortAscending", Resources.SORT_ASCENDING_LABEL,
TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_ASCENDING };
ascending.label = _("_Ascending");
ascending.tooltip = _("Sort photos in an ascending order");
sort_order_actions += ascending;
- Gtk.RadioActionEntry descending = { "SortDescending", Gtk.Stock.SORT_DESCENDING,
+ Gtk.RadioActionEntry descending = { "SortDescending", Resources.SORT_DESCENDING_LABEL,
TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_DESCENDING };
descending.label = _("D_escending");
descending.tooltip = _("Sort photos in a descending order");
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index e8478f9..c026ec0 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -2397,7 +2397,7 @@ public class LibraryPhotoPage : EditingHostPage {
publish.tooltip = Resources.PUBLISH_TOOLTIP;
actions += publish;
- Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE,
+ Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE,
"<Shift>Delete", TRANSLATABLE, on_remove_from_library };
remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
actions += remove_from_library;
@@ -2415,13 +2415,13 @@ public class LibraryPhotoPage : EditingHostPage {
tools.label = _("T_ools");
actions += tools;
- Gtk.ActionEntry prev = { "PrevPhoto", Gtk.Stock.GO_BACK, TRANSLATABLE, null,
+ Gtk.ActionEntry prev = { "PrevPhoto", Resources.PREVIOUS_LABEL, TRANSLATABLE, null,
TRANSLATABLE, on_previous_photo };
prev.label = _("_Previous Photo");
prev.tooltip = _("Previous Photo");
actions += prev;
- Gtk.ActionEntry next = { "NextPhoto", Gtk.Stock.GO_FORWARD, TRANSLATABLE, null,
+ Gtk.ActionEntry next = { "NextPhoto", Resources.NEXT_LABEL, TRANSLATABLE, null,
TRANSLATABLE, on_next_photo };
next.label = _("_Next Photo");
next.tooltip = _("Next Photo");
@@ -2511,7 +2511,7 @@ public class LibraryPhotoPage : EditingHostPage {
adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
actions += adjust_date_time;
- Gtk.ActionEntry external_edit = { "ExternalEdit", Gtk.Stock.EDIT, TRANSLATABLE,
+ Gtk.ActionEntry external_edit = { "ExternalEdit", Resources.EDIT_LABEL, TRANSLATABLE,
"<Ctrl>Return", TRANSLATABLE, on_external_edit };
external_edit.label = Resources.EXTERNAL_EDIT_MENU;
actions += external_edit;
@@ -2585,25 +2585,25 @@ public class LibraryPhotoPage : EditingHostPage {
rate_five.label = Resources.rating_menu(Rating.FIVE);
actions += rate_five;
- Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
+ Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
"<Ctrl>plus", TRANSLATABLE, on_increase_size };
increase_size.label = _("Zoom _In");
increase_size.tooltip = _("Increase the magnification of the photo");
actions += increase_size;
- Gtk.ActionEntry decrease_size = { "DecreaseSize", Gtk.Stock.ZOOM_OUT, TRANSLATABLE,
+ Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
"<Ctrl>minus", TRANSLATABLE, on_decrease_size };
decrease_size.label = _("Zoom _Out");
decrease_size.tooltip = _("Decrease the magnification of the photo");
actions += decrease_size;
- Gtk.ActionEntry best_fit = { "ZoomFit", Gtk.Stock.ZOOM_FIT, TRANSLATABLE,
+ Gtk.ActionEntry best_fit = { "ZoomFit", Resources.ZOOM_FIT_LABEL, TRANSLATABLE,
"<Ctrl>0", TRANSLATABLE, snap_zoom_to_min };
best_fit.label = _("Fit to _Page");
best_fit.tooltip = _("Zoom the photo to fit on the screen");
actions += best_fit;
- Gtk.ActionEntry actual_size = { "Zoom100", Gtk.Stock.ZOOM_100, TRANSLATABLE,
+ Gtk.ActionEntry actual_size = { "Zoom100", Resources.ZOOM_100_LABEL, TRANSLATABLE,
"<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
/// xgettext:no-c-format
actual_size.label = _("Zoom _100%");
diff --git a/src/Resources.vala b/src/Resources.vala
index 954a0ab..5176119 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -82,6 +82,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
public const string PUBLISH = "applications-internet";
public const string MERGE = "shotwell-merge-events";
+
+ public const string GO_NEXT = "go-next";
+ public const string GO_PREVIOUS = "go-previous";
public const string ICON_APP = "shotwell.svg";
public const string ICON_APP16 = "shotwell-16.svg";
@@ -155,6 +158,23 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string VFLIP_MENU = _("Flip Verti_cally");
public const string VFLIP_LABEL = _("Flip Vertically");
+ public const string CANCEL_LABEL = _("_Cancel");
+ public const string DELETE_LABEL = _("_Delete");
+ public const string EDIT_LABEL = _("_Edit");
+ public const string FORWARD_LABEL = _("_Forward");
+ public const string HELP_LABEL = _("_Help");
+ public const string NEXT_LABEL = _("_Next");
+ public const string OK_LABEL = _("_OK");
+ public const string PREVIOUS_LABEL = _("_Previous");
+ public const string REMOVE_LABEL = _("_Remove");
+ public const string SORT_ASCENDING_LABEL = _("Sort _Ascending");
+ public const string SORT_DESCENDING_LABEL = _("Sort _Descending");
+ public const string UNDELETE_LABEL = _("_Undelete");
+ public const string ZOOM_100_LABEL = _("_Normal Size");
+ public const string ZOOM_FIT_LABEL = _("Best _Fit");
+ public const string ZOOM_IN_LABEL = _("Zoom _In");
+ public const string ZOOM_OUT_LABEL = _("Zoom _Out");
+
public const string ENHANCE_MENU = _("_Enhance");
public const string ENHANCE_LABEL = _("Enhance");
public const string ENHANCE_TOOLTIP = _("Automatically improve the photo's appearance");
diff --git a/src/SlideshowPage.vala b/src/SlideshowPage.vala
index 98cd56f..131c413 100644
--- a/src/SlideshowPage.vala
+++ b/src/SlideshowPage.vala
@@ -44,8 +44,8 @@ class SlideshowPage : SinglePhotoPage {
set_modal(true);
set_transient_for(AppWindow.get_fullscreen());
- add_buttons(Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
- Gtk.Stock.OK, Gtk.ResponseType.OK);
+ add_buttons(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL,
+ Resources.OK_LABEL, Gtk.ResponseType.OK);
set_title(_("Settings"));
Gtk.Adjustment adjustment = new Gtk.Adjustment(delay, Config.Facade.SLIDESHOW_DELAY_MIN,
Config.Facade.SLIDESHOW_DELAY_MAX, 0.1, 1, 0);
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 7454b5a..4a2dcd2 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1736,7 +1736,7 @@ public class ImportPage : CheckerboardPage {
photos_string, videos_string, both_string, neither_string);
ImportUI.QuestionParams question = new ImportUI.QuestionParams(
- question_string, Gtk.Stock.DELETE, _("_Keep"));
+ question_string, Resources.DELETE_LABEL, _("_Keep"));
if (!ImportUI.report_manifest(manifest, false, question))
return;
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 3b6cefe..24fd913 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -81,13 +81,13 @@ public class DirectPhotoPage : EditingHostPage {
tools.label = _("T_ools");
actions += tools;
- Gtk.ActionEntry prev = { "PrevPhoto", Gtk.Stock.GO_BACK, TRANSLATABLE, null,
+ Gtk.ActionEntry prev = { "PrevPhoto", Resources.PREVIOUS_LABEL, TRANSLATABLE, null,
TRANSLATABLE, on_previous_photo };
prev.label = _("_Previous Photo");
prev.tooltip = _("Previous Photo");
actions += prev;
- Gtk.ActionEntry next = { "NextPhoto", Gtk.Stock.GO_FORWARD, TRANSLATABLE, null,
+ Gtk.ActionEntry next = { "NextPhoto", Resources.NEXT_LABEL, TRANSLATABLE, null,
TRANSLATABLE, on_next_photo };
next.label = _("_Next Photo");
next.tooltip = _("Next Photo");
@@ -169,25 +169,25 @@ public class DirectPhotoPage : EditingHostPage {
help.label = _("_Help");
actions += help;
- Gtk.ActionEntry increase_size = { "IncreaseSize", Gtk.Stock.ZOOM_IN, TRANSLATABLE,
+ Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
"<Ctrl>plus", TRANSLATABLE, on_increase_size };
increase_size.label = _("Zoom _In");
increase_size.tooltip = _("Increase the magnification of the photo");
actions += increase_size;
- Gtk.ActionEntry decrease_size = { "DecreaseSize", Gtk.Stock.ZOOM_OUT, TRANSLATABLE,
+ Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
"<Ctrl>minus", TRANSLATABLE, on_decrease_size };
decrease_size.label = _("Zoom _Out");
decrease_size.tooltip = _("Decrease the magnification of the photo");
actions += decrease_size;
- Gtk.ActionEntry best_fit = { "ZoomFit", Gtk.Stock.ZOOM_FIT, TRANSLATABLE,
+ Gtk.ActionEntry best_fit = { "ZoomFit", Resources.ZOOM_FIT_LABEL, TRANSLATABLE,
"<Ctrl>0", TRANSLATABLE, snap_zoom_to_min };
best_fit.label = _("Fit to _Page");
best_fit.tooltip = _("Zoom the photo to fit on the screen");
actions += best_fit;
- Gtk.ActionEntry actual_size = { "Zoom100", Gtk.Stock.ZOOM_100, TRANSLATABLE,
+ Gtk.ActionEntry actual_size = { "Zoom100", Resources.ZOOM_100_LABEL, TRANSLATABLE,
"<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
/// xgettext:no-c-format
actual_size.label = _("Zoom _100%");
@@ -506,8 +506,8 @@ public class DirectPhotoPage : EditingHostPage {
}
Gtk.FileChooserDialog save_as_dialog = new Gtk.FileChooserDialog(_("Save As"),
- AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Gtk.Stock.CANCEL,
- Gtk.ResponseType.CANCEL, Gtk.Stock.OK, Gtk.ResponseType.OK);
+ AppWindow.get_instance(), Gtk.FileChooserAction.SAVE, Resources.CANCEL_LABEL,
+ Gtk.ResponseType.CANCEL, Resources.OK_LABEL, Gtk.ResponseType.OK);
save_as_dialog.set_select_multiple(false);
save_as_dialog.set_current_name(filename);
save_as_dialog.set_current_folder(current_save_dir.get_path());
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index 0ee312a..b499960 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -647,7 +647,7 @@ public class CropTool : EditingTool {
private const int CONTROL_SPACING = 8;
public Gtk.Button ok_button = new Gtk.Button.with_label(Resources.CROP_LABEL);
- public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public Gtk.ComboBox constraint_combo;
public Gtk.Button pivot_reticle_button = new Gtk.Button();
public Gtk.Entry custom_width_entry = new Gtk.Entry();
@@ -2240,9 +2240,9 @@ public class AdjustTool : EditingTool {
HighlightDetailTransformation.MIN_PARAMETER, HighlightDetailTransformation.MAX_PARAMETER,
1.0);
- public Gtk.Button ok_button = new Gtk.Button.from_stock(Gtk.Stock.OK);
+ public Gtk.Button ok_button = new Gtk.Button.with_mnemonic(Resources.OK_LABEL);
public Gtk.Button reset_button = new Gtk.Button.with_mnemonic(_("_Reset"));
- public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public RGBHistogramManipulator histogram_manipulator = new RGBHistogramManipulator();
public AdjustToolWindow(Gtk.Window container) {
diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index c60b0a2..e2b117e 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -98,7 +98,7 @@ public class StraightenTool : EditingTool {
public Gtk.Label angle_label = new Gtk.Label("");
public Gtk.Label description_label = new Gtk.Label(_("Angle:"));
public Gtk.Button ok_button = new Gtk.Button.with_mnemonic(_("_Straighten"));
- public Gtk.Button cancel_button = new Gtk.Button.from_stock(Gtk.Stock.CANCEL);
+ public Gtk.Button cancel_button = new Gtk.Button.with_mnemonic(Resources.CANCEL_LABEL);
public Gtk.Button reset_button = new Gtk.Button.with_mnemonic(_("_Reset"));
/**
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 1ba819c..bed8940 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -417,14 +417,14 @@ public class LibraryWindow : AppWindow {
Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0];
Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending",
- Gtk.Stock.SORT_ASCENDING, TRANSLATABLE, null, TRANSLATABLE,
+ Resources.SORT_ASCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
SORT_EVENTS_ORDER_ASCENDING };
ascending.label = _("_Ascending");
ascending.tooltip = _("Sort photos in an ascending order");
actions += ascending;
Gtk.RadioActionEntry descending = { "CommonSortEventsDescending",
- Gtk.Stock.SORT_DESCENDING, TRANSLATABLE, null, TRANSLATABLE,
+ Resources.SORT_DESCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
SORT_EVENTS_ORDER_DESCENDING };
descending.label = _("D_escending");
descending.tooltip = _("Sort photos in a descending order");
@@ -666,8 +666,8 @@ public class LibraryWindow : AppWindow {
private void on_file_import() {
Gtk.FileChooserDialog import_dialog = new Gtk.FileChooserDialog(_("Import From Folder"), null,
- Gtk.FileChooserAction.SELECT_FOLDER, Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
- Gtk.Stock.OK, Gtk.ResponseType.OK);
+ Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL,
+ Resources.OK_LABEL, Gtk.ResponseType.OK);
import_dialog.set_local_only(false);
import_dialog.set_select_multiple(true);
import_dialog.set_current_folder(import_dir);
diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala
index dad5e20..eecd71b 100644
--- a/src/library/OfflinePage.vala
+++ b/src/library/OfflinePage.vala
@@ -55,7 +55,7 @@ public class OfflinePage : CheckerboardPage {
protected override Gtk.ActionEntry[] init_collect_action_entries() {
Gtk.ActionEntry[] actions = base.init_collect_action_entries();
- Gtk.ActionEntry remove = { "RemoveFromLibrary", Gtk.Stock.REMOVE, TRANSLATABLE, "Delete",
+ Gtk.ActionEntry remove = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE, "Delete",
TRANSLATABLE, on_remove_from_library };
remove.label = Resources.REMOVE_FROM_LIBRARY_MENU;
remove.tooltip = Resources.DELETE_FROM_LIBRARY_TOOLTIP;
diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala
index 4b981eb..ae80a7b 100644
--- a/src/library/TrashPage.vala
+++ b/src/library/TrashPage.vala
@@ -50,13 +50,13 @@ public class TrashPage : CheckerboardPage {
protected override Gtk.ActionEntry[] init_collect_action_entries() {
Gtk.ActionEntry[] actions = base.init_collect_action_entries();
- Gtk.ActionEntry delete_action = { "Delete", Gtk.Stock.DELETE, TRANSLATABLE, "Delete",
+ Gtk.ActionEntry delete_action = { "Delete", Resources.DELETE_LABEL, TRANSLATABLE, "Delete",
TRANSLATABLE, on_delete };
delete_action.label = Resources.DELETE_PHOTOS_MENU;
delete_action.tooltip = Resources.DELETE_FROM_TRASH_TOOLTIP;
actions += delete_action;
- Gtk.ActionEntry restore = { "Restore", Gtk.Stock.UNDELETE, TRANSLATABLE, null, TRANSLATABLE,
+ Gtk.ActionEntry restore = { "Restore", Resources.UNDELETE_LABEL, TRANSLATABLE, null, TRANSLATABLE,
on_restore };
restore.label = Resources.RESTORE_PHOTOS_MENU;
restore.tooltip = Resources.RESTORE_PHOTOS_TOOLTIP;
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index 64e9b24..83e175b 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -607,8 +607,8 @@ public class SavedSearchDialog {
int orig_month = cal.month;
int orig_year = cal.year;
Gtk.Dialog d = new Gtk.Dialog.with_buttons(null, null,
- Gtk.DialogFlags.MODAL, Gtk.Stock.CANCEL, Gtk.ResponseType.REJECT,
- Gtk.Stock.OK, Gtk.ResponseType.ACCEPT);
+ Gtk.DialogFlags.MODAL, Resources.CANCEL_LABEL, Gtk.ResponseType.REJECT,
+ Resources.OK_LABEL, Gtk.ResponseType.ACCEPT);
d.set_modal(true);
d.set_resizable(false);
d.set_decorated(false);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
