--- a/gf_theme_editor.c Sat Dec 27 17:35:03 2003 +0000
+++ b/gf_theme_editor.c Sat Dec 27 17:42:41 2003 +0000
@@ -5,9 +5,10 @@
-#include "guifications.h"
+#include "gf_gtkutils.h" #include "grimdirtreeview.h"
/***********************************************************************
@@ -54,14 +55,6 @@
static GtkWidget *make_frame(GtkWidget *parent, const gchar *title);
static GtkWidget *make_preview_menu();
static GtkWidget *make_check_button(const gchar *text, GtkSizeGroup *sg);
-static GtkWidget *make_clip_option_menu();
-static GtkWidget *make_clip_menu_item(gf_clip clip);
-static GtkWidget *make_text_pos_option_menu();
-static GtkWidget *make_text_pos_menu_item(gf_tpos pos);
-static GtkWidget *make_icon_pos_option_menu();
-static GtkWidget *make_icon_pos_menu_item(gf_ipos pos);
-static GtkWidget *make_icon_size_option_menu();
-static GtkWidget *make_icon_size_menu_item(gf_icon_size isize);
static GtkWidget *make_file_dialog(gchar *title, gboolean open, gboolean quit);
@@ -313,7 +306,7 @@
label = make_label("Clippin_g:", sg);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- basic_text_clipping_menu = make_clip_option_menu();
+ basic_text_clipping_menu = make_text_clipping_option_menu(text_clipping_elipse_middle); gtk_label_set_mnemonic_widget(GTK_LABEL(label), basic_text_clipping_menu);
g_signal_connect(G_OBJECT(basic_text_clipping_menu), "changed", G_CALLBACK(option_menu_cb), &theme.data.basic.text_clipping);
gtk_box_pack_start(GTK_BOX(hbox), basic_text_clipping_menu, FALSE, FALSE, 0);
@@ -325,7 +318,7 @@
label = make_label("_Position:", sg);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- basic_text_pos_menu = make_text_pos_option_menu();
+ basic_text_pos_menu = make_item_position_option_menu(item_position_c); gtk_label_set_mnemonic_widget(GTK_LABEL(label), basic_text_pos_menu);
g_signal_connect(G_OBJECT(basic_text_pos_menu), "changed", G_CALLBACK(option_menu_cb), &theme.data.basic.text_position);
gtk_box_pack_start(GTK_BOX(hbox), basic_text_pos_menu, FALSE, FALSE, 0);
@@ -364,7 +357,7 @@
label = make_label("P_osition:", sg);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- basic_proto_pos_menu = make_icon_pos_option_menu();
+ basic_proto_pos_menu = make_item_position_option_menu(item_position_sw); gtk_label_set_mnemonic_widget(GTK_LABEL(label), basic_proto_pos_menu);
g_signal_connect(G_OBJECT(basic_proto_pos_menu), "changed", G_CALLBACK(option_menu_cb), &theme.data.basic.proto_position);
gtk_box_pack_start(GTK_BOX(hbox), basic_proto_pos_menu, FALSE, FALSE, 0);
@@ -376,7 +369,7 @@
label = make_label("Si_ze:", sg);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- basic_proto_size_menu = make_icon_size_option_menu();
+ basic_proto_size_menu = make_icon_size_option_menu(icon_size_normal); gtk_label_set_mnemonic_widget(GTK_LABEL(label), basic_proto_size_menu);
g_signal_connect(G_OBJECT(basic_proto_size_menu), "changed", G_CALLBACK(option_menu_cb), &theme.data.basic.proto_size);
gtk_box_pack_start(GTK_BOX(hbox), basic_proto_size_menu, FALSE, FALSE, 0);
@@ -621,111 +614,6 @@
/**********************************************************************/
-make_clip_option_menu() {
- GtkWidget *option_menu, *menu;
- option_menu = gtk_option_menu_new();
- for (i = 0; i < 4; i++)
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_clip_menu_item(i));
- gtk_widget_show_all(menu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
-/**********************************************************************/
-make_clip_menu_item(gf_clip clip) {
- GtkWidget *item, *hbox, *label = NULL, *image;
- GdkPixbuf *pixbuf = NULL;
- item = gtk_menu_item_new();
- hbox = gtk_hbox_new(FALSE, 4);
- gtk_container_add(GTK_CONTAINER(item), hbox);
- pixbuf = get_clipping_image(clip);
- case clip_truncate: label = gtk_label_new("Truncate"); break;
- case clip_elipse_start: label = gtk_label_new("Elipse at the beginning"); break;
- case clip_elipse_middle: label = gtk_label_new("Elipse in the middle"); break;
- case clip_elipse_end: label = gtk_label_new("Elipse at the end"); break;
- image = gtk_image_new_from_pixbuf(pixbuf);
- g_object_unref(pixbuf);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-/**********************************************************************/
-make_text_pos_option_menu() {
- GtkWidget *option_menu, *menu;
- option_menu = gtk_option_menu_new();
- for (i = 0; i < 9; i++)
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_text_pos_menu_item(i));
- gtk_widget_show_all(menu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
-/**********************************************************************/
-make_text_pos_menu_item(gf_tpos pos) {
- GtkWidget *item, *hbox, *label = NULL, *image;
- GdkPixbuf *pixbuf = NULL;
- item = gtk_menu_item_new();
- hbox = gtk_hbox_new(FALSE, 4);
- gtk_container_add(GTK_CONTAINER(item), hbox);
- pixbuf = get_text_position_image(pos);
- case tpos_nw: label = gtk_label_new("Top Left"); break;
- case tpos_n: label = gtk_label_new("Top"); break;
- case tpos_ne: label = gtk_label_new("Top Right"); break;
- case tpos_w: label = gtk_label_new("Left"); break;
- case tpos_c: label = gtk_label_new("Center"); break;
- case tpos_e: label = gtk_label_new("Right"); break;
- case tpos_sw: label = gtk_label_new("Bottom Left"); break;
- case tpos_s: label = gtk_label_new("Bottom"); break;
- case tpos_se: label = gtk_label_new("Bottom Right"); break;
- image = gtk_image_new_from_pixbuf(pixbuf);
- g_object_unref(pixbuf);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-/**********************************************************************/
@@ -738,113 +626,6 @@
/**********************************************************************/
-make_icon_pos_option_menu() {
- GtkWidget *option_menu, *menu;
- option_menu = gtk_option_menu_new();
- for (i = 0; i < 10; i++)
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_icon_pos_menu_item(i));
- gtk_widget_show_all(menu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
-/**********************************************************************/
-make_icon_pos_menu_item(gf_ipos pos) {
- GtkWidget *item, *hbox, *label = NULL, *image;
- GdkPixbuf *pixbuf = NULL;
- item = gtk_menu_item_new();
- hbox = gtk_hbox_new(FALSE, 4);
- gtk_container_add(GTK_CONTAINER(item), hbox);
- pixbuf = get_icon_position_image(pos);
- case ipos_none: label = gtk_label_new("None"); break;
- case ipos_nw: label = gtk_label_new("Top Left"); break;
- case ipos_n: label = gtk_label_new("Top"); break;
- case ipos_ne: label = gtk_label_new("Top Right"); break;
- case ipos_w: label = gtk_label_new("Left"); break;
- case ipos_c: label = gtk_label_new("Center"); break;
- case ipos_e: label = gtk_label_new("Right"); break;
- case ipos_sw: label = gtk_label_new("Bottom Left"); break;
- case ipos_s: label = gtk_label_new("Bottom"); break;
- case ipos_se: label = gtk_label_new("Bottom Right"); break;
- image = gtk_image_new_from_pixbuf(pixbuf);
- g_object_unref(pixbuf);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-/**********************************************************************/
-make_icon_size_option_menu() {
- GtkWidget *option_menu, *menu;
- option_menu = gtk_option_menu_new();
- for (i = 0; i < 5; i++)
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), make_icon_size_menu_item(i));
- gtk_widget_show_all(menu);
- gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu);
-/**********************************************************************/
-make_icon_size_menu_item(gf_icon_size isize) {
- GtkWidget *item, *hbox, *label = NULL, *image;
- GdkPixbuf *pixbuf = NULL;
- item = gtk_menu_item_new();
- hbox = gtk_hbox_new(FALSE, 4);
- gtk_container_add(GTK_CONTAINER(item), hbox);
- pixbuf = get_icon_size_image(isize);
- case isize_tiny: label = gtk_label_new("Tiny (16x16)"); break;
- case isize_small: label = gtk_label_new("Small (24x24)"); break;
- case isize_normal: label = gtk_label_new("Normal (48x48)"); break;
- case isize_large: label = gtk_label_new("Large (96x96)"); break;
- case isize_huge: label = gtk_label_new("Huge (144x144)"); break;
- image = gtk_image_new_from_pixbuf(pixbuf);
- g_object_unref(pixbuf);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-/**********************************************************************/