summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch')
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch1010
1 files changed, 0 insertions, 1010 deletions
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch b/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
deleted file mode 100644
index 81a2a6bd90..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
+++ /dev/null
@@ -1,1010 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Index: claws-mail-2.9.1/src/mainwindow.c
4===================================================================
5--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100
6+++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100
7@@ -189,9 +189,6 @@
8 static void toggle_statusbar_cb (MainWindow *mainwin,
9 guint action,
10 GtkWidget *widget);
11-static void set_layout_cb (MainWindow *mainwin,
12- guint action,
13- GtkWidget *widget);
14
15 static void addressbook_open_cb (MainWindow *mainwin,
16 guint action,
17@@ -538,94 +535,24 @@
18 {N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
19 {N_("/_Edit/_Quick search"), "slash", mainwindow_quicksearch, 0, NULL},
20 {N_("/_View"), NULL, NULL, 0, "<Branch>"},
21- {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
22- {N_("/_View/Show or hi_de/_Message view"),
23- "V", toggle_message_cb, 0, "<ToggleItem>"},
24- {N_("/_View/Show or hi_de/_Toolbar"),
25- NULL, NULL, 0, "<Branch>"},
26- {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
27- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
28- {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"),
29- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"},
30- {N_("/_View/Show or hi_de/_Toolbar/_Icons only"),
31- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
32- {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
33- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
34- {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
35- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
36- {N_("/_View/Show or hi_de/Status _bar"),
37- NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
38 {N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"},
39 {N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL},
40 {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
41
42 {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
43- {N_("/_View/La_yout"), NULL, NULL, 0, "<Branch>"},
44- {N_("/_View/Layout/_Standard"), NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
45- {N_("/_View/Layout/_Three columns"), NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
46- {N_("/_View/Layout/_Wide message"), NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"},
47- {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
48- {N_("/_View/Layout/S_mall screen"), NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"},
49- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
50 {N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
51- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
52- {N_("/_View/_Sort/by S_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
53- {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
54- {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
55- {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"},
56- {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
57- {N_("/_View/_Sort/by _color label"),
58- NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
59- {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
60- {N_("/_View/_Sort/by _status"), NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"},
61- {N_("/_View/_Sort/by a_ttachment"),
62- NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
63- {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
64- {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
65- {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
66+ {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "<RadioItem>"},
67+ {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by Date"},
68+ {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by Date"},
69+ {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by Date"},
70 {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
71 {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
72 {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
73- {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
74- {N_("/_View/_Sort/_Attract by subject"),
75- NULL, attract_by_subject_cb, 0, NULL},
76 {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
77 {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL},
78 {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL},
79 {N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"},
80
81- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
82- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
83- {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL},
84- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
85- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
86- {N_("/_View/_Go to/P_revious unread message"),
87- "<shift>P", prev_unread_cb, 0, NULL},
88- {N_("/_View/_Go to/N_ext unread message"),
89- "<shift>N", next_unread_cb, 0, NULL},
90- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
91- {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL},
92- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
93- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
94- {N_("/_View/_Go to/Previous _marked message"),
95- NULL, prev_marked_cb, 0, NULL},
96- {N_("/_View/_Go to/Next m_arked message"),
97- NULL, next_marked_cb, 0, NULL},
98- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
99- {N_("/_View/_Go to/Previous _labeled message"),
100- NULL, prev_labeled_cb, 0, NULL},
101- {N_("/_View/_Go to/Next la_beled message"),
102- NULL, next_labeled_cb, 0, NULL},
103- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
104- {N_("/_View/_Go to/Last read message"),
105- NULL, last_read_cb, 0, NULL},
106- {N_("/_View/_Go to/Parent message"),
107- "<control>Up", parent_cb, 0, NULL},
108- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
109- {N_("/_View/_Go to/Next unread _folder"), "<shift>G", goto_unread_folder_cb, 0, NULL},
110- {N_("/_View/_Go to/_Other folder..."), "G", goto_folder_cb, 0, NULL},
111- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
112-
113 #define ENC_SEPARATOR \
114 {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"}
115 #define ENC_ACTION(action) \
116@@ -742,7 +669,6 @@
117 #undef DEC_ACTION
118
119 {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
120- {N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
121 {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
122 {N_("/_View/All headers"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
123 {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"},
124@@ -1137,23 +1063,14 @@
125 gint i;
126 guint n_menu_entries;
127
128- static GdkGeometry geometry;
129-
130 debug_print("Creating main window...\n");
131 mainwin = g_new0(MainWindow, 1);
132
133 /* main window */
134 window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow");
135- gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
136+ gtk_window_set_title(GTK_WINDOW(window), _("Mail"));
137 gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
138
139- if (!geometry.min_height) {
140- geometry.min_width = 320;
141- geometry.min_height = 200;
142- }
143- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
144- GDK_HINT_MIN_SIZE);
145-
146 g_signal_connect(G_OBJECT(window), "delete_event",
147 G_CALLBACK(main_window_close_cb), mainwin);
148 MANAGE_WINDOW_SIGNALS_CONNECT(window);
149@@ -1184,21 +1101,9 @@
150 /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
151 main_create_mailing_list_menu (mainwin, NULL); */
152
153- menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL));
154-
155- if (prefs_common.toolbar_detachable) {
156- handlebox = gtk_handle_box_new();
157- gtk_widget_show(handlebox);
158- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
159- g_signal_connect(G_OBJECT(handlebox), "child_attached",
160- G_CALLBACK(toolbar_child_attached), mainwin);
161- g_signal_connect(G_OBJECT(handlebox), "child_detached",
162- G_CALLBACK(toolbar_child_detached), mainwin);
163- } else {
164- handlebox = gtk_hbox_new(FALSE, 0);
165- gtk_widget_show(handlebox);
166- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
167- }
168+ handlebox = gtk_hbox_new(FALSE, 0);
169+ gtk_widget_show(handlebox);
170+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
171 /* link window to mainwin->window to avoid gdk warnings */
172 mainwin->window = window;
173
174@@ -1405,36 +1310,6 @@
175 (ifactory, "/View/Character encoding/Auto detect");
176 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
177
178- switch (prefs_common.toolbar_style) {
179- case TOOLBAR_NONE:
180- menuitem = gtk_item_factory_get_item
181- (ifactory, "/View/Show or hide/Toolbar/Hide");
182- break;
183- case TOOLBAR_ICON:
184- menuitem = gtk_item_factory_get_item
185- (ifactory, "/View/Show or hide/Toolbar/Icons only");
186- break;
187- case TOOLBAR_TEXT:
188- menuitem = gtk_item_factory_get_item
189- (ifactory, "/View/Show or hide/Toolbar/Text only");
190- break;
191- case TOOLBAR_BOTH:
192- menuitem = gtk_item_factory_get_item
193- (ifactory, "/View/Show or hide/Toolbar/Text below icons");
194- break;
195- case TOOLBAR_BOTH_HORIZ:
196- menuitem = gtk_item_factory_get_item
197- (ifactory,
198- "/View/Show or hide/Toolbar/Text beside icons");
199- }
200- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
201-
202- gtk_widget_hide(mainwin->hbox_stat);
203- menuitem = gtk_item_factory_get_item
204- (ifactory, "/View/Show or hide/Status bar");
205- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
206- prefs_common.show_statusbar);
207-
208 /* set account selection menu */
209 ac_menu = gtk_item_factory_get_widget
210 (ifactory, "/Configuration/Change current account");
211@@ -2284,16 +2159,6 @@
212 {"/View/Expand all threads" , M_MSG_EXIST},
213 {"/View/Collapse all threads" , M_MSG_EXIST},
214 {"/View/Hide read messages" , M_HIDE_READ_MSG},
215- {"/View/Go to/Previous message" , M_MSG_EXIST},
216- {"/View/Go to/Next message" , M_MSG_EXIST},
217- {"/View/Go to/Previous unread message" , M_MSG_EXIST},
218- {"/View/Go to/Previous new message" , M_MSG_EXIST},
219- {"/View/Go to/Previous marked message" , M_MSG_EXIST},
220- {"/View/Go to/Previous labeled message", M_MSG_EXIST},
221- {"/View/Go to/Next labeled message", M_MSG_EXIST},
222- {"/View/Go to/Last read message" , M_SINGLE_TARGET_EXIST},
223- {"/View/Go to/Parent message" , M_SINGLE_TARGET_EXIST},
224- {"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
225 {"/View/Message source" , M_SINGLE_TARGET_EXIST},
226 {"/View/All headers" , M_SINGLE_TARGET_EXIST},
227 {"/View/Quotes" , M_SINGLE_TARGET_EXIST},
228@@ -2379,40 +2244,20 @@
229 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
230 }
231
232- SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
233- messageview_is_visible(mainwin->messageview));
234-
235 summaryview = mainwin->summaryview;
236- menu_path = "/View/Sort/Don't sort";
237+ menu_path = "/View/Sort/by Date";
238
239 switch (summaryview->sort_key) {
240- case SORT_BY_NUMBER:
241- menu_path = "/View/Sort/by number"; break;
242- case SORT_BY_SIZE:
243- menu_path = "/View/Sort/by Size"; break;
244- case SORT_BY_DATE:
245- menu_path = "/View/Sort/by Date"; break;
246 case SORT_BY_FROM:
247 menu_path = "/View/Sort/by From"; break;
248 case SORT_BY_TO:
249 menu_path = "/View/Sort/by To"; break;
250 case SORT_BY_SUBJECT:
251 menu_path = "/View/Sort/by Subject"; break;
252- case SORT_BY_LABEL:
253- menu_path = "/View/Sort/by color label"; break;
254- case SORT_BY_MARK:
255- menu_path = "/View/Sort/by mark"; break;
256- case SORT_BY_STATUS:
257- menu_path = "/View/Sort/by status"; break;
258- case SORT_BY_MIME:
259- menu_path = "/View/Sort/by attachment"; break;
260- case SORT_BY_SCORE:
261- menu_path = "/View/Sort/by score"; break;
262- case SORT_BY_LOCKED:
263- menu_path = "/View/Sort/by locked"; break;
264 case SORT_BY_NONE:
265+ case SORT_BY_DATE:
266 default:
267- menu_path = "/View/Sort/Don't sort"; break;
268+ menu_path = "/View/Sort/by Date"; break;
269 }
270 SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
271
272@@ -2735,8 +2580,6 @@
273 gtk_widget_destroy(mainwin->hpaned);
274 }
275
276- menu_set_sensitive(ifactory, "/View/Show or hide/Message view",
277- (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT));
278 switch (layout_mode) {
279 case VERTICAL_LAYOUT:
280 case NORMAL_LAYOUT:
281@@ -2877,37 +2720,6 @@
282
283 prefs_common.layout_mode = layout_mode;
284
285- menuitem = gtk_item_factory_get_item
286- (ifactory, "/View/Show or hide/Message view");
287- gtk_check_menu_item_set_active
288- (GTK_CHECK_MENU_ITEM(menuitem),
289- messageview_is_visible(mainwin->messageview));
290-
291-#define SET_CHECK_MENU_ACTIVE(path, active) \
292-{ \
293- menuitem = gtk_item_factory_get_widget(ifactory, path); \
294- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
295-}
296-
297- switch (prefs_common.layout_mode) {
298- case NORMAL_LAYOUT:
299- SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE);
300- break;
301- case VERTICAL_LAYOUT:
302- SET_CHECK_MENU_ACTIVE("/View/Layout/Three columns", TRUE);
303- break;
304- case WIDE_LAYOUT:
305- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message", TRUE);
306- break;
307- case WIDE_MSGLIST_LAYOUT:
308- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message list", TRUE);
309- break;
310- case SMALL_LAYOUT:
311- SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE);
312- break;
313- }
314-#undef SET_CHECK_MENU_ACTIVE
315-
316 if (folderwin) {
317 g_signal_connect
318 (G_OBJECT(folderwin), "size_allocate",
319@@ -3116,12 +2928,6 @@
320 summary_toggle_view(mainwin->summaryview);
321 }
322
323-static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
324- GtkWidget *widget)
325-{
326- toolbar_toggle(action, mainwin);
327-}
328-
329 static void main_window_reply_cb(MainWindow *mainwin, guint action,
330 GtkWidget *widget)
331 {
332Index: claws-mail-2.9.1/src/prefs_common.c
333===================================================================
334--- claws-mail-2.9.1.orig/src/prefs_common.c 2007-04-25 07:40:10.000000000 +0100
335+++ claws-mail-2.9.1/src/prefs_common.c 2007-04-25 07:42:17.000000000 +0100
336@@ -262,7 +262,7 @@
337 {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
338 NULL, NULL, NULL},
339
340-#ifndef MAEMO
341+#if 0
342 {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
343 NULL, NULL, NULL},
344 #else
345@@ -300,7 +300,7 @@
346 &prefs_common.normalfont_gtk1, P_STRING, NULL, NULL, NULL},
347
348 /* new fonts */
349-#ifndef MAEMO
350+#if 0
351 {"widget_font_gtk2", NULL,
352 &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL},
353 {"message_font_gtk2", "Monospace 9",
354@@ -416,7 +416,7 @@
355
356 {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
357 NULL, NULL, NULL},
358-#ifndef MAEMO
359+#if 0
360 {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
361 NULL, NULL, NULL},
362 #else
363@@ -544,7 +544,7 @@
364 {"folder_col_pos_total", "3",
365 &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
366
367-#ifndef MAEMO
368+#if 0
369 {"folder_col_size_folder", "120",
370 &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
371 {"folder_col_size_new", "32",
372@@ -702,7 +702,7 @@
373 &SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL},
374
375 /* Interface */
376-#ifndef MAEMO
377+#if 0
378 {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
379 NULL, NULL, NULL},
380 #else
381Index: claws-mail-2.9.1/src/toolbar.c
382===================================================================
383--- claws-mail-2.9.1.orig/src/toolbar.c 2007-04-25 07:40:10.000000000 +0100
384+++ claws-mail-2.9.1/src/toolbar.c 2007-04-25 07:42:17.000000000 +0100
385@@ -841,26 +841,17 @@
386 gtk_widget_hide(handlebox_wid);
387 break;
388 case TOOLBAR_ICON:
389- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
390- GTK_TOOLBAR_ICONS);
391- break;
392 case TOOLBAR_TEXT:
393- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
394- GTK_TOOLBAR_TEXT);
395- break;
396 case TOOLBAR_BOTH:
397- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
398- GTK_TOOLBAR_BOTH);
399- break;
400 case TOOLBAR_BOTH_HORIZ:
401 gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
402- GTK_TOOLBAR_BOTH_HORIZ);
403+ GTK_TOOLBAR_ICONS);
404 break;
405 default:
406 return;
407 }
408
409- prefs_common.toolbar_style = (ToolbarStyle)action;
410+ prefs_common.toolbar_style = (ToolbarStyle)TOOLBAR_ICON;
411 gtk_widget_set_size_request(handlebox_wid, 1, -1);
412
413 if (prefs_common.toolbar_style != TOOLBAR_NONE) {
414@@ -1594,7 +1585,7 @@
415 gtk_container_add(GTK_CONTAINER(container), toolbar);
416 gtk_container_set_border_width(GTK_CONTAINER(container), 2);
417 gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
418- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
419+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
420
421 for (cur = toolbar_list; cur != NULL; cur = cur->next) {
422
423Index: claws-mail-2.9.1/src/gtk/prefswindow.c
424===================================================================
425--- claws-mail-2.9.1.orig/src/gtk/prefswindow.c 2007-04-25 07:40:10.000000000 +0100
426+++ claws-mail-2.9.1/src/gtk/prefswindow.c 2007-04-25 10:30:15.000000000 +0100
427@@ -343,6 +343,10 @@
428 gint x = gdk_screen_width();
429 gint y = gdk_screen_height();
430 static GdkGeometry geometry;
431+ gint col_count = g_slist_length (prefs_pages);
432+
433+ if (col_count > 1)
434+ col_count = 2;
435
436 prefswindow = g_new0(PrefsWindow, 1);
437
438@@ -360,39 +364,52 @@
439 gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
440 gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
441
442- prefswindow->table1 = gtk_table_new(2, 2, FALSE);
443+ prefswindow->table1 = gtk_table_new(col_count, col_count, FALSE);
444 gtk_widget_show(prefswindow->table1);
445 gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->table1);
446
447- prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
448- gtk_widget_show(prefswindow->scrolledwindow1);
449- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
450- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
451-
452- prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
453- gtk_widget_show(prefswindow->tree_view);
454- gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
455- prefswindow->tree_view);
456-
457- prefswindow->frame = gtk_frame_new(NULL);
458- gtk_widget_show(prefswindow->frame);
459- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
460- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
461-
462- prefswindow->table2 = gtk_table_new(1, 2, FALSE);
463- gtk_widget_show(prefswindow->table2);
464- gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
465-
466- prefswindow->labelframe = gtk_frame_new(NULL);
467- gtk_widget_show(prefswindow->labelframe);
468- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
469- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
470-
471- prefswindow->pagelabel = gtk_label_new("");
472- gtk_widget_show(prefswindow->pagelabel);
473- gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
474- gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
475- gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
476+ if (col_count > 1)
477+ {
478+ prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
479+ gtk_widget_show(prefswindow->scrolledwindow1);
480+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
481+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
482+
483+ prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
484+ gtk_widget_show(prefswindow->tree_view);
485+ gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
486+ prefswindow->tree_view);
487+
488+ prefswindow->frame = gtk_frame_new(NULL);
489+ gtk_widget_show(prefswindow->frame);
490+ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
491+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, col_count - 1, col_count, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
492+
493+ prefswindow->table2 = gtk_table_new(1, 2, FALSE);
494+ gtk_widget_show(prefswindow->table2);
495+ gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
496+ }
497+ else
498+ {
499+ prefswindow->table2 = gtk_table_new(1, 2, FALSE);
500+ gtk_widget_show(prefswindow->table2);
501+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->table2, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
502+ }
503+
504+
505+ if (col_count > 1)
506+ {
507+ prefswindow->labelframe = gtk_frame_new(NULL);
508+ gtk_widget_show(prefswindow->labelframe);
509+ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
510+ gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
511+
512+ prefswindow->pagelabel = gtk_label_new("");
513+ gtk_widget_show(prefswindow->pagelabel);
514+ gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
515+ gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
516+ gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
517+ }
518
519 prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL);
520 gtk_widget_show(prefswindow->scrolledwindow2);
521@@ -411,9 +428,38 @@
522 gtk_widget_show(prefswindow->empty_page);
523 gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page);
524
525- prefswindow_build_tree(prefswindow->tree_view, prefs_pages);
526+ if (col_count > 1)
527+ {
528+ prefswindow_build_tree(prefswindow->tree_view, prefs_pages);
529+
530+ gtk_widget_grab_focus(prefswindow->tree_view);
531+ }
532+ else
533+ {
534+ PrefsPage * page = prefs_pages->data;
535+ gint pagenum;
536+ GtkAdjustment *adj;
537+
538+ if (!page->page_open)
539+ {
540+ page->create_widget(page,
541+ GTK_WINDOW(prefswindow->window),
542+ prefswindow->data);
543+ gtk_container_add(GTK_CONTAINER(prefswindow->notebook),
544+ page->widget);
545+ page->page_open = TRUE;
546+ }
547+
548+ pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
549+ page->widget);
550+ gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
551+ pagenum);
552
553- gtk_widget_grab_focus(prefswindow->tree_view);
554+ adj = gtk_scrolled_window_get_vadjustment(
555+ GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
556+ gtk_adjustment_set_value(adj, 0);
557+
558+ }
559
560 gtkut_stock_button_set_create(&prefswindow->confirm_area,
561 &prefswindow->apply_btn, GTK_STOCK_APPLY,
562@@ -440,28 +486,6 @@
563 G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
564 #endif
565
566- /* connect to callback only if we hhave non-NULL pointers to store size to */
567- if (prefswindow->save_width && prefswindow->save_height) {
568- g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate",
569- G_CALLBACK(prefs_size_allocate_cb), prefswindow);
570- }
571-
572- if (!geometry.min_height) {
573-
574- if (x < 800 && y < 600) {
575- geometry.min_width = 600;
576- geometry.min_height = 440;
577- } else {
578- geometry.min_width = 700;
579- geometry.min_height = 550;
580- }
581- }
582- gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry,
583- GDK_HINT_MIN_SIZE);
584- if (prefswindow->save_width && prefswindow->save_height) {
585- gtk_widget_set_size_request(prefswindow->window, *(prefswindow->save_width),
586- *(prefswindow->save_height));
587- }
588
589 gtk_widget_show(prefswindow->window);
590 #ifdef MAEMO
591Index: claws-mail-2.9.1/src/compose.c
592===================================================================
593--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 07:40:10.000000000 +0100
594+++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:18:13.000000000 +0100
595@@ -352,9 +352,6 @@
596
597 /* callback functions */
598
599-static gboolean compose_edit_size_alloc (GtkEditable *widget,
600- GtkAllocation *allocation,
601- GtkSHRuler *shruler);
602 static void account_activated (GtkComboBox *optmenu,
603 gpointer data);
604 static void attach_selected (GtkTreeView *tree_view,
605@@ -439,9 +436,6 @@
606 guint action,
607 GtkWidget *widget);
608
609-static void compose_toggle_ruler_cb (gpointer data,
610- guint action,
611- GtkWidget *widget);
612 static void compose_toggle_sign_cb (gpointer data,
613 guint action,
614 GtkWidget *widget);
615@@ -788,7 +782,6 @@
616 ENC_ACTION(C_WINDOWS_874)},
617
618 {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
619- {N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
620 {N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
621 {N_("/_Tools/_Template"), NULL, NULL, 0, "<Branch>"},
622 {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
623@@ -2067,7 +2060,6 @@
624 menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE);
625 menu_set_sensitive(ifactory, "/Edit", FALSE);
626 menu_set_sensitive(ifactory, "/Options", FALSE);
627- menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
628 menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
629
630 if (compose->toolbar->draft_btn)
631@@ -5684,7 +5676,7 @@
632 g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
633 G_CALLBACK(compose_grab_focus_cb), compose);
634 gtk_widget_show(combo);
635- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
636+ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_FILL, GTK_FILL, 0, 0);
637 if (compose->header_last) {
638 const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
639 string = headers;
640@@ -5778,7 +5770,7 @@
641
642 static GtkWidget *compose_create_header(Compose *compose)
643 {
644- GtkWidget *from_optmenu_hbox;
645+ GtkWidget *from_optmenu;
646 GtkWidget *header_scrolledwin;
647 GtkWidget *header_table;
648
649@@ -5788,18 +5780,20 @@
650 header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
651 gtk_widget_show(header_scrolledwin);
652 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
653-
654 header_table = gtk_table_new(2, 2, FALSE);
655+ gtk_table_set_col_spacings (GTK_TABLE (header_table), BORDER_WIDTH);
656 gtk_widget_show(header_table);
657 gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
658 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
659- gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN);
660+ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE);
661 count = 0;
662
663 /* option menu for selecting accounts */
664- from_optmenu_hbox = compose_account_option_menu_create(compose);
665- gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
666- 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
667+ from_optmenu = compose_account_option_menu_create(compose);
668+ gtk_table_attach(GTK_TABLE(header_table), from_optmenu,
669+ 0, 1, count, count + 1, GTK_FILL, GTK_FILL, 0, 0);
670+ gtk_table_attach(GTK_TABLE(header_table), compose->from_name,
671+ 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
672 count++;
673
674 compose->header_table = header_table;
675@@ -6140,15 +6134,12 @@
676 GtkWidget *vbox2;
677
678 GtkWidget *label;
679- GtkWidget *subject_hbox;
680- GtkWidget *subject_frame;
681+ GtkWidget *edit_frame;
682 GtkWidget *subject_entry;
683 GtkWidget *subject;
684 GtkWidget *paned;
685
686 GtkWidget *edit_vbox;
687- GtkWidget *ruler_hbox;
688- GtkWidget *ruler;
689 GtkWidget *scrolledwin;
690 GtkWidget *text;
691 GtkTextBuffer *buffer;
692@@ -6169,8 +6160,6 @@
693 GtkAspell * gtkaspell = NULL;
694 #endif
695
696- static GdkGeometry geometry;
697-
698 g_return_val_if_fail(account != NULL, NULL);
699
700 debug_print("Creating compose window...\n");
701@@ -6190,28 +6179,6 @@
702
703 window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
704
705- gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
706- gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
707-
708- if (!geometry.max_width) {
709- geometry.max_width = gdk_screen_width();
710- geometry.max_height = gdk_screen_height();
711- }
712-
713- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
714- &geometry, GDK_HINT_MAX_SIZE);
715- if (!geometry.min_width) {
716- geometry.min_width = 600;
717- geometry.min_height = 480;
718- }
719- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
720- &geometry, GDK_HINT_MIN_SIZE);
721-
722-#ifndef MAEMO
723- if (compose_force_window_origin)
724- gtk_widget_set_uposition(window, prefs_common.compose_x,
725- prefs_common.compose_y);
726-#endif
727 g_signal_connect(G_OBJECT(window), "delete_event",
728 G_CALLBACK(compose_delete_cb), compose);
729 MANAGE_WINDOW_SIGNALS_CONNECT(window);
730@@ -6227,11 +6194,7 @@
731 n_menu_entries, "<Compose>", compose);
732 gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
733
734- if (prefs_common.toolbar_detachable) {
735- handlebox = gtk_handle_box_new();
736- } else {
737- handlebox = gtk_hbox_new(FALSE, 0);
738- }
739+ handlebox = gtk_hbox_new(FALSE, 0);
740 gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
741
742 gtk_widget_realize(handlebox);
743@@ -6244,7 +6207,6 @@
744
745 /* Notebook */
746 notebook = gtk_notebook_new();
747- gtk_widget_set_size_request(notebook, -1, 130);
748 gtk_widget_show(notebook);
749
750 /* header labels and entries */
751@@ -6258,18 +6220,10 @@
752 /* Others Tab */
753 gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
754 compose_create_others(compose),
755- gtk_label_new_with_mnemonic(_("Othe_rs")));
756+ gtk_label_new_with_mnemonic(_("Othe_r")));
757
758 /* Subject */
759- subject_hbox = gtk_hbox_new(FALSE, 0);
760- gtk_widget_show(subject_hbox);
761-
762- subject_frame = gtk_frame_new(NULL);
763- gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE);
764- gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
765- gtk_widget_show(subject_frame);
766-
767- subject = gtk_hbox_new(FALSE, HSPACING_NARROW);
768+ subject = gtk_hbox_new(FALSE, BORDER_WIDTH);
769 gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
770 gtk_widget_show(subject);
771
772@@ -6283,20 +6237,16 @@
773 G_CALLBACK(compose_grab_focus_cb), compose);
774 gtk_widget_show(subject_entry);
775 compose->subject_entry = subject_entry;
776- gtk_container_add(GTK_CONTAINER(subject_frame), subject);
777
778- edit_vbox = gtk_vbox_new(FALSE, 0);
779+ edit_vbox = gtk_vbox_new(FALSE, BORDER_WIDTH);
780+ gtk_container_set_border_width(GTK_CONTAINER(edit_vbox), BORDER_WIDTH);
781
782- gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
783+ gtk_box_pack_start(GTK_BOX(edit_vbox), subject, FALSE, FALSE, 0);
784
785- /* ruler */
786- ruler_hbox = gtk_hbox_new(FALSE, 0);
787- gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
788-
789- ruler = gtk_shruler_new();
790- gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
791- gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
792- BORDER_WIDTH);
793+ edit_frame = gtk_frame_new(NULL);
794+ gtk_frame_set_shadow_type(GTK_FRAME(edit_frame), GTK_SHADOW_IN);
795+ gtk_widget_show(edit_frame);
796+ gtk_container_add(GTK_CONTAINER(edit_frame), edit_vbox);
797
798 /* text widget */
799 scrolledwin = gtk_scrolled_window_new(NULL, NULL);
800@@ -6317,9 +6267,6 @@
801
802 gtk_container_add(GTK_CONTAINER(scrolledwin), text);
803
804- g_signal_connect_after(G_OBJECT(text), "size_allocate",
805- G_CALLBACK(compose_edit_size_alloc),
806- ruler);
807 g_signal_connect(G_OBJECT(buffer), "changed",
808 G_CALLBACK(compose_changed_cb), compose);
809 g_signal_connect(G_OBJECT(text), "grab_focus",
810@@ -6363,7 +6310,7 @@
811 gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230);
812 #endif
813 gtk_paned_add1(GTK_PANED(paned), notebook);
814- gtk_paned_add2(GTK_PANED(paned), edit_vbox);
815+ gtk_paned_add2(GTK_PANED(paned), edit_frame);
816 gtk_widget_show_all(paned);
817
818
819@@ -6408,8 +6355,6 @@
820
821 compose->notebook = notebook;
822 compose->edit_vbox = edit_vbox;
823- compose->ruler_hbox = ruler_hbox;
824- compose->ruler = ruler;
825 compose->scrolledwin = scrolledwin;
826 compose->text = text;
827
828@@ -6531,13 +6476,6 @@
829
830 compose_list = g_list_append(compose_list, compose);
831
832- if (!prefs_common.show_ruler)
833- gtk_widget_hide(ruler_hbox);
834-
835- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler");
836- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
837- prefs_common.show_ruler);
838-
839 /* Priority */
840 compose->priority = PRIORITY_NORMAL;
841 compose_update_priority_menu_item(compose);
842@@ -6568,7 +6506,6 @@
843 static GtkWidget *compose_account_option_menu_create(Compose *compose)
844 {
845 GList *accounts;
846- GtkWidget *hbox;
847 GtkWidget *optmenu;
848 GtkWidget *optmenubox;
849 GtkListStore *menu;
850@@ -6584,7 +6521,6 @@
851 optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
852 menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
853
854- hbox = gtk_hbox_new(FALSE, 6);
855 from_name = gtk_entry_new();
856
857 g_signal_connect_after(G_OBJECT(from_name), "grab_focus",
858@@ -6623,9 +6559,6 @@
859 G_CALLBACK(account_activated),
860 compose);
861
862- gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
863- gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
864-
865 gtk_tooltips_set_tip(compose->tooltips, optmenubox,
866 _("Account to use for this email"), NULL);
867 gtk_tooltips_set_tip(compose->tooltips, from_name,
868@@ -6633,7 +6566,7 @@
869
870 compose->from_name = from_name;
871
872- return hbox;
873+ return optmenubox;
874 }
875
876 static void compose_set_priority_cb(gpointer data,
877@@ -7851,32 +7784,6 @@
878
879 /* callback functions */
880
881-/* compose_edit_size_alloc() - called when resized. don't know whether Gtk
882- * includes "non-client" (windows-izm) in calculation, so this calculation
883- * may not be accurate.
884- */
885-static gboolean compose_edit_size_alloc(GtkEditable *widget,
886- GtkAllocation *allocation,
887- GtkSHRuler *shruler)
888-{
889- if (prefs_common.show_ruler) {
890- gint char_width = 0, char_height = 0;
891- gint line_width_in_chars;
892-
893- gtkut_get_font_size(GTK_WIDGET(widget),
894- &char_width, &char_height);
895- line_width_in_chars =
896- (allocation->width - allocation->x) / char_width;
897-
898- /* got the maximum */
899- gtk_ruler_set_range(GTK_RULER(shruler),
900- 0.0, line_width_in_chars, 0,
901- /*line_width_in_chars*/ char_width);
902- }
903-
904- return TRUE;
905-}
906-
907 static void account_activated(GtkComboBox *optmenu, gpointer data)
908 {
909 Compose *compose = (Compose *)data;
910@@ -9040,21 +8947,6 @@
911 compose_update_privacy_system_menu_item(compose, warn);
912 }
913
914-static void compose_toggle_ruler_cb(gpointer data, guint action,
915- GtkWidget *widget)
916-{
917- Compose *compose = (Compose *)data;
918-
919- if (GTK_CHECK_MENU_ITEM(widget)->active) {
920- gtk_widget_show(compose->ruler_hbox);
921- prefs_common.show_ruler = TRUE;
922- } else {
923- gtk_widget_hide(compose->ruler_hbox);
924- gtk_widget_queue_resize(compose->edit_vbox);
925- prefs_common.show_ruler = FALSE;
926- }
927-}
928-
929 static void compose_attach_drag_received_cb (GtkWidget *widget,
930 GdkDragContext *context,
931 gint x,
932Index: claws-mail-2.9.1/src/folderview.c
933===================================================================
934--- claws-mail-2.9.1.orig/src/folderview.c 2007-04-03 19:10:25.000000000 +0100
935+++ claws-mail-2.9.1/src/folderview.c 2007-04-25 10:28:00.000000000 +0100
936@@ -73,6 +73,11 @@
937 #define COL_FOLDER_WIDTH 150
938 #define COL_NUM_WIDTH 32
939
940+/* added dummy column to stop the last column from
941+ * resizing insanely in small screen view
942+ */
943+#define _N_FOLDER_COLS (N_FOLDER_COLS + 1)
944+
945 static GList *folderview_list = NULL;
946
947 static GtkStyle *normal_style;
948@@ -448,7 +453,7 @@
949 gint *col_pos;
950 FolderColumnState *col_state;
951 FolderColumnType type;
952- gchar *titles[N_FOLDER_COLS];
953+ gchar *titles[_N_FOLDER_COLS];
954 gint i;
955 GtkWidget *scrolledwin = folderview->scrolledwin;
956
957@@ -471,8 +476,9 @@
958 titles[col_pos[F_COL_UNREAD]] = _("Unread");
959 /* TRANSLATORS: This in Number sign in American style */
960 titles[col_pos[F_COL_TOTAL]] = _("#");
961+ titles[F_COL_DUMMY] = "";
962
963- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
964+ ctree = gtk_sctree_new_with_titles(_N_FOLDER_COLS, col_pos[F_COL_FOLDER],
965 titles);
966
967 gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
968@@ -510,6 +516,9 @@
969 (GTK_CLIST(ctree), i, col_state[i].visible);
970 }
971
972+ GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
973+ GTK_CAN_FOCUS);
974+
975 g_signal_connect(G_OBJECT(ctree), "key_press_event",
976 G_CALLBACK(folderview_key_pressed),
977 folderview);
978@@ -605,9 +614,6 @@
979 (GTK_SCROLLED_WINDOW(scrolledwin),
980 GTK_POLICY_AUTOMATIC,
981 prefs_common.folderview_vscrollbar_policy);
982- gtk_widget_set_size_request(scrolledwin,
983- prefs_common.folderview_width,
984- prefs_common.folderview_height);
985
986 folderview->scrolledwin = scrolledwin;
987 ctree = folderview_ctree_create(folderview);
988@@ -2268,7 +2274,7 @@
989 static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
990 {
991 GtkCTree *ctree = GTK_CTREE(folderview->ctree);
992- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
993+ gchar *text[_N_FOLDER_COLS] = {NULL, "0", "0", "0", ""};
994 GtkCTreeNode *node, *parent_node;
995 gint *col_pos = folderview->col_pos;
996 FolderItemUpdateData hookdata;
997Index: claws-mail-2.9.1/src/folderview.h
998===================================================================
999--- claws-mail-2.9.1.orig/src/folderview.h 2007-03-22 17:22:52.000000000 +0000
1000+++ claws-mail-2.9.1/src/folderview.h 2007-04-25 10:16:55.000000000 +0100
1001@@ -37,7 +37,8 @@
1002 F_COL_FOLDER,
1003 F_COL_NEW,
1004 F_COL_UNREAD,
1005- F_COL_TOTAL
1006+ F_COL_TOTAL,
1007+ F_COL_DUMMY
1008 } FolderColumnType;
1009
1010 #define N_FOLDER_COLS 4
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-28 02:29:45 +0000