gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2007-08-09 [colin] 2.10.0cvs107

Browse source 
* src/folderview.c
	* src/summaryview.c
	* src/gtk/prefswindow.c
		A few Maemo layout fixes
This commit is contained in:
Colin Leroy 2007-08-09 07:12:12 +00:00
parent 19ad2ef0f6
commit cb59748e66
6 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2007-08-09 [colin] 2.10.0cvs107
* src/folderview.c
* src/summaryview.c
* src/gtk/prefswindow.c
A few Maemo layout fixes
2007-08-09 [paul] 2.10.0cvs106
* src/prefs_account.c

1
PATCHSETS
View file

@ -2760,3 +2760,4 @@
( cvs diff -u -r 1.52.2.45 -r 1.52.2.46 src/prefs_folder_item.c; ) > 2.10.0cvs104.patchset
( cvs diff -u -r 1.52.2.46 -r 1.52.2.47 src/prefs_folder_item.c; ) > 2.10.0cvs105.patchset
( cvs diff -u -r 1.105.2.106 -r 1.105.2.107 src/prefs_account.c; ) > 2.10.0cvs106.patchset
( cvs diff -u -r 1.207.2.171 -r 1.207.2.172 src/folderview.c; cvs diff -u -r 1.395.2.317 -r 1.395.2.318 src/summaryview.c; cvs diff -u -r 1.12.2.39 -r 1.12.2.40 src/gtk/prefswindow.c; ) > 2.10.0cvs107.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=10
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=106
EXTRA_VERSION=107
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

20
src/folderview.c
View file

@ -377,9 +377,11 @@ static void create_ifactories(gpointer key, gpointer value, gpointer data)
static void folderview_column_set_titles(FolderView *folderview)
{
GtkWidget *ctree = folderview->ctree;
GtkWidget *label_folder;
GtkWidget *label_new;
GtkWidget *label_unread;
GtkWidget *label_total;
GtkWidget *hbox_folder;
GtkWidget *hbox_new;
GtkWidget *hbox_unread;
GtkWidget *hbox_total;
@ -397,18 +399,22 @@ static void folderview_column_set_titles(FolderView *folderview)
&unreadxpm, &unreadxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
&readxpm, &readxpmmask);
label_folder = gtk_label_new(_("Folder"));
label_new = gtk_image_new_from_pixmap(newxpm, newxpmmask);
label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
gtk_clist_column_titles_active(GTK_CLIST(ctree));
hbox_folder = gtk_hbox_new(FALSE, 4);
hbox_new = gtk_hbox_new(FALSE, 4);
hbox_unread = gtk_hbox_new(FALSE, 4);
hbox_total = gtk_hbox_new(FALSE, 4);
/* left justified */
gtk_box_pack_start(GTK_BOX(hbox_folder), label_folder, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC (label_folder), 0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
@ -416,14 +422,26 @@ static void folderview_column_set_titles(FolderView *folderview)
gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
gtk_widget_show_all(hbox_folder);
gtk_widget_show_all(hbox_new);
gtk_widget_show_all(hbox_unread);
gtk_widget_show_all(hbox_total);
#ifdef MAEMO
gtk_widget_set_size_request(hbox_new, -1, 20);
gtk_widget_set_size_request(hbox_unread, -1, 20);
gtk_widget_set_size_request(hbox_total, -1, 20);
#endif
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_FOLDER],hbox_folder);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
#ifdef MAEMO
GTK_EVENTS_FLUSH();
#endif
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_NEW], _("New"));
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_UNREAD], _("Unread"));
gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_TOTAL], _("Total"));

3
src/gtk/prefswindow.c
View file

@ -397,6 +397,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
prefswindow_build_all_pages(prefswindow, prefs_pages);
/* select first one or its first child if necessary */
#ifndef MAEMO
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter)) {
if (activate_child && gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter)) {
@ -406,7 +407,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
}
gtk_tree_selection_select_iter(selection, &iter);
}
#endif
adj = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
gtk_adjustment_set_value(adj, 0);

3
src/summaryview.c
View file

@ -2575,6 +2575,9 @@ static void summary_set_column_titles(SummaryView *summaryview)
hbox = gtk_hbox_new(FALSE, 4);
label = gtk_label_new(title);
#ifdef MAEMO
gtk_widget_set_size_request(hbox, -1, 20);
#endif
if (justify == GTK_JUSTIFY_RIGHT)
gtk_box_pack_end(GTK_BOX(hbox), label,