Menu
▾
▴
E CVS: apps/etcher raster
|
From: <enl...@li...> - 2000-11-02 23:35:55
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/etcher
Modified Files:
bits.c bits.h callbacks.c interface.c support.c
Log Message:
add a color class to bits - and be able to edit it.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/src/bits.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- bits.c 2000/10/27 00:02:10 1.15
+++ bits.c 2000/11/02 23:35:51 1.16
@@ -504,6 +504,8 @@
bit->name = e_db_str_get(db, key);
snprintf(key, sizeof(key), "/bits/bit/%i/class", i);
bit->class = e_db_str_get(db, key);
+ snprintf(key, sizeof(key), "/bits/bit/%i/color_class", i);
+ bit->color_class = e_db_str_get(db, key);
snprintf(key, sizeof(key), "/bits/bit/%i/normal/image", i);
bit->normal.image = e_db_str_get(db, key);
snprintf(key, sizeof(key), "/bits/bit/%i/hilited/image", i);
@@ -680,6 +682,7 @@
}
if (state->description->name) free(state->description->name);
if (state->description->class) free(state->description->class);
+ if (state->description->color_class) free(state->description->color_class);
if (state->description->normal.image) free(state->description->normal.image);
if (state->description->hilited.image) free(state->description->hilited.image);
if (state->description->clicked.image) free(state->description->clicked.image);
@@ -840,6 +843,7 @@
bit = l->data;
if (bit->name) free(bit->name);
if (bit->class) free(bit->class);
+ if (bit->color_class) free(bit->color_class);
if (bit->normal.image) free(bit->normal.image);
if (bit->hilited.image) free(bit->hilited.image);
if (bit->clicked.image) free(bit->clicked.image);
@@ -1140,6 +1144,8 @@
if (bit->name) e_db_str_set(db, key, bit->name);
snprintf(key, sizeof(key), "/bits/bit/%i/class", i);
if (bit->class) e_db_str_set(db, key, bit->class);
+ snprintf(key, sizeof(key), "/bits/bit/%i/color_class", i);
+ if (bit->color_class) e_db_str_set(db, key, bit->color_class);
snprintf(key, sizeof(key), "/bits/bit/%i/normal/image", i);
if (bit->normal.image) e_db_str_set(db, key, bit->normal.image);
snprintf(key, sizeof(key), "/bits/bit/%i/hilited/image", i);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/src/bits.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- bits.h 2000/10/26 19:47:07 1.9
+++ bits.h 2000/11/02 23:35:51 1.10
@@ -60,6 +60,7 @@
{
char *name;
char *class;
+ char *color_class;
struct {
char *image;
} normal, hilited, clicked, disabled;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/src/callbacks.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- callbacks.c 2000/10/28 20:18:44 1.45
+++ callbacks.c 2000/11/02 23:35:51 1.46
@@ -182,6 +182,7 @@
GET_ENTRY("name", name);
GET_ENTRY("class", class);
+ GET_ENTRY("color_class", color_class);
GET_ENTRY("img_normal", normal.image);
GET_ENTRY("img_hilited", hilited.image);
GET_ENTRY("img_clicked", clicked.image);
@@ -344,6 +345,7 @@
SET_ENTRY("name", name);
SET_ENTRY("class", class);
+ SET_ENTRY("color_class", color_class);
SET_ENTRY("img_normal", normal.image);
SET_ENTRY("img_hilited", hilited.image);
SET_ENTRY("img_clicked", clicked.image);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/src/interface.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- interface.c 2000/09/20 17:21:43 1.20
+++ interface.c 2000/11/02 23:35:51 1.21
@@ -180,10 +180,14 @@
GtkWidget *class;
GtkWidget *label11;
GtkWidget *label12;
- GtkWidget *label13;
GtkWidget *type;
GtkWidget *type_menu;
GtkWidget *glade_menuitem;
+ GtkWidget *color_class_combo;
+ GList *color_class_combo_items = NULL;
+ GtkWidget *color_class;
+ GtkWidget *label66;
+ GtkWidget *label13;
GtkWidget *label10;
GtkWidget *table7;
GtkObject *border_l_adj;
@@ -1416,7 +1420,7 @@
gtk_widget_show (label9);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (properties), gtk_notebook_get_nth_page (GTK_NOTEBOOK (properties), 4), label9);
- table2 = gtk_table_new (3, 2, FALSE);
+ table2 = gtk_table_new (4, 2, FALSE);
gtk_widget_ref (table2);
gtk_object_set_data_full (GTK_OBJECT (toplevel), "table2", table2,
(GtkDestroyNotify) gtk_widget_unref);
@@ -1496,23 +1500,13 @@
(GtkAttachOptions) (GTK_FILL), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label12), 7.45058e-09, 0.5);
- label13 = gtk_label_new (_("Type"));
- gtk_widget_ref (label13);
- gtk_object_set_data_full (GTK_OBJECT (toplevel), "label13", label13,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (label13);
- gtk_table_attach (GTK_TABLE (table2), label13, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (GTK_FILL), 0, 0);
- gtk_misc_set_alignment (GTK_MISC (label13), 7.45058e-09, 0.5);
-
type = gtk_option_menu_new ();
gtk_widget_ref (type);
gtk_object_set_data_full (GTK_OBJECT (toplevel), "type", type,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (type);
- gtk_table_attach (GTK_TABLE (table2), type, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
+ gtk_table_attach (GTK_TABLE (table2), type, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
type_menu = gtk_menu_new ();
glade_menuitem = gtk_menu_item_new_with_label (_("Image"));
@@ -1529,6 +1523,72 @@
gtk_menu_append (GTK_MENU (type_menu), glade_menuitem);
gtk_option_menu_set_menu (GTK_OPTION_MENU (type), type_menu);
+ color_class_combo = gtk_combo_new ();
+ gtk_widget_ref (color_class_combo);
+ gtk_object_set_data_full (GTK_OBJECT (toplevel), "color_class_combo", color_class_combo,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (color_class_combo);
+ gtk_table_attach (GTK_TABLE (table2), color_class_combo, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_combo_set_case_sensitive (GTK_COMBO (color_class_combo), TRUE);
+ color_class_combo_items = g_list_append (color_class_combo_items, "");
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Title BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Title FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Border BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Border FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Border Button BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Border Button FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Button BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Button FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Pointer BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Pointer FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Background BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Background FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Selected BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Selected FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Sticky BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Sticky FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Disabled BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Disabled FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("List BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("List FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Menu BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Menu FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Viewport BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Viewport FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Base BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Base FG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Gadget BG"));
+ color_class_combo_items = g_list_append (color_class_combo_items, _("Gadget FG"));
+ gtk_combo_set_popdown_strings (GTK_COMBO (color_class_combo), color_class_combo_items);
+ g_list_free (color_class_combo_items);
+
+ color_class = GTK_COMBO (color_class_combo)->entry;
+ gtk_widget_ref (color_class);
+ gtk_object_set_data_full (GTK_OBJECT (toplevel), "color_class", color_class,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (color_class);
+
+ label66 = gtk_label_new (_("Color Class"));
+ gtk_widget_ref (label66);
+ gtk_object_set_data_full (GTK_OBJECT (toplevel), "label66", label66,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (label66);
+ gtk_table_attach (GTK_TABLE (table2), label66, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+
+ label13 = gtk_label_new (_("Type"));
+ gtk_widget_ref (label13);
+ gtk_object_set_data_full (GTK_OBJECT (toplevel), "label13", label13,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (label13);
+ gtk_table_attach (GTK_TABLE (table2), label13, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label13), 7.45058e-09, 0.5);
+
label10 = gtk_label_new (_("Properties"));
gtk_widget_ref (label10);
gtk_object_set_data_full (GTK_OBJECT (toplevel), "label10", label10,
@@ -2265,7 +2325,7 @@
GtkWidget *dialog_action_area1;
GtkWidget *hbuttonbox2;
GtkWidget *software;
- GtkWidget *_d_hardware;
+ GtkWidget *_3d_hardware;
render_method = gtk_dialog_new ();
gtk_object_set_data (GTK_OBJECT (render_method), "render_method", render_method);
@@ -2317,18 +2377,18 @@
gtk_container_add (GTK_CONTAINER (hbuttonbox2), software);
GTK_WIDGET_SET_FLAGS (software, GTK_CAN_DEFAULT);
- _d_hardware = gtk_button_new_with_label (_("3D Hardware"));
- gtk_widget_ref (_d_hardware);
- gtk_object_set_data_full (GTK_OBJECT (render_method), "_d_hardware", _d_hardware,
- (GtkDestroyNotify) gtk_widget_unref);
- gtk_widget_show (_d_hardware);
- gtk_container_add (GTK_CONTAINER (hbuttonbox2), _d_hardware);
- GTK_WIDGET_SET_FLAGS (_d_hardware, GTK_CAN_DEFAULT);
+ _3d_hardware = gtk_button_new_with_label (_("3D Hardware"));
+ gtk_widget_ref (_3d_hardware);
+ gtk_object_set_data_full (GTK_OBJECT (render_method), "_3d_hardware", _3d_hardware,
+ (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (_3d_hardware);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox2), _3d_hardware);
+ GTK_WIDGET_SET_FLAGS (_3d_hardware, GTK_CAN_DEFAULT);
gtk_signal_connect (GTK_OBJECT (software), "clicked",
GTK_SIGNAL_FUNC (on_software_clicked),
NULL);
- gtk_signal_connect (GTK_OBJECT (_d_hardware), "clicked",
+ gtk_signal_connect (GTK_OBJECT (_3d_hardware), "clicked",
GTK_SIGNAL_FUNC (on_3d_hardware_clicked),
NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/etcher/src/support.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- support.c 2000/09/20 17:21:43 1.2
+++ support.c 2000/11/02 23:35:51 1.3
@@ -97,6 +97,9 @@
GtkWidget *pixmap;
GList *elem;
+ if (!filename || !filename[0])
+ return create_dummy_pixmap (widget);
+
/* We first try any pixmaps directories set by the application. */
elem = pixmaps_directories;
while (elem)
|
