2007-12-18 [colin] 3.2.0cvs3
authorColin Leroy <colin@colino.net>
Tue, 18 Dec 2007 07:13:12 +0000 (07:13 +0000)
committerColin Leroy <colin@colino.net>
Tue, 18 Dec 2007 07:13:12 +0000 (07:13 +0000)
* src/prefs_logging.c
Rework GUI, patch by Pawel

ChangeLog
PATCHSETS
configure.ac
src/prefs_logging.c

index f8fb56ea2ad70bbc631e7eadab4c90fb47ca10f1..cc78fc03296d75c5b3216d4b976a97d5ea57fcbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-18 [colin]     3.2.0cvs3
+
+       * src/prefs_logging.c
+               Rework GUI, patch by Pawel
+
 2007-12-18 [colin]     3.2.0cvs2
 
        * src/prefs_filtering_action.c
index 71d59ccbee24da79e3c6eb7c8115366ca10bc995..7d286b8f2ed7778c99f694279b93bad201cd9a4a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.58.2.35 -r 1.58.2.36 po/de.po;  cvs diff -u -r 1.42.2.34 -r 1.42.2.35 po/fr.po;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 po/hu.po;  cvs diff -u -r 1.34.2.24 -r 1.34.2.25 po/it.po;  cvs diff -u -r 1.50.2.28 -r 1.50.2.29 po/pt_BR.po;  ) > 3.1.0cvs79.patchset
 ( cvs diff -u -r 1.14.2.46 -r 1.14.2.47 src/editaddress.c;  ) > 3.2.0cvs1.patchset
 ( cvs diff -u -r 1.1.4.45 -r 1.1.4.46 src/prefs_filtering_action.c;  ) > 3.2.0cvs2.patchset
+( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_logging.c;  ) > 3.2.0cvs3.patchset
index a4ed8819110f2f0dcf1aed15f7444f1a60f18c6d..f6b44c11b4485dc17e7f99bb8d73412f88dbf4f0 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f8fca4052bec09a31101b5eefeae967b243f7f77..f37fe1933d9a38b5f5521fb7ae109c951c7a4eb8 100644 (file)
@@ -128,7 +128,9 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_log_warning;
        GtkWidget *checkbtn_log_error;
        GtkWidget *checkbtn_log_status;
-
+       GtkSizeGroup *log_size_group;
+       GtkSizeGroup *filter_size_group;
+       
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
@@ -210,6 +212,11 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start(GTK_BOX(hbox_checkbtn), gtk_label_new(""),
                           FALSE, TRUE, 0);
 
+       filter_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       gtk_size_group_add_widget(filter_size_group, checkbtn_filtering_log_inc);
+       gtk_size_group_add_widget(filter_size_group, checkbtn_filtering_log_manual);
+       gtk_size_group_add_widget(filter_size_group, checkbtn_filtering_log_folder_proc);
+
        SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, frame_filtering_log);
 
        hbox_filtering_log_level = gtk_hbox_new (FALSE, 8);
@@ -298,6 +305,10 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
                                _("Error messages"), &checkbtn_log_status,
                                _("Status messages for filtering/processing log"));
        gtk_box_pack_start(GTK_BOX(vbox_disc_log), hbox_checkbtn, FALSE, FALSE, 0);
+       
+       log_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       gtk_size_group_add_widget(log_size_group, checkbtn_log_warning);
+       gtk_size_group_add_widget(log_size_group, checkbtn_log_error);
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_clip_network_log), 
                prefs_common.cliplog);