#include <modest-platform.h>
#include <modest-defs.h>
+#include <modest-scrollable.h>
#include <modest-runtime.h>
-#include <modest-main-window.h>
#include <modest-header-view.h>
#include "modest-hildon2-global-settings-dialog.h"
#include "modest-widget-memory.h"
#include <modest-maemo-utils.h>
#include <modest-utils.h>
#include <dbus_api/modest-dbus-callbacks.h>
-#include <modest-osso-autosave-callbacks.h>
#include <libosso.h>
#include <tny-maemo-conic-device.h>
#include <tny-camel-folder.h>
#include <hildon/hildon.h>
#include <osso-mem.h>
#include "hildon2/modest-hildon2-details-dialog.h"
-#include "hildon2/modest-hildon2-window-mgr.h"
+#include "widgets/modest-window-mgr.h"
+#include "widgets/modest-msg-view-window.h"
#ifdef MODEST_USE_PROFILE
-#include <keys_nokia.h>
-#include <libprofile.h>
+#include <profiled/keys_nokia.h>
+#include <profiled/libprofile.h>
#endif
#include <canberra.h>
#include <modest-datetime-formatter.h>
static gboolean
check_required_files (void)
{
- FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE, NULL);
+ FILE *mcc_file = modest_utils_open_mcc_mapping_file ();
+
if (!mcc_file) {
g_printerr ("modest: check for mcc file (for LANG) failed\n");
return FALSE;
- } else
- fclose (mcc_file);
-
- mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
- if (!mcc_file) {
- g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
- return FALSE;
- } else
+ } else {
fclose (mcc_file);
-
+ }
+
if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 &&
access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) {
g_printerr ("modest: cannot find providers data\n");
return FALSE;
}
-
+
return TRUE;
}
hw_state.shutdown_ind = TRUE;
osso_hw_set_event_cb(osso_context, NULL, NULL, NULL);
- /* Register osso auto-save callbacks: */
- result = osso_application_set_autosave_cb (osso_context,
- modest_on_osso_application_autosave, NULL /* user_data */);
- if (result != OSSO_OK) {
- g_printerr ("modest: osso_application_set_autosave_cb() failed.\n");
- return FALSE;
- }
-
-
/* Make sure that the update interval is changed whenever its gconf key
* is changed */
/* CAUTION: we're not using here the
HildonURIAction *action;
gboolean result = FALSE;
GSList *actions, *iter = NULL;
-
+
g_return_val_if_fail (uri, FALSE);
if (!uri)
return FALSE;
/* don't try to activate file: uri's -- they might confuse the user,
* and/or might have security implications */
if (!g_str_has_prefix (uri, "file:")) {
-
+
actions = hildon_uri_get_actions_by_uri (uri, -1, NULL);
-
+
for (iter = actions; iter; iter = g_slist_next (iter)) {
action = (HildonURIAction*) iter->data;
if (action && strcmp (hildon_uri_action_get_service (action),
break;
}
}
-
+
/* if we could not open it with email, try something else */
if (!result)
- result = checked_hildon_uri_open (uri, NULL);
- }
-
+ result = checked_hildon_uri_open (uri, NULL);
+ }
+
if (!result) {
ModestWindow *parent =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
_("mcen_ib_unsupported_link"));
g_debug ("%s: cannot open uri '%s'", __FUNCTION__,uri);
- }
-
+ }
+
return result;
}
uri = popup_info->uri + strlen ("mailto:");
gtk_clipboard_set_text (clipboard, uri, strlen (uri));
- modest_platform_information_banner (NULL, NULL, _CS("ecoc_ib_edwin_copied"));
+ modest_platform_information_banner (NULL, NULL, _CS_COPIED);
return; /* we're done */
}
if (strcmp (action_name, hildon_uri_action_get_name (action))==0) {
if (!checked_hildon_uri_open (popup_info->uri, action)) {
ModestWindow *parent =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL,
_("mcen_ib_unsupported_link"));
}
/* Show WID-INF036 */
if (chars_length >= 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
} else {
if (modest_text_utils_is_forbidden_char (*text, FOLDER_NAME_FORBIDDEN_CHARS)) {
/* Show an error */
tmp = g_strndup (folder_name_forbidden_chars,
FOLDER_NAME_FORBIDDEN_CHARS_LENGTH);
- msg = g_strdup_printf (_CS("ckdg_ib_illegal_characters_entered"), tmp);
+ msg = g_strdup_printf (_CS_ILLEGAL_CHARACTERS_ENTERED, tmp);
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)),
NULL, msg);
g_free (msg);
} else {
if (length >= 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (data)), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
}
/* Write the text in the entry if it's valid */
g_signal_handlers_block_by_func (editable,
if (g_utf8_strlen (chars,-1) >= 20) {
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (user_data)), NULL,
- _CS("ckdg_ib_maximum_characters_reached"));
+ _CS_MAXIMUM_CHARACTERS_REACHED);
}
gtk_widget_set_sensitive (ok_button, modest_text_utils_validate_folder_name(chars));
if (exists) {
/* Show an error */
hildon_banner_show_information (gtk_widget_get_parent (GTK_WIDGET (dialog)),
- NULL, _CS("ckdg_ib_folder_already_exists"));
+ NULL, _CS_FOLDER_ALREADY_EXISTS);
/* Select the text */
- gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
+ gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
gtk_widget_grab_focus (entry);
/* Do not close the dialog */
g_signal_stop_emission_by_name (dialog, "response");
{
GtkWidget *folder_view;
FolderChooserData userdata = {NULL, NULL};
- GtkWidget *pannable;
+ GtkWidget *scrollable;
const gchar *visible_id = NULL;
userdata.dialog = gtk_dialog_new ();
- pannable = hildon_pannable_area_new ();
+ 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));
modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW(folder_view),
visible_id);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), pannable);
- gtk_container_add (GTK_CONTAINER (pannable), folder_view);
- gtk_widget_set_size_request (pannable, -1, 320);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (userdata.dialog)->vbox), scrollable);
+ gtk_container_add (GTK_CONTAINER (scrollable), folder_view);
+ gtk_widget_set_size_request (scrollable, -1, 320);
gtk_widget_show (folder_view);
- gtk_widget_show (pannable);
+ gtk_widget_show (scrollable);
gtk_widget_show (userdata.dialog);
g_signal_connect (G_OBJECT (folder_view), "folder-activated",
G_CALLBACK (folder_chooser_activated),
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;
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,
GtkSizeGroup *sizegroup;
ModestFolderView *folder_view;
ModestWindow *folder_window;
- ModestHildon2WindowMgr *window_mgr;
+ ModestWindowMgr *window_mgr;
FolderPickerHelper *helper = NULL;
GtkWidget *top_vbox, *top_align;
- window_mgr = (ModestHildon2WindowMgr *) modest_runtime_get_window_mgr ();
- folder_window = modest_hildon2_window_mgr_get_folder_window (window_mgr);
+ window_mgr = modest_runtime_get_window_mgr ();
+ folder_window = modest_window_mgr_get_folder_window (window_mgr);
g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window), GTK_RESPONSE_NONE);
folder_view = modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (folder_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);
if (show_name) {
label_entry = gtk_label_new (label_text);
- entry = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ entry = modest_toolkit_factory_create_entry (modest_runtime_get_toolkit_factory ());
gtk_entry_set_max_length (GTK_ENTRY (entry), 20);
gtk_misc_set_alignment (GTK_MISC (label_entry), 0.0, 0.5);
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)));
- gtk_entry_select_region (GTK_ENTRY (entry), 0, -1);
+ g_utf8_strlen (_FM_NEW_FOLDER_NAME_STUB, -1)));
+ gtk_editable_select_region (GTK_EDITABLE (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);
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,
}
gint
-modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
TnyFolderStore *parent_folder,
const gchar *suggested_name,
gchar **folder_name)
{
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent_folder), GTK_RESPONSE_REJECT);
- return modest_platform_run_folder_common_dialog (parent_window,
+ return modest_platform_run_folder_common_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) parent_window),
parent_folder,
_HL("ckdg_ti_rename_folder"),
_HL("ckdg_fi_rename_name"),
modest_platform_on_new_headers_received (GList *URI_list,
gboolean show_visual)
{
+ /* Check if the user wants to show notifications or not */
+ if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATIONS, NULL))
+ return;
+
if (g_list_length (URI_list) == 0)
return;
/***************/
typedef struct {
- GtkWindow *parent_window;
+ ModestWindow *parent_window;
ModestConnectedPerformer callback;
TnyAccount *account;
gpointer user_data;
}
void
-modest_platform_connect_and_perform (GtkWindow *parent_window,
+modest_platform_connect_and_perform (ModestWindow *parent_window,
gboolean force,
TnyAccount *account,
ModestConnectedPerformer callback,
info->account = NULL;
if (parent_window)
- info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+ info->parent_window = (ModestWindow *) g_object_ref (parent_window);
else
info->parent_window = NULL;
info->user_data = user_data;
info->account = TNY_ACCOUNT (g_object_ref (account));
if (parent_window)
- info->parent_window = (GtkWindow *) g_object_ref (parent_window);
+ info->parent_window = (ModestWindow *) g_object_ref (parent_window);
else
info->parent_window = NULL;
}
void
-modest_platform_connect_if_remote_and_perform (GtkWindow *parent_window,
+modest_platform_connect_if_remote_and_perform (ModestWindow *parent_window,
gboolean force,
TnyFolderStore *folder_store,
ModestConnectedPerformer callback,
static void
src_account_connect_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
+ ModestWindow *parent_window,
TnyAccount *src_account,
gpointer user_data)
{
}
-void
-modest_platform_double_connect_and_perform (GtkWindow *parent_window,
+void
+modest_platform_double_connect_and_perform (ModestWindow *parent_window,
gboolean force,
TnyFolderStore *folder_store,
DoubleConnectionInfo *connect_info)
{
- modest_platform_connect_if_remote_and_perform(parent_window,
+ modest_platform_connect_if_remote_and_perform(parent_window,
force,
folder_store,
src_account_connect_performer,
GtkWidget *dialog;
/* Create dialog */
- dialog = modest_hildon2_details_dialog_new_with_folder (parent_window, folder);
+ dialog = modest_toolkit_factory_create_details_dialog_with_folder (modest_runtime_get_toolkit_factory (),
+ parent_window, folder);
/* Run dialog */
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
GtkWidget *dialog;
/* Create dialog */
- dialog = modest_hildon2_details_dialog_new_with_header (parent_window, header, !async_get_size);
+ dialog = modest_toolkit_factory_create_details_dialog_with_header (modest_runtime_get_toolkit_factory (),
+ parent_window, header, !async_get_size);
if (async_get_size && msg && TNY_IS_MSG (msg)) {
HeaderDetailsGetSizeInfo *info;
#define MOVE_TO_DIALOG_BACK_BUTTON "back-button"
#define MOVE_TO_DIALOG_ACTION_BUTTON "action-button"
#define MOVE_TO_DIALOG_SHOWING_FOLDERS "showing-folders"
-#define MOVE_TO_DIALOG_PANNABLE "pannable"
+#define MOVE_TO_DIALOG_SCROLLABLE "scrollable"
#define MOVE_TO_FOLDER_SEPARATOR "/"
static void
{
GtkWidget *back_button;
GtkWidget *folder_view;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
GtkWidget *action_button;
back_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON));
action_button = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
folder_view = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
- pannable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+ scrollable = GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE));
gtk_widget_set_sensitive (back_button, FALSE);
gtk_widget_set_sensitive (action_button, FALSE);
MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view),
MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
- hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+ modest_scrollable_jump_to (MODEST_SCROLLABLE (scrollable), 0, 0);
}
static void
GtkWidget *folder_view;
TnyAccount *account;
const gchar *account_id;
- GtkWidget *pannable;
+ GtkWidget *scrollable;
GtkWidget *action_button;
back_button =
GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON));
folder_view =
GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW));
- pannable =
- GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE));
+ scrollable =
+ GTK_WIDGET (g_object_get_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE));
gtk_widget_set_sensitive (back_button, TRUE);
gtk_widget_set_sensitive (action_button, TRUE);
modest_folder_view_set_style (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
modest_folder_view_set_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (folder_view), MODEST_FOLDER_VIEW_FILTER_HIDE_FOLDERS);
- hildon_pannable_area_jump_to (HILDON_PANNABLE_AREA (pannable), 0, 0);
+ modest_scrollable_jump_to (MODEST_SCROLLABLE (scrollable), 0, 0);
}
static void
GTK_WINDOW (parent_window),
GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR |
GTK_DIALOG_DESTROY_WITH_PARENT,
- _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER,
+ _FM_CHANGE_FOLDER_NEW_FOLDER,
+ MODEST_GTK_RESPONSE_NEW_FOLDER,
NULL);
align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
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);
gtk_widget_set_sensitive (GTK_WIDGET (action_button), FALSE);
gtk_box_pack_start (GTK_BOX (top_vbox), buttons_hbox, FALSE, FALSE, 0);
- /* Create pannable and add it to the dialog */
- folder_view_container = hildon_pannable_area_new ();
+ /* Create scrollable and add it to the dialog */
+ folder_view_container = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
gtk_container_add (GTK_CONTAINER (folder_view_container), *folder_view);
gtk_box_pack_start (GTK_BOX (top_vbox), folder_view_container, TRUE, TRUE, 0);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_FOLDER_VIEW, *folder_view);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_BACK_BUTTON, back_button);
g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_ACTION_BUTTON, action_button);
- g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_PANNABLE, folder_view_container);
+ g_object_set_data (G_OBJECT (dialog), MOVE_TO_DIALOG_SCROLLABLE, folder_view_container);
/* Simulate the behaviour of a HildonPickerDialog by emitting
a response when a folder is selected */
projects / modest / blobdiff