X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhildon2%2Fmodest-platform.c;h=29e96b52da2d1e7aff4add0a463cc917f435808e;hb=514d7488390a9c4c31a9ca5e44f78dc9329b833d;hp=841b2bd415fc7b98ead0d611645ce6e02b9f42ee;hpb=e875e9075deae779e12903416a8f1f6c96cbdcc7;p=modest diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 841b2bd..29e96b5 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include @@ -41,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -66,8 +66,8 @@ #include "hildon2/modest-hildon2-details-dialog.h" #include "hildon2/modest-hildon2-window-mgr.h" #ifdef MODEST_USE_PROFILE -#include -#include +#include +#include #endif #include #include @@ -208,15 +208,6 @@ modest_platform_init (int argc, char *argv[]) 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 @@ -699,11 +690,11 @@ folder_chooser_dialog_run (ModestFolderView *original, { 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")); @@ -739,12 +730,12 @@ folder_chooser_dialog_run (ModestFolderView *original, 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), @@ -1010,12 +1001,12 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, 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)); @@ -1040,7 +1031,7 @@ modest_platform_run_folder_common_dialog (GtkWindow *parent_window, 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); @@ -2697,7 +2688,7 @@ modest_platform_play_email_tone (void) #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 @@ -2814,13 +2805,13 @@ move_to_dialog_show_accounts (GtkWidget *dialog) { 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); @@ -2845,7 +2836,7 @@ move_to_dialog_show_accounts (GtkWidget *dialog) 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 @@ -2855,7 +2846,7 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) GtkWidget *folder_view; TnyAccount *account; const gchar *account_id; - GtkWidget *pannable; + GtkWidget *scrollable; GtkWidget *action_button; back_button = @@ -2864,8 +2855,8 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) 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); @@ -2901,7 +2892,7 @@ move_to_dialog_show_folders (GtkWidget *dialog, TnyFolderStore *folder_store) 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 @@ -3035,7 +3026,8 @@ 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, - _HL("wdgt_bd_new"), MODEST_GTK_RESPONSE_NEW_FOLDER, + _FM ("ckdg_bd_change_folder_new_folder"), + MODEST_GTK_RESPONSE_NEW_FOLDER, NULL); align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); @@ -3072,8 +3064,8 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, 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); @@ -3095,7 +3087,7 @@ modest_platform_create_move_to_dialog (GtkWindow *parent_window, 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 */