static void toolbar_ignore_thread_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_watch_thread_cb (GtkWidget *widget,
+ gpointer data);
+
static void toolbar_print_cb (GtkWidget *widget,
gpointer data);
{ "A_GOTO_PREV", N_("Go to Previous Unread Message") },
{ "A_GOTO_NEXT", N_("Go to Next Unread Message") },
{ "A_IGNORE_THREAD", N_("Ignore thread") },
+ { "A_WATCH_THREAD", N_("Watch thread") },
{ "A_PRINT", N_("Print") },
{ "A_LEARN_SPAM", N_("Learn Spam or Ham") },
{ "A_GO_FOLDERS", N_("Open folder/Go to folder list") },
A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_OPEN_MAIL, A_FORWARD,
A_TRASH , A_DELETE_REAL, A_EXECUTE, A_GOTO_PREV,
- A_GOTO_NEXT, A_IGNORE_THREAD, A_PRINT,
+ A_GOTO_NEXT, A_IGNORE_THREAD, A_WATCH_THREAD, A_PRINT,
A_ADDRBOOK, A_LEARN_SPAM, A_GO_FOLDERS,
- A_SYL_ACTIONS, A_CANCEL_INC };
+ A_CANCEL_INC };
for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++) {
items = g_list_append(items, gettext(toolbar_text[main_items[i]].descr));
#ifdef USE_ASPELL
A_CHECK_SPELLING,
#endif
- A_SYL_ACTIONS, A_CLOSE };
+ A_CLOSE };
for (i = 0; i < sizeof comp_items / sizeof comp_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[comp_items[i]].descr));
gint msgv_items[] = { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
A_REPLY_ALL, A_REPLY_ML, A_FORWARD,
A_TRASH, A_DELETE_REAL, A_GOTO_PREV, A_GOTO_NEXT,
- A_ADDRBOOK, A_LEARN_SPAM, A_SYL_ACTIONS, A_CLOSE };
+ A_ADDRBOOK, A_LEARN_SPAM, A_CLOSE };
for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++)
items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
}
}
+const gchar *toolbar_get_short_text(int action) {
+ switch(action) {
+ case A_GO_FOLDERS: return _("Folders");
+ case A_OPEN_MAIL: return _("Open");
+ case A_RECEIVE_ALL: return _("Get Mail");
+ case A_RECEIVE_CUR: return _("Get");
+ case A_SEND_QUEUED: return _("Send");
+ case A_COMPOSE_EMAIL: return Q_("Toolbar|Compose");
+ case A_COMPOSE_NEWS: return Q_("Toolbar|Compose");
+ case A_REPLY_MESSAGE: return _("Reply");
+ case A_REPLY_ALL: return _("All");
+ case A_REPLY_SENDER: return _("Sender");
+ case A_REPLY_ML: return _("List");
+ case A_FORWARD: return _("Forward");
+ case A_TRASH: return _("Trash");
+ case A_DELETE_REAL: return _("Delete");
+ case A_LEARN_SPAM: return _("Spam");
+ case A_GOTO_PREV: return _("Prev");
+ case A_GOTO_NEXT: return _("Next");
+ case A_IGNORE_THREAD: return _("Ignore thread");
+ case A_WATCH_THREAD: return _("Watch thread");
+ case A_PRINT: return _("Print");
+ case A_CLOSE: return _("Close");
+ case A_SEND: return _("Send");
+ case A_SENDL: return _("Send later");
+ case A_DRAFT: return _("Draft");
+ case A_INSERT: return _("Insert");
+ case A_ATTACH: return _("Attach");
+ case A_SIG: return _("Insert sig.");
+ case A_EXTEDITOR: return _("Edit");
+ case A_LINEWRAP_CURRENT:return _("Wrap para.");
+ case A_LINEWRAP_ALL: return _("Wrap all");
+ case A_ADDRBOOK: return _("Address");
+ case A_CANCEL_INC: return _("Stop");
+ #ifdef USE_ASPELL
+ case A_CHECK_SPELLING: return _("Check spelling");
+ #endif
+ default: return "";
+ }
+}
+
static void toolbar_set_default_main(void)
{
struct {
gint action;
gint icon;
- gchar *text;
} default_toolbar[] = {
#ifdef MAEMO
- { A_GO_FOLDERS, STOCK_PIXMAP_DIR_OPEN, _("Folders") },
- { A_SEPARATOR, 0, ("") },
+ { A_GO_FOLDERS, STOCK_PIXMAP_GO_FOLDERS },
+ { A_OPEN_MAIL, STOCK_PIXMAP_OPEN_MAIL },
+ { A_SEPARATOR, 0 },
#endif
- { A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL, _("Get Mail")},
- { A_SEPARATOR, 0, ("") },
- { A_SEND_QUEUED, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send") },
- { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,
- (gchar*)Q_("Toolbar|Compose") },
- { A_SEPARATOR, 0, ("") },
-#ifdef MAEMO
- { A_OPEN_MAIL, STOCK_PIXMAP_OPEN_MAIL, _("Open") },
-#endif
- { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY, _("Reply") },
+ { A_RECEIVE_ALL, STOCK_PIXMAP_MAIL_RECEIVE_ALL },
+ { A_SEPARATOR, 0},
+ { A_SEND_QUEUED, STOCK_PIXMAP_MAIL_SEND_QUEUE},
+ { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE },
+ { A_SEPARATOR, 0},
+ { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY},
#ifndef MAEMO
- { A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL, _("All") },
- { A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
+ { A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL},
+ { A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR},
#endif
- { A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
- { A_SEPARATOR, 0, ("") },
- { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+ { A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD},
+ { A_SEPARATOR, 0},
+ { A_TRASH, STOCK_PIXMAP_TRASH},
#ifndef MAEMO
#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+ { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN},
#endif
#endif
- { A_SEPARATOR, 0, ("") },
- { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
+ { A_SEPARATOR, 0},
+ { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW }
};
gint i;
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
- toolbar_item->text = g_strdup(default_toolbar[i].text);
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
} else {
toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
struct {
gint action;
gint icon;
- gchar *text;
} default_toolbar[] = {
- { A_SEND, STOCK_PIXMAP_MAIL_SEND, _("Send") },
- { A_SENDL, STOCK_PIXMAP_MAIL_SEND_QUEUE, _("Send later") },
- { A_DRAFT, STOCK_PIXMAP_MAIL, _("Draft") },
- { A_SEPARATOR, 0, ("") },
-#ifndef MAEMO
- { A_INSERT, STOCK_PIXMAP_INSERT_FILE, _("Insert") },
-#endif
- { A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH, _("Attach") },
- { A_SEPARATOR, 0, ("") },
- { A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK, _("Address") }
#ifdef MAEMO
- ,
- { A_SEPARATOR, 0, ("") },
- { A_CLOSE, STOCK_PIXMAP_CLOSE, _("Close") }
+ { A_CLOSE, STOCK_PIXMAP_CLOSE},
+ { A_SEPARATOR, 0},
#endif
+ { A_SEND, STOCK_PIXMAP_MAIL_SEND},
+ { A_SENDL, STOCK_PIXMAP_MAIL_SEND_QUEUE},
+ { A_DRAFT, STOCK_PIXMAP_MAIL},
+ { A_SEPARATOR, 0},
+#ifndef MAEMO
+ { A_INSERT, STOCK_PIXMAP_INSERT_FILE},
+#endif
+ { A_ATTACH, STOCK_PIXMAP_MAIL_ATTACH},
+ { A_SEPARATOR, 0},
+ { A_ADDRBOOK, STOCK_PIXMAP_ADDRESS_BOOK }
};
gint i;
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
- toolbar_item->text = g_strdup(default_toolbar[i].text);
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
} else {
toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
struct {
gint action;
gint icon;
- gchar *text;
} default_toolbar[] = {
- { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY, _("Reply") },
- { A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL, _("All") },
- { A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR, _("Sender") },
- { A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD, _("Forward") },
- { A_SEPARATOR, 0, ("") },
- { A_TRASH, STOCK_PIXMAP_TRASH, _("Trash") },
+#ifdef MAEMO
+ { A_CLOSE, STOCK_PIXMAP_CLOSE},
+ { A_SEPARATOR, 0},
+#endif
+ { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY},
+ { A_REPLY_ALL, STOCK_PIXMAP_MAIL_REPLY_TO_ALL},
+ { A_REPLY_SENDER, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR},
+ { A_FORWARD, STOCK_PIXMAP_MAIL_FORWARD},
+ { A_SEPARATOR, 0},
+ { A_TRASH, STOCK_PIXMAP_TRASH},
#ifndef MAEMO
#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
- { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN, _("Spam") },
+ { A_LEARN_SPAM, STOCK_PIXMAP_SPAM_BTN},
#endif
#endif
- { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW, _("Next") }
-#ifdef MAEMO
- ,
- { A_SEPARATOR, 0, ("") },
- { A_CLOSE, STOCK_PIXMAP_CLOSE, _("Close") }
-#endif
+ { A_GOTO_NEXT, STOCK_PIXMAP_DOWN_ARROW }
};
gint i;
toolbar_item->file = g_strdup(file);
toolbar_item->index = default_toolbar[i].action;
- toolbar_item->text = g_strdup(default_toolbar[i].text);
+ toolbar_item->text = g_strdup(toolbar_get_short_text(default_toolbar[i].action));
} else {
toolbar_item->file = g_strdup(TOOLBAR_TAG_SEPARATOR);
fileSpec = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, toolbar_config[source].conf_file, NULL );
pfile = prefs_write_open(fileSpec);
- g_free( fileSpec );
if( pfile ) {
fp = pfile->fp;
- fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\" ?>\n", CS_INTERNAL);
+ if (fprintf(fp, "<?xml version=\"1.0\" encoding=\"%s\" ?>\n", CS_INTERNAL) < 0)
+ goto fail;
- fprintf(fp, "<%s>\n", TOOLBAR_TAG_INDEX);
+ if (fprintf(fp, "<%s>\n", TOOLBAR_TAG_INDEX) < 0)
+ goto fail;
for (cur = toolbar_config[source].item_list; cur != NULL; cur = cur->next) {
ToolbarItem *toolbar_item = (ToolbarItem*) cur->data;
if (toolbar_item->index != A_SEPARATOR) {
- fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
+ if (fprintf(fp, "\t<%s %s=\"%s\" %s=\"",
TOOLBAR_TAG_ITEM,
TOOLBAR_ICON_FILE, toolbar_item->file,
- TOOLBAR_ICON_TEXT);
- xml_file_put_escape_str(fp, toolbar_item->text);
- fprintf(fp, "\" %s=\"%s\"/>\n",
+ TOOLBAR_ICON_TEXT) < 0)
+ goto fail;
+ if (xml_file_put_escape_str(fp, toolbar_item->text) < 0)
+ goto fail;
+ if (fprintf(fp, "\" %s=\"%s\"/>\n",
TOOLBAR_ICON_ACTION,
- toolbar_ret_text_from_val(toolbar_item->index));
+ toolbar_ret_text_from_val(toolbar_item->index)) < 0)
+ goto fail;
} else {
- fprintf(fp, "\t<%s/>\n", TOOLBAR_TAG_SEPARATOR);
+ if (fprintf(fp, "\t<%s/>\n", TOOLBAR_TAG_SEPARATOR) < 0)
+ goto fail;
}
}
- fprintf(fp, "</%s>\n", TOOLBAR_TAG_INDEX);
+ if (fprintf(fp, "</%s>\n", TOOLBAR_TAG_INDEX) < 0)
+ goto fail;
+ g_free( fileSpec );
if (prefs_file_close (pfile) < 0 )
g_warning("failed to write toolbar configuration to file\n");
+ return;
+
+fail:
+ FILE_OP_ERROR(fileSpec, "fprintf");
+ g_free( fileSpec );
+ prefs_file_close_revert (pfile);
} else
g_warning("failed to open toolbar configuration file for writing\n");
}
ToolbarStyle style,
ComposeButtonType type)
{
- if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
+ if ((!toolbar->compose_mail_btn))
return;
- gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn
- : toolbar->compose_news_btn);
- gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
- : toolbar->compose_mail_btn);
- toolbar->compose_btn_type = type;
+ if (type == COMPOSEBUTTON_NEWS) {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
+ toolbar->compose_news_icon);
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
+ _("Compose News message"), NULL);
+ gtk_widget_show(toolbar->compose_news_icon);
+ } else {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->compose_mail_btn),
+ toolbar->compose_mail_icon);
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->compose_mail_btn), GTK_TOOLTIPS(toolbar->tooltips),
+ _("Compose Email"), NULL);
+ gtk_widget_show(toolbar->compose_mail_icon);
+ }
+ toolbar->compose_btn_type = type;
}
void toolbar_set_compose_button(Toolbar *toolbar,
ToolbarStyle style,
LearnButtonType type)
{
- if ((!toolbar->learn_spam_btn) || (!toolbar->learn_ham_btn))
+ if ((!toolbar->learn_spam_btn))
return;
- gtk_widget_hide(type == LEARN_SPAM ? toolbar->learn_ham_btn
- : toolbar->learn_spam_btn);
- gtk_widget_show(type == LEARN_SPAM ? toolbar->learn_spam_btn
- : toolbar->learn_ham_btn);
+ if (type == LEARN_SPAM) {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ toolbar->learn_spam_icon);
+ gtk_tool_button_set_label(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ _("Spam"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
+ _("Learn spam"), NULL);
+ gtk_widget_show(toolbar->learn_spam_icon);
+ } else {
+ gtk_tool_button_set_icon_widget(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ toolbar->learn_ham_icon);
+ gtk_tool_button_set_label(
+ GTK_TOOL_BUTTON(toolbar->learn_spam_btn),
+ _("Ham"));
+ gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(toolbar->learn_spam_btn), GTK_TOOLTIPS(toolbar->tooltips),
+ _("Learn ham"), NULL);
+ gtk_widget_show(toolbar->learn_ham_icon);
+ }
toolbar->learn_btn_type = type;
}
/* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
+#ifndef MAEMO
MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
if (msginfo)
messageview_show(msgview, msginfo,
msgview->all_headers);
+#endif
} else {
gtk_widget_destroy(msgview->window);
}
/* Now we need to update the messageview window */
if (msgview->mainwin->summaryview->selected) {
+#ifndef MAEMO
MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
if (msginfo)
messageview_show(msgview, msginfo,
msgview->all_headers);
+#endif
} else {
gtk_widget_destroy(msgview->window);
}
}
}
+static void toolbar_watch_thread_cb(GtkWidget *widget, gpointer data)
+{
+ ToolbarItem *toolbar_item = (ToolbarItem*)data;
+ MainWindow *mainwin;
+
+ g_return_if_fail(toolbar_item != NULL);
+
+ switch (toolbar_item->type) {
+ case TOOLBAR_MAIN:
+ mainwin = (MainWindow *) toolbar_item->parent;
+ summary_toggle_watch_thread(mainwin->summaryview);
+ break;
+ case TOOLBAR_MSGVIEW:
+ /* TODO: see toolbar_next_unread_cb() if you need
+ * this in the message view */
+ break;
+ default:
+ debug_print("toolbar event not supported\n");
+ break;
+ }
+}
+
static void toolbar_cancel_inc_cb(GtkWidget *widget, gpointer data)
{
ToolbarItem *toolbar_item = (ToolbarItem*)data;
{ A_GOTO_PREV, toolbar_prev_unread_cb },
{ A_GOTO_NEXT, toolbar_next_unread_cb },
{ A_IGNORE_THREAD, toolbar_ignore_thread_cb },
+ { A_WATCH_THREAD, toolbar_watch_thread_cb },
{ A_PRINT, toolbar_print_cb },
{ A_LEARN_SPAM, toolbar_learn_cb },
{ A_GO_FOLDERS, toolbar_go_folders_cb },
#define TOOLBAR_ITEM(item,icon,text,tooltip) { \
item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \
- gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
+ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
}
#define TOOLBAR_MENUITEM(item,icon,text,tooltip,menutip) { \
+ GtkWidget *child = NULL, *btn = NULL, *arr = NULL; \
+ GList *gchild = NULL; \
item = GTK_WIDGET(gtk_menu_tool_button_new(icon, text)); \
gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \
gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \
tooltip, NULL); \
gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(item), \
GTK_TOOLTIPS(toolbar_tips), menutip, NULL); \
+ child = gtk_bin_get_child(GTK_BIN(item)); \
+ gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ btn = (GtkWidget *)gchild->data; \
+ arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \
+ g_list_free(gchild); \
+ gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \
+ gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \
+ g_list_free(gchild); \
}
#define MAKE_MENU(entries,path,btn) { \
_("Compose Email"),
_("Compose with selected Account"));
toolbar_data->compose_mail_btn = item;
+ toolbar_data->compose_mail_icon = icon_wid;
+ g_object_ref(toolbar_data->compose_mail_icon);
icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
- TOOLBAR_MENUITEM(item,icon_news,_("Compose"),
- _("Compose News"),
- _("Compose with selected Account"));
- toolbar_data->compose_news_btn = item;
+ toolbar_data->compose_news_icon = icon_news;
+ g_object_ref(toolbar_data->compose_news_icon);
#else
TOOLBAR_ITEM(item,icon_wid,toolbar_item->text,
_("Compose Email"));
toolbar_data->compose_mail_btn = item;
+ toolbar_data->compose_mail_icon = icon_wid;
icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
- TOOLBAR_ITEM(item,icon_news,_("Compose"),
- _("Compose News"));
- toolbar_data->compose_news_btn = item;
+ toolbar_data->compose_news_icon = icon_news;
#endif
break;
case A_LEARN_SPAM:
TOOLBAR_MENUITEM(item,icon_wid,toolbar_item->text,
- _("Learn Spam"),
+ _("Spam"),
_("Learn as..."));
toolbar_data->learn_spam_btn = item;
+ toolbar_data->learn_spam_icon = icon_wid;
+ g_object_ref(toolbar_data->learn_spam_icon);
icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
- TOOLBAR_MENUITEM(item,icon_ham,_("Ham"),
- _("Learn Ham"),
- _("Learn as..."));
- toolbar_data->learn_ham_btn = item;
+ toolbar_data->learn_ham_icon = icon_ham;
+ g_object_ref(toolbar_data->learn_ham_icon);
MAKE_MENU(learn_entries,"<LearnSpam>",toolbar_data->learn_spam_btn);
- MAKE_MENU(learn_entries,"<LearnHam>",toolbar_data->learn_ham_btn);
break;
case A_REPLY_MESSAGE:
#ifndef MAEMO
}
toolbar_data->toolbar = toolbar;
+ toolbar_data->tooltips = toolbar_tips;
gtk_widget_show_all(toolbar);
- if (type == TOOLBAR_MAIN)
+ if (type == TOOLBAR_MAIN) {
+#ifdef MAEMO
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+ GtkWidget *progressbar = gtk_progress_bar_new();
+ item = gtk_tool_item_new();
+ gtk_container_add (GTK_CONTAINER (item), progressbar);
+ gtk_widget_show(item);
+ gtk_widget_show(progressbar);
+ gtk_widget_set_size_request(progressbar, 70, -1);
+ gtk_toolbar_insert(GTK_TOOLBAR(toolbar), GTK_TOOL_ITEM(item), -1); \
+ mainwin->progressbar = progressbar;
+#endif
activate_compose_button(toolbar_data,
prefs_common.toolbar_style,
toolbar_data->compose_btn_type);
+ }
if (type != TOOLBAR_COMPOSE)
activate_learn_button(toolbar_data, prefs_common.toolbar_style,
LEARN_SPAM);
Compose *compose = (Compose*)data;
MessageView *msgview = (MessageView*)data;
+#ifndef MAEMO
switch(type) {
case TOOLBAR_MAIN:
toolbar_data = mainwin->toolbar;
toolbar_init(toolbar_data);
toolbar_data = toolbar_create(type, handlebox, data);
+#else
+ switch(type) {
+ case TOOLBAR_MAIN:
+ toolbar_data = mainwin->toolbar;
+ handlebox = mainwin->window;
+ break;
+ case TOOLBAR_COMPOSE:
+ toolbar_data = compose->toolbar;
+ handlebox = compose->window;
+ break;
+ case TOOLBAR_MSGVIEW:
+ toolbar_data = msgview->toolbar;
+ handlebox = msgview->window;
+ break;
+ default:
+ return;
+ }
+
+ hildon_window_remove_toolbar(HILDON_WINDOW(handlebox), GTK_WIDGET(toolbar_data->toolbar));
+
+ toolbar_init(toolbar_data);
+ toolbar_data = toolbar_create(type, handlebox, data);
+#endif
+
switch(type) {
case TOOLBAR_MAIN:
mainwin->toolbar = toolbar_data;
}
#define GTK_BUTTON_SET_SENSITIVE(widget,sensitive) { \
- gboolean in_btn = FALSE; \
+ gboolean in_btn1 = FALSE, in_btn2 = FALSE; \
if (GTK_IS_BUTTON(widget)) \
- in_btn = GTK_BUTTON(widget)->in_button; \
+ in_btn1 = GTK_BUTTON(widget)->in_button; \
+ else if (GTK_IS_MENU_TOOL_BUTTON(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ GList *gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ GtkWidget *btn = (GtkWidget *)gchild->data; \
+ GtkWidget *arr = (GtkWidget *) \
+ (gchild->next?gchild->next->data:NULL); \
+ g_list_free(gchild); \
+ if (GTK_IS_BUTTON(btn)) \
+ in_btn1 = GTK_BUTTON(btn)->in_button; \
+ if (GTK_IS_BUTTON(arr)) \
+ in_btn2 = GTK_BUTTON(arr)->in_button; \
+ } \
+ else if (GTK_IS_TOOL_ITEM(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ if (GTK_IS_BUTTON(child)) \
+ in_btn1 = GTK_BUTTON(child)->in_button; \
+ } \
gtk_widget_set_sensitive(widget, sensitive); \
if (GTK_IS_BUTTON(widget)) \
- GTK_BUTTON(widget)->in_button = in_btn; \
+ GTK_BUTTON(widget)->in_button = in_btn1; \
+ else if (GTK_IS_MENU_TOOL_BUTTON(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ GList *gchild = gtk_container_get_children( \
+ GTK_CONTAINER(child)); \
+ GtkWidget *btn = (GtkWidget *)gchild->data; \
+ GtkWidget *arr = (GtkWidget *) \
+ (gchild->next?gchild->next->data:NULL); \
+ g_list_free(gchild); \
+ if (GTK_IS_BUTTON(btn)) \
+ GTK_BUTTON(btn)->in_button = in_btn1; \
+ if (GTK_IS_BUTTON(arr)) \
+ GTK_BUTTON(arr)->in_button = in_btn2; \
+ } \
+ else if (GTK_IS_TOOL_ITEM(widget)) { \
+ GtkWidget *child = gtk_bin_get_child( \
+ GTK_BIN(widget)); \
+ if (GTK_IS_BUTTON(child)) \
+ GTK_BUTTON(child)->in_button = in_btn1; \
+ } \
}
void toolbar_main_set_sensitive(gpointer data)
M_HAVE_QUEUED_MAILS);
}
if (toolbar->compose_mail_btn) {
- SET_WIDGET_COND(toolbar->compose_news_btn,
+ SET_WIDGET_COND(toolbar->compose_mail_btn,
M_HAVE_ACCOUNT);
}
if (toolbar->close_window_btn) {
- SET_WIDGET_COND(toolbar->compose_news_btn,
+ SET_WIDGET_COND(toolbar->close_window_btn,
M_UNLOCKED);
}
if (toolbar->open_mail_btn) {
SET_WIDGET_COND(toolbar->exec_btn,
M_DELAY_EXEC);
- if (toolbar->learn_ham_btn)
+/* if (toolbar->learn_ham_btn)
SET_WIDGET_COND(toolbar->learn_ham_btn,
M_TARGET_EXIST|M_CAN_LEARN_SPAM);
-
+*/
if (toolbar->learn_spam_btn)
SET_WIDGET_COND(toolbar->learn_spam_btn,
M_TARGET_EXIST|M_CAN_LEARN_SPAM);
toolbar->getall_btn = NULL;
toolbar->send_btn = NULL;
toolbar->compose_mail_btn = NULL;
- toolbar->compose_news_btn = NULL;
+ toolbar->compose_mail_icon = NULL;
+ toolbar->compose_news_icon = NULL;
toolbar->reply_btn = NULL;
toolbar->replysender_btn = NULL;
toolbar->replyall_btn = NULL;
alertpanel_error_log(_("Some errors occurred while "
"sending queued messages."));
else {
- gchar *tmp = g_strdup_printf(_("Some errors occurred "
+ alertpanel_error_log(_("Some errors occurred "
"while sending queued messages:\n%s"), errstr);
g_free(errstr);
- alertpanel_error_log(tmp);
- g_free(tmp);
}
}
}
projects / claws.git / blobdiff