GtkWidget *msg_paned;
GtkWidget *main_paned;
GtkWidget *main_vbox;
- GtkWidget *progress_bar;
+ GtkWidget *accounts_popup;
ModestHeaderView *header_view;
ModestFolderView *folder_view;
g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
}
-
-static void
-on_key_changed (ModestConf* conf, const gchar *key, ModestConfEvent event, ModestMainWindow *win)
-{
- TnyAccount *account;
-
- if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME) != 0)
- return; /* wrong key */
-
- /* ok, the device name changed; thus, we have to update the
- * local folder account name*/
- account =
- modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store(),
- MODEST_LOCAL_FOLDERS_ACCOUNT_ID,
- TNY_ACCOUNT_TYPE_STORE);
- if (!account) {
- g_printerr ("modest: could not get account\n");
- return;
- }
-
- if (event == MODEST_CONF_EVENT_KEY_UNSET)
- tny_account_set_name (account, MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME);
- else {
- gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(),
- MODEST_CONF_DEVICE_NAME, NULL);
- tny_account_set_name (account, device_name);
- g_free (device_name);
- }
- g_object_unref (G_OBJECT(account));
-}
-
static void
modest_main_window_init (ModestMainWindow *obj)
{
priv->main_vbox = NULL;
priv->header_view = NULL;
priv->folder_view = NULL;
+ priv->accounts_popup = NULL;
priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
-
- /* progress bar */
- priv->progress_bar = gtk_progress_bar_new ();
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(priv->progress_bar), 1.0);
- gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(priv->progress_bar),
- PANGO_ELLIPSIZE_END);
}
static void
G_CALLBACK(on_inner_widgets_key_pressed), self);
g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self);
+ g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed",
+ G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self);
menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewContextMenu");
gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
g_signal_connect (G_OBJECT (self), "window-state-event",
G_CALLBACK (modest_main_window_window_state_event),
NULL);
-
-
-
- /* modest_maemo_utils_get_device_name will probably change
- * MODEST_CONF_DEVICE_NAME. If that happens, we update the local folders
- * account name in the callback
- */
- g_signal_connect (G_OBJECT(modest_runtime_get_conf()), "key_changed",
- G_CALLBACK(on_key_changed), self);
-
g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
/* Track account changes. We need to refresh the toolbar */
gpointer user_data)
{
ModestMainWindow *self;
+ ModestMainWindowPrivate *priv;
ModestWindowPrivate *parent_priv;
TnyList *account_list;
- GtkWidget *popup = NULL, *item, *send_receive_button;
+ GtkWidget *item, *send_receive_button;
TnyIterator *iter;
ModestAccountMgr *mgr;
gchar *default_account;
self = MODEST_MAIN_WINDOW (user_data);
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
/* If there is no toolbar then exit */
if (!parent_priv->toolbar)
return;
+ if (priv->accounts_popup)
+ gtk_menu_detach (GTK_MENU (priv->accounts_popup));
+
/* Get accounts */
account_list = tny_simple_list_new ();
tny_account_store_get_accounts (account_store,
"/ToolBar/ToolbarSendReceive");
/* Create the menu */
- popup = gtk_menu_new ();
- item = gtk_menu_item_new_with_label (_("FIXME All"));
- gtk_menu_shell_append (GTK_MENU_SHELL (popup), GTK_WIDGET (item));
+ priv->accounts_popup = gtk_menu_new ();
+ item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (popup), GTK_WIDGET (item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
iter = tny_list_create_iterator (account_list);
mgr = modest_runtime_get_account_mgr ();
do {
TnyAccount *acc;
const gchar *acc_name;
+ gchar *display_name;
/* Create tool item */
acc = TNY_ACCOUNT (tny_iterator_get_current (iter));
acc_name = tny_account_get_name (acc);
- if (!strcmp (default_account, acc_name)) {
- gchar *bold_name;
- bold_name = g_strdup_printf ("<b>%s</b>", acc_name);
- item = gtk_menu_item_new_with_label (bold_name);
- g_free (bold_name);
- } else {
- item = gtk_menu_item_new_with_label (acc_name);
- }
+ /* Create display name */
+ if (!strcmp (default_account, acc_name))
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), acc_name);
+ else
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), acc_name);
+
+ item = gtk_menu_item_new_with_label (display_name);
+
+ /* Free */
+ g_free (display_name);
g_object_unref (acc);
/* Append item */
- gtk_menu_shell_append (GTK_MENU_SHELL (popup), GTK_WIDGET (item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
/* Go to next */
tny_iterator_next (iter);
g_object_unref (iter);
/* Mandatory in order to view the menu contents */
- gtk_widget_show_all (popup);
+ gtk_widget_show_all (priv->accounts_popup);
/* Setup tap_and_hold */
- gtk_widget_tap_and_hold_setup (send_receive_button, popup, NULL, 0);
+ gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
free:
projects / modest / blobdiff