From 1bd2f978c6e98871f2f459786f6121e7ba61fef6 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Thu, 3 Dec 2009 19:47:47 +0100 Subject: [PATCH] Replace hildon-common-strings in gtk --- src/gtk/modest-platform.c | 20 +++++++++--------- src/hildon2/modest-platform.c | 20 +++++++++--------- src/modest-text-utils.c | 14 ++++++------- src/modest-text-utils.h | 38 ++++++++++++++++++++++++++++++++++ src/widgets/modest-msg-edit-window.c | 4 ++-- src/widgets/modest-msg-view-window.c | 12 +++++------ 6 files changed, 73 insertions(+), 35 deletions(-) diff --git a/src/gtk/modest-platform.c b/src/gtk/modest-platform.c index c91a977..848ceec 100644 --- a/src/gtk/modest-platform.c +++ b/src/gtk/modest-platform.c @@ -447,7 +447,7 @@ folder_chooser_dialog_run (ModestFolderView *original, scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); folder_view = modest_platform_create_folder_view (NULL); - gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder")); + gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM_CHANGE_FOLDER); modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), MODEST_FOLDER_VIEW (folder_view)); @@ -620,7 +620,7 @@ static gchar * get_next_folder_name (const gchar *suggested_name, TnyFolderStore *suggested_folder) { - const gchar *default_name = _FM("ckdg_va_new_folder_name_stub"); + const gchar *default_name = _FM_NEW_FOLDER_NAME_STUB; unsigned int i; gchar *real_suggested_name; @@ -635,7 +635,7 @@ get_next_folder_name (const gchar *suggested_name, real_suggested_name = g_strdup (default_name); else real_suggested_name = g_strdup_printf ("%s(%d)", - _FM("ckdg_va_new_folder_name_stub"), + _FM_NEW_FOLDER_NAME_STUB, i); exists = modest_tny_folder_has_subfolder_with_name (suggested_folder, real_suggested_name, @@ -768,7 +768,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, dialog = gtk_dialog_new_with_buttons (dialog_title, parent_window, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - _FM("ckdg_bd_new_folder_dialog_ok"), + _FM_NEW_FOLDER_DIALOG_OK, GTK_RESPONSE_ACCEPT, NULL); @@ -789,16 +789,16 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, if (suggested_name) gtk_entry_set_text (GTK_ENTRY (entry), suggested_name); else - gtk_entry_set_text (GTK_ENTRY (entry), _FM("ckdg_va_new_folder_name_stub")); + gtk_entry_set_text (GTK_ENTRY (entry), _FM_NEW_FOLDER_NAME_STUB); gtk_entry_set_width_chars (GTK_ENTRY (entry), MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1), - g_utf8_strlen (_FM("ckdg_va_new_folder_name_stub"), -1))); + g_utf8_strlen (_FM_NEW_FOLDER_NAME_STUB, -1))); gtk_entry_select_region (GTK_ENTRY (entry), 0, -1); } if (show_parent) { - label_location = gtk_label_new (_FM("ckdg_fi_new_folder_location")); + label_location = gtk_label_new (_FM_NEW_FOLDER_LOCATION); gtk_misc_set_alignment (GTK_MISC (label_location), 0.0, 0.5); gtk_size_group_add_widget (sizegroup, label_location); @@ -927,7 +927,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, result = modest_platform_run_folder_common_dialog (parent_window, suggested_folder, _HL_TITLE_NEW_FOLDER, - _FM("ckdg_fi_new_folder_name"), + _FM_NEW_FOLDER_NAME, real_suggested_name, TRUE, TRUE, @@ -2162,7 +2162,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, GTK_WINDOW (parent_window), GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - _FM ("ckdg_bd_change_folder_new_folder"), + _FM_CHANGE_FOLDER_NEW_FOLDER, MODEST_GTK_RESPONSE_NEW_FOLDER, NULL); @@ -2184,7 +2184,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, buttons_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF); back_button = gtk_button_new (); - back_pixbuf = modest_platform_get_icon (_FM("filemanager_folder_up"), MODEST_ICON_SIZE_BIG); + back_pixbuf = modest_platform_get_icon (_FM_FOLDER_UP, MODEST_ICON_SIZE_BIG); if (back_pixbuf) { gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf)); g_object_unref (back_pixbuf); diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index f1b1fb0..459b115 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -697,7 +697,7 @@ folder_chooser_dialog_run (ModestFolderView *original, scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ()); folder_view = modest_platform_create_folder_view (NULL); - gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM("ckdg_ti_change_folder")); + gtk_window_set_title (GTK_WINDOW (userdata.dialog), _FM_CHANGE_FOLDER("ckdg_ti_change_folder")); modest_folder_view_copy_model (MODEST_FOLDER_VIEW (original), MODEST_FOLDER_VIEW (folder_view)); @@ -870,7 +870,7 @@ static gchar * get_next_folder_name (const gchar *suggested_name, TnyFolderStore *suggested_folder) { - const gchar *default_name = _FM("ckdg_va_new_folder_name_stub"); + const gchar *default_name = _FM_NEW_FOLDER_NAME_STUB; unsigned int i; gchar *real_suggested_name; @@ -885,7 +885,7 @@ get_next_folder_name (const gchar *suggested_name, real_suggested_name = g_strdup (default_name); else real_suggested_name = g_strdup_printf ("%s(%d)", - _FM("ckdg_va_new_folder_name_stub"), + _FM_NEW_FOLDER_NAME_STUB, i); exists = modest_tny_folder_has_subfolder_with_name (suggested_folder, real_suggested_name, @@ -1019,7 +1019,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, dialog = gtk_dialog_new_with_buttons (dialog_title, parent_window, GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - _FM("ckdg_bd_new_folder_dialog_ok"), + _FM_NEW_FOLDER_DIALOG_OK, GTK_RESPONSE_ACCEPT, NULL); @@ -1040,16 +1040,16 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, if (suggested_name) gtk_entry_set_text (GTK_ENTRY (entry), suggested_name); else - gtk_entry_set_text (GTK_ENTRY (entry), _FM("ckdg_va_new_folder_name_stub")); + gtk_entry_set_text (GTK_ENTRY (entry), _FM_NEW_FOLDER_NAME_STUB); gtk_entry_set_width_chars (GTK_ENTRY (entry), MAX (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (entry)), -1), - g_utf8_strlen (_FM("ckdg_va_new_folder_name_stub"), -1))); + g_utf8_strlen (_FM_NEW_FOLDER_NAME_STUB, -1))); gtk_entry_select_region (GTK_ENTRY (entry), 0, -1); } if (show_parent) { - label_location = gtk_label_new (_FM("ckdg_fi_new_folder_location")); + label_location = gtk_label_new (_FM_NEW_FOLDER_LOCATION); gtk_misc_set_alignment (GTK_MISC (label_location), 0.0, 0.5); gtk_size_group_add_widget (sizegroup, label_location); @@ -1178,7 +1178,7 @@ modest_platform_run_new_folder_dialog (GtkWindow *parent_window, result = modest_platform_run_folder_common_dialog (parent_window, suggested_folder, _HL("ckdg_ti_new_folder"), - _FM("ckdg_fi_new_folder_name"), + _FM_NEW_FOLDER_NAME, real_suggested_name, TRUE, TRUE, @@ -3032,7 +3032,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, GTK_WINDOW (parent_window), GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT, - _FM ("ckdg_bd_change_folder_new_folder"), + _FM_CHANGE_FOLDER_NEW_FOLDER, MODEST_GTK_RESPONSE_NEW_FOLDER, NULL); @@ -3054,7 +3054,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, buttons_hbox = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF); back_button = gtk_button_new (); - back_pixbuf = modest_platform_get_icon (_FM("filemanager_folder_up"), MODEST_ICON_SIZE_BIG); + back_pixbuf = modest_platform_get_icon (_FM_FOLDER_UP, MODEST_ICON_SIZE_BIG); if (back_pixbuf) { gtk_button_set_image (GTK_BUTTON (back_button), gtk_image_new_from_pixbuf (back_pixbuf)); g_object_unref (back_pixbuf); diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 3128982..9f59f5e 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -1818,19 +1818,19 @@ modest_text_utils_get_display_size (guint64 size) const guint GB=1024 * MB; if (size == 0) - return g_strdup_printf (_FM("sfil_li_size_kb"), (int) 0); + return g_strdup_printf (_FM_SIZE_KB, (int) 0); if (0 <= size && size < KB) - return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) 1); + return g_strdup_printf (_FM_SIZE_1KB_99KB, (int) 1); else if (KB <= size && size < 100 * KB) - return g_strdup_printf (_FM("sfil_li_size_1kb_99kb"), (int) size / KB); + return g_strdup_printf (_FM_SIZE_1KB_99KB, (int) size / KB); else if (100*KB <= size && size < MB) - return g_strdup_printf (_FM("sfil_li_size_100kb_1mb"), (int) size / KB); + return g_strdup_printf (_FM_SIZE_100KB_1MB, (int) size / KB); else if (MB <= size && size < 10*MB) - return g_strdup_printf (_FM("sfil_li_size_1mb_10mb"), (float) size / MB); + return g_strdup_printf (_FM_SIZE_1MB_10MB, (float) size / MB); else if (10*MB <= size && size < GB) - return g_strdup_printf (_FM("sfil_li_size_10mb_1gb"), (float) size / MB); + return g_strdup_printf (_FM_SIZE_10MB_1GB, (float) size / MB); else - return g_strdup_printf (_FM("sfil_li_size_1gb_or_greater"), (float) size / GB); + return g_strdup_printf (_FM_SIZE_1GB_OR_GREATER, (float) size / GB); } static gchar * diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h index 6249e67..6448b89 100644 --- a/src/modest-text-utils.h +++ b/src/modest-text-utils.h @@ -89,6 +89,25 @@ #define _CS_FIND_REP_ENTER_TEXT _CS("ecdg_ib_find_rep_enter_text") #define _CS_UPDATING _CS("ckdg_pb_updating") #define _CS_SAVED _CS("sfil_ib_saved") + +#define _FM_CHANGE_FOLDER _FM("ckdg_ti_change_folder") +#define _FM_NEW_FOLDER_NAME_STUB _FM("ckdg_va_new_folder_name_stub") +#define _FM_NEW_FOLDER_DIALOG_OK _FM("ckdg_bd_new_folder_dialog_ok") +#define _FM_NEW_FOLDER_LOCATION _FM("ckdg_fi_new_folder_location") +#define _FM_NEW_FOLDER_NAME _FM("ckdg_fi_new_folder_name") +#define _FM_FOLDER_UP _FM("filemanager_folder_up") +#define _FM_SIZE_KB _FM("sfil_li_size_kb") +#define _FM_SIZE_1KB_99KB _FM("sfil_li_size_1kb_99kb") +#define _FM_SIZE_100KB_1MB _FM("sfil_li_size_100kb_1mb") +#define _FM_SIZE_1MB_10MB _FM("sfil_li_size_1mb_10mb") +#define _FM_SIZE_10MB_1GB _FM("sfil_li_size_10mb_1gb") +#define _FM_SIZE_1GB_OR_GREATER _FM("sfil_li_size_1gb_or_greater") +#define _FM_OPENING_NOT_ALLOWED _FM("sfil_ib_opening_not_allowed") +#define _FM_REPLACE_FILE _FM("docm_nc_replace_file") +#define _FM_REPLACE_MULTIPLE _FM("docm_nc_replace_multiple") +#define _FM_READ_ONLY_LOCATION _FM("sfil_ib_readonly_location") +#define _FM_SAVE_OBJECT_FILES _FM("sfil_ti_save_object_files") +#define _FM_CHANGE_FOLDER_NEW_FOLDER ("ckdg_bd_change_folder_new_folder") #else #define _HL_SAVE _("Save") #define _HL_YES _("Yes") @@ -133,6 +152,25 @@ #define _CS_FIND_REP_ENTER_TEXT _("Enter text to search") #define _CS_UPDATING _("Updating...") #define _CS_SAVED _("Saved") + +#define _FM_CHANGE_FOLDER _("Change folder") +#define _FM_NEW_FOLDER_NAME_STUB _("Folder") +#define _FM_NEW_FOLDER_DIALOG_OK _("Save") +#define _FM_NEW_FOLDER_LOCATION _("Location") +#define _FM_NEW_FOLDER_NAME _("Name") +#define _FM_FOLDER_UP "stock_up" +#define _FM_SIZE_KB _("%d KB") +#define _FM_SIZE_1KB_99KB _("%d KB") +#define _FM_SIZE_100KB_1MB _("%d KB") +#define _FM_SIZE_1MB_10MB _("%.2f MB") +#define _FM_SIZE_10MB_1GB _("%.1f MB") +#define _FM_SIZE_1GB_OR_GREATER _("%.2f GB") +#define _FM_OPENING_NOT_ALLOWED _("Opening not allowed") +#define _FM_REPLACE_FILE _("Replace the existing file with another with the same name?") +#define _FM_REPLACE_MULTIPLE _("Replace existing contents in folder with the same name?") +#define _FM_READ_ONLY_LOCATION _("Selected location is read only") +#define _FM_SAVE_OBJECT_FILES _("Save files") +#define _FM_CHANGE_FOLDER_NEW_FOLDER ("New folder") #endif /* Forbidden char arrays */ diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c index 726f69a..c5b521e 100644 --- a/src/widgets/modest-msg-edit-window.c +++ b/src/widgets/modest-msg-edit-window.c @@ -2420,7 +2420,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) if (stream == NULL) { modest_platform_information_banner (NULL, NULL, - _FM("sfil_ib_opening_not_allowed")); + _FM_OPENING_NOT_ALLOWED); g_free (filename); g_object_unref (mime_part); gnome_vfs_file_info_unref (info); @@ -2642,7 +2642,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, if (stream == NULL) { - modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); + modest_platform_information_banner (NULL, NULL, _FM_OPENING_NOT_ALLOWED); g_object_unref (mime_part); g_free (filename); diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c index 38456ee..e1cc928 100644 --- a/src/widgets/modest-msg-view-window.c +++ b/src/widgets/modest-msg-view-window.c @@ -3091,14 +3091,14 @@ save_mime_parts_to_file_with_checks (GtkWindow *parent, escaped_basename = g_uri_unescape_string (basename, NULL); message = g_strdup_printf ("%s\n%s", - _FM("docm_nc_replace_file"), + _FM_REPLACE_FILE, (escaped_basename) ? escaped_basename : ""); response = modest_platform_run_confirmation_dialog (parent, message); g_free (message); g_free (escaped_basename); } else { response = modest_platform_run_confirmation_dialog (parent, - _FM("docm_nc_replace_multiple")); + _FM_REPLACE_MULTIPLE); } if (response != GTK_RESPONSE_OK) is_ok = FALSE; @@ -3153,10 +3153,10 @@ save_attachments_response (GtkDialog *dialog, if (modest_maemo_utils_in_usb_mode ()) { err_msg = dgettext ("hildon-status-bar-usb", "usbh_ib_mmc_usb_connected"); } else { - err_msg = _FM("sfil_ib_readonly_location"); + err_msg = _FM_READ_ONLY_LOCATION; } #else - err_msg = _FM("sfil_ib_readonly_location"); + err_msg = _FM_READ_ONLY_LOCATION; #endif modest_platform_system_banner (NULL, NULL, err_msg); } else { @@ -3225,7 +3225,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, /* In Hildon 2.2 save and delete operate over all the attachments as there's no * selection available */ mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view)); - if (mime_parts && !modest_toolkit_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) { + if (mime_parts && !modest_toolkit_utils_select_attachments (GTK_WINDOW (gtk_widget_get_toplevel (window)), mime_parts, FALSE)) { g_object_unref (mime_parts); return; } @@ -3307,7 +3307,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, /* if multiple, set multiple string */ if (save_multiple_str) { g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL); - gtk_window_set_title (GTK_WINDOW (save_dialog), _FM("sfil_ti_save_objects_files")); + gtk_window_set_title (GTK_WINDOW (save_dialog), _FM_SAVE_OBJECT_FILES); g_free (save_multiple_str); } -- 1.7.9.5