Revision 489 src/compose.c
| compose.c (revision 489) | ||
|---|---|---|
| 48 | 48 |
#include <gtk/gtksignal.h> |
| 49 | 49 |
#include <gtk/gtkvbox.h> |
| 50 | 50 |
#include <gtk/gtkcontainer.h> |
| 51 |
#include <gtk/gtkhandlebox.h> |
|
| 52 | 51 |
#include <gtk/gtktoolbar.h> |
| 53 | 52 |
#include <gtk/gtktable.h> |
| 54 | 53 |
#include <gtk/gtkhbox.h> |
| ... | ... | |
| 161 | 160 |
ComposeMode mode); |
| 162 | 161 |
static Compose *compose_find_window_by_target (MsgInfo *msginfo); |
| 163 | 162 |
static void compose_connect_changed_callbacks (Compose *compose); |
| 164 |
static void compose_toolbar_create (Compose *compose, |
|
| 165 |
GtkWidget *container); |
|
| 163 |
static GtkWidget *compose_toolbar_create (Compose *compose); |
|
| 166 | 164 |
static GtkWidget *compose_account_option_menu_create |
| 167 | 165 |
(Compose *compose); |
| 168 | 166 |
static void compose_set_out_encoding (Compose *compose); |
| ... | ... | |
| 3829 | 3827 |
GtkWidget *window; |
| 3830 | 3828 |
GtkWidget *vbox; |
| 3831 | 3829 |
GtkWidget *menubar; |
| 3832 |
GtkWidget *handlebox;
|
|
| 3830 |
GtkWidget *toolbar;
|
|
| 3833 | 3831 |
|
| 3834 | 3832 |
GtkWidget *vbox2; |
| 3835 | 3833 |
|
| ... | ... | |
| 3926 | 3924 |
n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]); |
| 3927 | 3925 |
menubar = menubar_create(window, compose_entries, |
| 3928 | 3926 |
n_menu_entries, "<Compose>", compose); |
| 3927 |
gtk_widget_set_size_request(menubar, 300, -1); |
|
| 3929 | 3928 |
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0); |
| 3930 | 3929 |
|
| 3931 |
handlebox = gtk_handle_box_new(); |
|
| 3932 |
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0); |
|
| 3930 |
toolbar = compose_toolbar_create(compose); |
|
| 3931 |
gtk_widget_set_size_request(toolbar, 300, -1); |
|
| 3932 |
gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); |
|
| 3933 | 3933 |
|
| 3934 |
compose_toolbar_create(compose, handlebox); |
|
| 3935 |
|
|
| 3936 | 3934 |
vbox2 = gtk_vbox_new(FALSE, 2); |
| 3937 | 3935 |
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0); |
| 3938 | 3936 |
gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH); |
| ... | ... | |
| 4213 | 4211 |
|
| 4214 | 4212 |
switch (prefs_common.toolbar_style) {
|
| 4215 | 4213 |
case TOOLBAR_NONE: |
| 4216 |
gtk_widget_hide(handlebox);
|
|
| 4214 |
gtk_widget_hide(toolbar);
|
|
| 4217 | 4215 |
break; |
| 4218 | 4216 |
case TOOLBAR_ICON: |
| 4219 |
gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar), |
|
| 4220 |
GTK_TOOLBAR_ICONS); |
|
| 4217 |
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS); |
|
| 4221 | 4218 |
break; |
| 4222 | 4219 |
case TOOLBAR_TEXT: |
| 4223 |
gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar), |
|
| 4224 |
GTK_TOOLBAR_TEXT); |
|
| 4220 |
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_TEXT); |
|
| 4225 | 4221 |
break; |
| 4226 | 4222 |
case TOOLBAR_BOTH: |
| 4227 |
gtk_toolbar_set_style(GTK_TOOLBAR(compose->toolbar), |
|
| 4228 |
GTK_TOOLBAR_BOTH); |
|
| 4223 |
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); |
|
| 4229 | 4224 |
break; |
| 4230 | 4225 |
} |
| 4231 | 4226 |
|
| ... | ... | |
| 4238 | 4233 |
compose->window = window; |
| 4239 | 4234 |
compose->vbox = vbox; |
| 4240 | 4235 |
compose->menubar = menubar; |
| 4241 |
compose->handlebox = handlebox;
|
|
| 4236 |
compose->toolbar = toolbar;
|
|
| 4242 | 4237 |
|
| 4243 | 4238 |
compose->vbox2 = vbox2; |
| 4244 | 4239 |
|
| ... | ... | |
| 4421 | 4416 |
G_CALLBACK(compose_changed_cb), compose); |
| 4422 | 4417 |
} |
| 4423 | 4418 |
|
| 4424 |
static void compose_toolbar_create(Compose *compose, GtkWidget *container)
|
|
| 4419 |
static GtkWidget *compose_toolbar_create(Compose *compose)
|
|
| 4425 | 4420 |
{
|
| 4426 | 4421 |
GtkWidget *toolbar; |
| 4427 | 4422 |
GtkWidget *icon_wid; |
| ... | ... | |
| 4441 | 4436 |
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH); |
| 4442 | 4437 |
gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), |
| 4443 | 4438 |
GTK_ICON_SIZE_LARGE_TOOLBAR); |
| 4444 |
gtk_container_add(GTK_CONTAINER(container), toolbar); |
|
| 4445 |
gtk_widget_set_size_request(toolbar, 1, -1); |
|
| 4446 | 4439 |
|
| 4447 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND);
|
|
| 4440 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_SEND);
|
|
| 4448 | 4441 |
send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4449 | 4442 |
_("Send"),
|
| 4450 | 4443 |
_("Send message"),
|
| ... | ... | |
| 4453 | 4446 |
G_CALLBACK(toolbar_send_cb), |
| 4454 | 4447 |
compose); |
| 4455 | 4448 |
|
| 4456 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE);
|
|
| 4449 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_SEND_QUEUE);
|
|
| 4457 | 4450 |
sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4458 | 4451 |
_("Send later"),
|
| 4459 | 4452 |
_("Put into queue folder and send later"),
|
| ... | ... | |
| 4462 | 4455 |
G_CALLBACK(toolbar_send_later_cb), |
| 4463 | 4456 |
compose); |
| 4464 | 4457 |
|
| 4465 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL);
|
|
| 4458 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL);
|
|
| 4466 | 4459 |
draft_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4467 | 4460 |
_("Draft"),
|
| 4468 | 4461 |
_("Save to draft folder"),
|
| ... | ... | |
| 4473 | 4466 |
|
| 4474 | 4467 |
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); |
| 4475 | 4468 |
|
| 4476 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_INSERT_FILE);
|
|
| 4469 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_INSERT_FILE);
|
|
| 4477 | 4470 |
insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4478 | 4471 |
_("Insert"),
|
| 4479 | 4472 |
_("Insert file"),
|
| ... | ... | |
| 4482 | 4475 |
G_CALLBACK(toolbar_insert_cb), |
| 4483 | 4476 |
compose); |
| 4484 | 4477 |
|
| 4485 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_ATTACH);
|
|
| 4478 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_ATTACH);
|
|
| 4486 | 4479 |
attach_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4487 | 4480 |
_("Attach"),
|
| 4488 | 4481 |
_("Attach file"),
|
| ... | ... | |
| 4493 | 4486 |
|
| 4494 | 4487 |
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); |
| 4495 | 4488 |
|
| 4496 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_SIGN);
|
|
| 4489 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_SIGN);
|
|
| 4497 | 4490 |
sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4498 | 4491 |
_("Signature"),
|
| 4499 | 4492 |
_("Insert signature"),
|
| ... | ... | |
| 4503 | 4496 |
|
| 4504 | 4497 |
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); |
| 4505 | 4498 |
|
| 4506 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
|
|
| 4499 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_MAIL_COMPOSE);
|
|
| 4507 | 4500 |
exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4508 | 4501 |
_("Editor"),
|
| 4509 | 4502 |
_("Edit with external editor"),
|
| ... | ... | |
| 4512 | 4505 |
G_CALLBACK(toolbar_ext_editor_cb), |
| 4513 | 4506 |
compose); |
| 4514 | 4507 |
|
| 4515 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_LINEWRAP);
|
|
| 4508 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_LINEWRAP);
|
|
| 4516 | 4509 |
linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4517 | 4510 |
_("Linewrap"),
|
| 4518 | 4511 |
_("Wrap all long lines"),
|
| ... | ... | |
| 4523 | 4516 |
|
| 4524 | 4517 |
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar)); |
| 4525 | 4518 |
|
| 4526 |
icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_ADDRESS_BOOK);
|
|
| 4519 |
icon_wid = stock_pixbuf_widget(NULL, STOCK_PIXMAP_ADDRESS_BOOK);
|
|
| 4527 | 4520 |
addrbook_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), |
| 4528 | 4521 |
_("Address"),
|
| 4529 | 4522 |
_("Address book"),
|
| ... | ... | |
| 4532 | 4525 |
G_CALLBACK(toolbar_address_cb), |
| 4533 | 4526 |
compose); |
| 4534 | 4527 |
|
| 4535 |
compose->toolbar = toolbar; |
|
| 4536 | 4528 |
compose->send_btn = send_btn; |
| 4537 | 4529 |
compose->sendl_btn = sendl_btn; |
| 4538 | 4530 |
compose->draft_btn = draft_btn; |
| ... | ... | |
| 4544 | 4536 |
compose->addrbook_btn = addrbook_btn; |
| 4545 | 4537 |
|
| 4546 | 4538 |
gtk_widget_show_all(toolbar); |
| 4539 |
|
|
| 4540 |
return toolbar; |
|
| 4547 | 4541 |
} |
| 4548 | 4542 |
|
| 4549 | 4543 |
static GtkWidget *compose_account_option_menu_create(Compose *compose) |
Also available in: Unified diff