Menu
▾
▴
[Corem-cvs] CORE CVS: src smugg
|
From: CORE C. L. <cor...@li...> - 2000-11-23 01:08:39
|
Core CVS committal
Author : smugg
Project : core
Module : src
Modified Files:
core.h main.c menus.c panes.c panes.h prefs.c
Log Message:
added some menuitems, where you can change the ctree line style....
===================================================================
RCS file: /cvsroot/corem/core/src/core.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- core.h 2000/11/22 09:02:01 1.8
+++ core.h 2000/11/23 01:08:37 1.9
@@ -20,4 +20,6 @@
gboolean ml_subject;
gboolean ml_date;
gboolean ml_server;
+ gboolean ml_linestyle;
+ gboolean fl_linestyle;
} ConfigData;
===================================================================
RCS file: /cvsroot/corem/core/src/main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- main.c 2000/11/22 23:45:00 1.13
+++ main.c 2000/11/23 01:08:37 1.14
@@ -93,6 +93,18 @@
thandle = gtk_handle_box_new();
create_main_toolbar();
+
+
+ hpane = gtk_hpaned_new();
+
+ {
+ pane = core_create_folder_pane();
+ gtk_paned_pack1(GTK_PANED(hpane), pane, TRUE, TRUE);
+
+ pane = core_create_mlist_pane();
+ gtk_paned_pack2(GTK_PANED(hpane), pane, TRUE, TRUE);
+ }
+
main_menu = create_main_menu();
gtk_container_set_border_width(GTK_CONTAINER(main_menu), 0);
gtk_container_add(GTK_CONTAINER(mhandle), main_menu);
@@ -105,17 +117,7 @@
GTK_POS_LEFT);
gtk_box_pack_start(GTK_BOX(main_vbox), thandle, FALSE, FALSE, 0);
- hpane = gtk_hpaned_new();
gtk_box_pack_start(GTK_BOX(main_vbox), hpane, TRUE, TRUE, 0);
-
- {
- pane = core_create_folder_pane();
- gtk_paned_pack1(GTK_PANED(hpane), pane, TRUE, TRUE);
-
- pane = core_create_mlist_pane();
- gtk_paned_pack2(GTK_PANED(hpane), pane, TRUE, TRUE);
- }
-
gtk_widget_show_all(main_win);
if (config.tb_show == 0) {
===================================================================
RCS file: /cvsroot/corem/core/src/menus.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- menus.c 2000/11/22 23:45:00 1.7
+++ menus.c 2000/11/23 01:08:37 1.8
@@ -2,6 +2,7 @@
#include "core.h"
#include "menus.h"
#include "callbacks.h"
+#include "panes.h"
#include "prefs.h"
ConfigData config;
@@ -40,9 +41,14 @@
*viewmenu, *help, *helpmenu;
GtkWidget *quit, *accounts, *preferences, *themes, *themesmenu,
*toolbar, *toolbarmenu, *show, *text, *icons, *both, *about,
- *message_list, *message_listmenu, *mpriority, *mread,
- *mattachment, *mscore, *mfrom, *msubject, *mdate, *mserver;
+ *message_list, *message_listmenu, *mline_style, *mline_stylemenu,
+ *mline_none, *mline_solid, *mline_dotted, *mline_tabbed, *folder_list,
+ *folder_listmenu, *fline_style, *fline_stylemenu, *fline_none,
+ *fline_solid, *fline_dotted, *fline_tabbed, *mpriority,
+ *mread, *mattachment, *mscore, *mfrom, *msubject, *mdate, *mserver;
GSList *radio_buttons = NULL;
+ GSList *mline_radio = NULL;
+ GSList *fline_radio = NULL;
menu = gtk_menu_bar_new();
/********************************
* File menu *
@@ -166,6 +172,52 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(message_list),
message_listmenu);
+ mline_style = gtk_menu_item_new_with_label("Line Style");
+ gtk_menu_append(GTK_MENU(message_listmenu), mline_style);
+
+ mline_stylemenu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mline_style), mline_stylemenu);
+
+ mline_none = gtk_radio_menu_item_new_with_label(mline_radio, "None");
+ mline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mline_none));
+ gtk_signal_connect_object(GTK_OBJECT(mline_none), "toggled",
+ GTK_SIGNAL_FUNC(mail_ctree_change_line_style),
+ GINT_TO_POINTER(0));
+ gtk_menu_append(GTK_MENU(mline_stylemenu), mline_none);
+
+ mline_solid = gtk_radio_menu_item_new_with_label(mline_radio, "Solid");
+ mline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mline_solid));
+ gtk_signal_connect_object(GTK_OBJECT(mline_solid), "toggled",
+ GTK_SIGNAL_FUNC(mail_ctree_change_line_style),
+ GINT_TO_POINTER(1));
+ gtk_menu_append(GTK_MENU(mline_stylemenu), mline_solid);
+
+ mline_dotted = gtk_radio_menu_item_new_with_label(mline_radio, "Dotted");
+ mline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mline_dotted));
+ gtk_signal_connect_object(GTK_OBJECT(mline_none), "toggled",
+ GTK_SIGNAL_FUNC(mail_ctree_change_line_style),
+ GINT_TO_POINTER(2));
+ gtk_menu_append(GTK_MENU(mline_stylemenu), mline_dotted);
+
+ mline_tabbed = gtk_radio_menu_item_new_with_label(mline_radio, "Tabbed");
+ mline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mline_tabbed));
+ gtk_signal_connect_object(GTK_OBJECT(mline_tabbed), "toggled",
+ GTK_SIGNAL_FUNC(mail_ctree_change_line_style),
+ GINT_TO_POINTER(3));
+ gtk_menu_append(GTK_MENU(mline_stylemenu), mline_tabbed);
+
+ if (config.ml_linestyle == 0)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mline_none), TRUE);
+
+ if (config.ml_linestyle == 1)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mline_solid), TRUE);
+
+ if (config.ml_linestyle == 2)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mline_dotted), TRUE);
+
+ if (config.ml_linestyle == 3)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mline_tabbed), TRUE);
+
mpriority = gtk_check_menu_item_new_with_label("Show Priority");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpriority),
FALSE);
@@ -226,6 +278,59 @@
if (config.ml_server == 1)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM
(mserver), TRUE);
+
+ folder_list = gtk_menu_item_new_with_label("Folder List");
+ gtk_menu_append(GTK_MENU(viewmenu), folder_list);
+
+ folder_listmenu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(folder_list),
+ folder_listmenu);
+
+ fline_style = gtk_menu_item_new_with_label("Line Style");
+ gtk_menu_append(GTK_MENU(folder_listmenu), fline_style);
+
+ fline_stylemenu = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(fline_style), fline_stylemenu);
+
+ fline_none = gtk_radio_menu_item_new_with_label(fline_radio, "None");
+ fline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(fline_none));
+ gtk_signal_connect_object(GTK_OBJECT(fline_none), "toggled",
+ GTK_SIGNAL_FUNC(folder_ctree_change_line_style),
+ GINT_TO_POINTER(0));
+ gtk_menu_append(GTK_MENU(fline_stylemenu), fline_none);
+
+ fline_solid = gtk_radio_menu_item_new_with_label(fline_radio, "Solid");
+ fline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(fline_solid));
+ gtk_signal_connect_object(GTK_OBJECT(fline_solid), "toggled",
+ GTK_SIGNAL_FUNC(folder_ctree_change_line_style),
+ GINT_TO_POINTER(1));
+ gtk_menu_append(GTK_MENU(fline_stylemenu), fline_solid);
+
+ fline_dotted = gtk_radio_menu_item_new_with_label(fline_radio, "Dotted");
+ fline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(fline_dotted));
+ gtk_signal_connect_object(GTK_OBJECT(fline_none), "toggled",
+ GTK_SIGNAL_FUNC(folder_ctree_change_line_style),
+ GINT_TO_POINTER(2));
+ gtk_menu_append(GTK_MENU(fline_stylemenu), fline_dotted);
+
+ fline_tabbed = gtk_radio_menu_item_new_with_label(fline_radio, "Tabbed");
+ fline_radio = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(fline_tabbed));
+ gtk_signal_connect_object(GTK_OBJECT(fline_tabbed), "toggled",
+ GTK_SIGNAL_FUNC(folder_ctree_change_line_style),
+ GINT_TO_POINTER(3));
+ gtk_menu_append(GTK_MENU(fline_stylemenu), fline_tabbed);
+
+ if (config.fl_linestyle == 0)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(fline_none), TRUE);
+
+ if (config.fl_linestyle == 1)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(fline_solid), TRUE);
+
+ if (config.fl_linestyle == 2)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(fline_dotted), TRUE);
+
+ if (config.fl_linestyle == 3)
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(fline_tabbed), TRUE);
/********************************
* Help menu *
===================================================================
RCS file: /cvsroot/corem/core/src/panes.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- panes.c 2000/11/22 23:45:00 1.9
+++ panes.c 2000/11/23 01:08:37 1.10
@@ -96,7 +96,17 @@
gtk_clist_set_column_width(GTK_CLIST(folder_ctree), 0, 100);
gtk_widget_set_usize(scroll, 12, 50);
+ gtk_widget_show_all(folder_ctree);
+ if (config.ml_linestyle == 0)
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_NONE);
+ if (config.ml_linestyle == 1)
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_SOLID);
+ if (config.ml_linestyle == 2)
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_DOTTED);
+ if (config.ml_linestyle == 3)
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_TABBED);
+
return (scroll);
}
@@ -268,7 +278,15 @@
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(scroll), mail_ctree);
-
+ gtk_widget_show_all(mail_ctree);
+ if (config.ml_linestyle == 0)
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_NONE);
+ if (config.ml_linestyle == 1)
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_SOLID);
+ if (config.ml_linestyle == 2)
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_DOTTED);
+ if (config.ml_linestyle == 3)
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_TABBED);
return (scroll);
}
@@ -474,4 +492,52 @@
gtk_box_pack_start(GTK_BOX(vbox), scroll, TRUE, TRUE, 0);
return (vbox);
+}
+
+
+void folder_ctree_change_line_style(gint type)
+{
+ if (type == 0) {
+ config.fl_linestyle = 0;
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_NONE);
+ }
+
+ if (type == 1) {
+ config.fl_linestyle = 1;
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_SOLID);
+ }
+
+ if (type == 2) {
+ config.fl_linestyle = 2;
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_DOTTED);
+ }
+
+ if (type == 3) {
+ config.fl_linestyle = 3;
+ gtk_ctree_set_line_style(GTK_CTREE(folder_ctree), GTK_CTREE_LINES_TABBED);
+ }
+}
+
+
+void mail_ctree_change_line_style(gint type)
+{
+ if (type == 0) {
+ config.ml_linestyle = 0;
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_NONE);
+ }
+
+ if (type == 1) {
+ config.ml_linestyle = 1;
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_SOLID);
+ }
+
+ if (type == 2) {
+ config.ml_linestyle = 2;
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_DOTTED);
+ }
+
+ if (type == 3) {
+ config.ml_linestyle = 3;
+ gtk_ctree_set_line_style(GTK_CTREE(mail_ctree), GTK_CTREE_LINES_TABBED);
+ }
}
===================================================================
RCS file: /cvsroot/corem/core/src/panes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- panes.h 2000/11/14 19:38:44 1.3
+++ panes.h 2000/11/23 01:08:37 1.4
@@ -1,6 +1,6 @@
-
GtkWidget *core_create_folder_pane(void);
GtkWidget *core_create_mlist_pane(void);
GtkWidget *core_create_message_pane(Message * message, MessageFlags mode);
-
GtkWidget *core_create_fonts_page(GtkWidget * window);
+void folder_ctree_change_line_style(gint type);
+void mail_ctree_change_line_style(gint type);
===================================================================
RCS file: /cvsroot/corem/core/src/prefs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- prefs.c 2000/11/21 22:33:40 1.5
+++ prefs.c 2000/11/23 01:08:37 1.6
@@ -352,6 +352,8 @@
config.ml_subject = 1;
config.ml_date = 1;
config.ml_server = 0;
+ config.ml_linestyle = 2;
+ config.fl_linestyle = 2;
config.theme = g_strdup("default");
home = getenv("HOME");
rc = g_strconcat(home, "/.corerc", NULL);
@@ -391,6 +393,10 @@
config.ml_date = atoi(line + 8);
} else if (g_strncasecmp(line, "ml_server=", 10) == 0) {
config.ml_server = atoi(line + 10);
+ } else if (g_strncasecmp(line, "ml_linestyle=", 13) == 0) {
+ config.ml_linestyle = atoi(line + 13);
+ } else if (g_strncasecmp(line, "fl_linestyle=", 13) == 0) {
+ config.fl_linestyle = atoi(line + 13);
} else if (g_strncasecmp(line, "theme=", 6) == 0) {
config.theme = g_strdup(line + 6);
}
@@ -432,6 +438,8 @@
fprintf(config_file, "ml_subject=%d\n", config.ml_subject);
fprintf(config_file, "ml_date=%d\n", config.ml_date);
fprintf(config_file, "ml_server=%d\n", config.ml_server);
+ fprintf(config_file, "ml_linestyle=%d\n", config.ml_linestyle);
+ fprintf(config_file, "fl_linestyle=%d\n", config.fl_linestyle);
fprintf(config_file, "theme=%s\n", config.theme);
g_free(rc);
return;
|
