#include <widgets/modest-header-view.h>
#include <widgets/modest-folder-view.h>
#include <modest-tny-platform-factory.h>
+#include <modest-platform.h>
#include <modest-widget-memory.h>
#include <modest-widget-memory-priv.h>
#include <modest-local-folder-info.h>
#include <modest-account-mgr-helpers.h>
#include <modest-icon-names.h>
-#if MODEST_PLATFORM_ID==2 /* maemo/hildon */
-#include <libosso.h>
-static gboolean init_hildon (void);
-#endif /* MODEST_PLATFORM_ID==2 */
-
static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
static gboolean init_local_folders (void);
static gboolean init_default_account_maybe (ModestAccountMgr *acc_mgr);
static void init_debug_g_type (void);
static void init_debug_logging (void);
static void init_test_accounts (ModestAccountMgr *acc_mgr);
+static void init_default_settings (ModestConf *conf);
static ModestSingletons *_singletons = NULL;
{MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE, 60},
{MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
};
+
static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
- {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
- {MODEST_HEADER_VIEW_COLUMN_ATTACH, 40},
- {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 200}
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN, 180},
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE, 240}
};
static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
- {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
- {MODEST_HEADER_VIEW_COLUMN_ATTACH, 40},
- {MODEST_HEADER_VIEW_COLUMN_TO, 80},
- {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80},
- {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 80},
- {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
+ {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
+ {MODEST_HEADER_VIEW_COLUMN_ATTACH, 40},
+ {MODEST_HEADER_VIEW_COLUMN_TO, 80},
+ {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80},
+ {MODEST_HEADER_VIEW_COLUMN_SENT_DATE, 80},
+ {MODEST_HEADER_VIEW_COLUMN_SIZE, 50}
};
+
static const FolderCols OUTBOX_COLUMNS_TWOLINES[] = {
- {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40},
- {MODEST_HEADER_VIEW_COLUMN_ATTACH, 40},
- {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,200},
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
+ {MODEST_HEADER_VIEW_COLUMN_STATUS, 240}
+};
+
+static const FolderCols SENT_COLUMNS_TWOLINES[] = {
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG, 40},
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180},
+ {MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE, 240}
+};
+
+#ifdef MODEST_PLATFORM_MAEMO
+static const TnyFolderType LOCAL_FOLDERS[] = {
+ TNY_FOLDER_TYPE_OUTBOX,
+ TNY_FOLDER_TYPE_DRAFTS,
+ TNY_FOLDER_TYPE_SENT
};
-
+#else
static const TnyFolderType LOCAL_FOLDERS[] = {
TNY_FOLDER_TYPE_OUTBOX,
TNY_FOLDER_TYPE_DRAFTS,
TNY_FOLDER_TYPE_TRASH,
TNY_FOLDER_TYPE_ARCHIVE
};
+#endif /* MODEST_PLATFORM_MAEMO */
+
gboolean
g_thread_init(NULL);
gdk_threads_init ();
+ /* Set application name */
+ g_set_application_name (_("FIXME Modest"));
+
my_singletons = modest_singletons_new ();
if (!my_singletons) {
g_printerr ("modest: failed to initialize singletons\n");
return FALSE;
}
-
-#if MODEST_PLATFORM_ID==2
- if (!init_hildon ()) {
+
+ if (!modest_platform_init()) {
modest_runtime_uninit ();
- g_printerr ("modest: failed to initialize hildon\n");
+ g_printerr ("modest: failed to run platform-specific initialization\n");
return FALSE;
}
-#endif /* MODEST_PLATFORM_ID==2 */
/* based on the debug settings, we decide whether to overwrite old settings */
reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
g_printerr ("modest: failed to init header columns\n");
return FALSE;
}
+
+ init_default_settings (modest_singletons_get_conf (my_singletons));
if (!init_local_folders()) {
modest_runtime_uninit ();
return modest_singletons_get_platform_factory (_singletons);
}
-
-
-
ModestTnySendQueue*
modest_runtime_get_send_queue (TnyTransportAccount *account)
{
return MODEST_TNY_SEND_QUEUE(send_queue);
}
-
-
+ModestWindowMgr *
+modest_runtime_get_window_mgr (void)
+{
+ g_return_val_if_fail (_singletons, NULL);
+ return modest_singletons_get_window_mgr (_singletons);
+}
/* http://primates.ximian.com/~federico/news-2006-04.html#memory-debugging-infrastructure*/
ModestRuntimeDebugFlags
folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {
switch (folder_type) {
- case TNY_FOLDER_TYPE_OUTBOX:
case TNY_FOLDER_TYPE_SENT:
case TNY_FOLDER_TYPE_DRAFTS:
save_header_settings (conf, folder_type,
overwrite);
save_header_settings (conf, folder_type,
MODEST_HEADER_VIEW_STYLE_TWOLINES,
+ SENT_COLUMNS_TWOLINES,
+ G_N_ELEMENTS(SENT_COLUMNS_TWOLINES),
+ overwrite);
+ break;
+ case TNY_FOLDER_TYPE_OUTBOX:
+ save_header_settings (conf, folder_type,
+ MODEST_HEADER_VIEW_STYLE_TWOLINES,
OUTBOX_COLUMNS_TWOLINES,
G_N_ELEMENTS(OUTBOX_COLUMNS_TWOLINES),
overwrite);
static void
init_i18n (void)
{
- bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALEDIR);
+ /* Setup gettext, to use our .po files: */
+ /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
+ bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-
-}
-
-
-#if MODEST_PLATFORM_ID==2
-static gboolean
-init_hildon (void)
-{
- osso_context_t *osso_context =
- osso_initialize(PACKAGE, PACKAGE_VERSION,
- TRUE, NULL);
- if (!osso_context) {
- g_printerr ("modest: failed to acquire osso context\n");
- return FALSE;
- }
}
-#endif /* MODEST_PLATFORM_ID==2 */
/*
static gboolean registered = FALSE;
if (!registered) {
+ GtkIconTheme *current_theme;
GdkPixbuf *pixbuf;
GtkIconFactory *factory;
gint i;
static GtkStockItem items[] = {
+#ifdef MODEST_PLATFORM_MAEMO
+ { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
+ { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
+ { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
+#endif /*MODEST_PLATFORM_MAEMO*/
{ MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
{ MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
- { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },
+/* { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL }, */
{ MODEST_STOCK_REPLY, "reply", 0, 0, NULL },
{ MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL },
{ MODEST_STOCK_FORWARD, "forward", 0, 0, NULL },
};
static gchar *items_names [] = {
+#ifdef MODEST_PLATFORM_MAEMO
+ MODEST_TOOLBAR_ICON_SPLIT_VIEW,
+ MODEST_TOOLBAR_ICON_SORT,
+ MODEST_TOOLBAR_ICON_REFRESH,
+#endif /*MODEST_PLATFORM_MAEMO*/
MODEST_TOOLBAR_ICON_MAIL_SEND,
MODEST_TOOLBAR_ICON_NEW_MAIL,
- MODEST_TOOLBAR_ICON_SEND_RECEIVE,
+/* MODEST_TOOLBAR_ICON_SEND_RECEIVE, */
MODEST_TOOLBAR_ICON_REPLY,
MODEST_TOOLBAR_ICON_REPLY_ALL,
MODEST_TOOLBAR_ICON_FORWARD,
/* MODEST_TOOLBAR_ICON_NEXT, */
/* MODEST_TOOLBAR_ICON_PREV, */
/* MODEST_TOOLBAR_ICON_STOP */
+ MODEST_TOOLBAR_ICON_FORMAT_BULLETS,
};
registered = TRUE;
factory = gtk_icon_factory_new ();
gtk_icon_factory_add_default (factory);
+ current_theme = gtk_icon_theme_get_default ();
+
/* Register icons to accompany stock items */
for (i = 0; i < G_N_ELEMENTS (items); i++) {
- pixbuf = NULL;
+
+#ifdef MODEST_PLATFORM_MAEMO /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */
+ pixbuf = gtk_icon_theme_load_icon (current_theme,
+ items_names[i],
+ 26,
+ GTK_ICON_LOOKUP_NO_SVG,
+ NULL);
+#else
pixbuf = gdk_pixbuf_new_from_file (items_names[i], NULL);
+#endif
if (pixbuf != NULL) {
GtkIconSet *icon_set;
GdkPixbuf *transparent;
transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
-
icon_set = gtk_icon_set_new_from_pixbuf (transparent);
gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
gtk_icon_set_unref (icon_set);
modest_account_mgr_add_account (acc_mgr, imap_test, imap_test, smtp_test);
modest_account_mgr_add_account (acc_mgr, pop_test, pop_test, smtp_test);
}
+
+
+static void
+init_default_settings (ModestConf *conf)
+{
+ if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL);
+
+ if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+
+ if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
+
+ if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
+
+ if (!modest_conf_key_exists (conf, MODEST_CONF_CONNECT_AT_STARTUP, NULL))
+ modest_conf_set_bool (conf, MODEST_CONF_CONNECT_AT_STARTUP, TRUE, NULL);
+
+}
projects / modest / blobdiff