[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r479 - GNUnet/src/conf
|
From: |
durner |
|
Subject: |
[GNUnet-SVN] r479 - GNUnet/src/conf |
|
Date: |
Mon, 21 Mar 2005 13:23:40 -0800 (PST) |
Author: durner
Date: 2005-03-21 13:23:39 -0800 (Mon, 21 Mar 2005)
New Revision: 479
Modified:
GNUnet/src/conf/gconf.c
GNUnet/src/conf/gconf.glade
GNUnet/src/conf/gconf_interface.c
GNUnet/src/conf/images.c
Log:
Icons
Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c 2005-03-21 21:00:22 UTC (rev 478)
+++ GNUnet/src/conf/gconf.c 2005-03-21 21:23:39 UTC (rev 479)
@@ -223,6 +223,44 @@
NULL);
}
+GtkImage *get_btn_image(GtkButton *button)
+{
+ GList *btn_children, *align;
+ GtkImage *ret = NULL;
+
+ /* button -> alignment -> hbox -> image */
+
+ btn_children = gtk_container_get_children(GTK_CONTAINER(button));
+ for (align = btn_children; align; align = g_list_next(align))
+ {
+ if (GTK_IS_ALIGNMENT(align->data))
+ {
+ GList *align_children, *hbox;
+
+ align_children = gtk_container_get_children(GTK_CONTAINER(align->data));
+ for (hbox = align_children; hbox; hbox = g_list_next(hbox))
+ {
+ if (GTK_IS_HBOX(hbox->data))
+ {
+ GList *hbox_children, *img;
+
+ hbox_children =
gtk_container_get_children(GTK_CONTAINER(hbox->data));
+ for (img = hbox_children; img; img = g_list_next(img))
+ {
+ if (GTK_IS_IMAGE(img->data))
+ ret = GTK_IMAGE(img->data);
+ }
+ g_list_free(hbox_children);
+ }
+ }
+ g_list_free(align_children);
+ }
+ }
+ g_list_free(btn_children);
+
+ return ret;
+}
+
/* Main Window Initialization */
@@ -237,6 +275,7 @@
GtkToolbar *toolbar;
GtkWidget *vbox;
GtkMenu *options;
+ GtkImage *image;
main_wnd = create_main_wnd ();
gtk_widget_show(GTK_WIDGET(main_wnd));
@@ -274,36 +313,56 @@
style = gtk_widget_get_style(main_wnd);
- pixmap = gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
- &style->bg[GTK_STATE_NORMAL],
- (gchar **) xpm_single_view);
- gtk_image_set_from_pixmap(GTK_IMAGE
- (((GtkToolbarChild
- *) (g_list_nth(GTK_TOOLBAR(toolbar)->
- children,
- 5)->data))->icon),
- pixmap, mask);
- pixmap =
- gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
- &style->bg[GTK_STATE_NORMAL],
- (gchar **) xpm_split_view);
- gtk_image_set_from_pixmap(GTK_IMAGE
- (((GtkToolbarChild
- *) (g_list_nth(GTK_TOOLBAR(toolbar)->
- children,
- 6)->data))->icon),
- pixmap, mask);
- pixmap =
- gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
- &style->bg[GTK_STATE_NORMAL],
- (gchar **) xpm_tree_view);
- gtk_image_set_from_pixmap(GTK_IMAGE
- (((GtkToolbarChild
- *) (g_list_nth(GTK_TOOLBAR(toolbar)->
- children,
- 7)->data))->icon),
- pixmap, mask);
+ image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button4")));
+ if (image)
+ {
+ pixmap = gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
+ &style->bg[GTK_STATE_NORMAL],
+ (gchar **) xpm_single_view);
+ gtk_image_set_from_pixmap(image, pixmap, mask);
+ }
+
+ image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button5")));
+ if (image)
+ {
+ pixmap =
+ gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
+ &style->bg[GTK_STATE_NORMAL],
+ (gchar **) xpm_split_view);
+ gtk_image_set_from_pixmap(image, pixmap, mask);
+ }
+
+ image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button6")));
+ if (image)
+ {
+ pixmap =
+ gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
+ &style->bg[GTK_STATE_NORMAL],
+ (gchar **) xpm_tree_view);
+ gtk_image_set_from_pixmap(image, pixmap, mask);
+ }
+ image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button7")));
+ if (image)
+ {
+ pixmap =
+ gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
+ &style->bg[GTK_STATE_NORMAL],
+ (gchar **) plus_xpm);
+ gtk_image_set_from_pixmap(image, pixmap, mask);
+ }
+
+ image = get_btn_image(GTK_BUTTON(lookup_widget(GTK_WIDGET(toolbar),
"button8")));
+ if (image)
+ {
+ pixmap =
+ gdk_pixmap_create_from_xpm_d(main_wnd->window, &mask,
+ &style->bg[GTK_STATE_NORMAL],
+ (gchar **) minus_xpm);
+ gtk_image_set_from_pixmap(image, pixmap, mask);
+ }
+
+
switch (view_mode) {
case SINGLE_VIEW:
widget = lookup_widget(GTK_WIDGET(toolbar), "button4");
Modified: GNUnet/src/conf/gconf.glade
===================================================================
--- GNUnet/src/conf/gconf.glade 2005-03-21 21:00:22 UTC (rev 478)
+++ GNUnet/src/conf/gconf.glade 2005-03-21 21:23:39 UTC (rev 479)
@@ -313,10 +313,64 @@
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Goes up of one
level (single view)</property>
- <property name="label" translatable="yes">Back</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-undo</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="pressed" handler="on_back_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment11">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image44">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Up</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -330,10 +384,64 @@
<widget class="GtkButton" id="button2">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Load a config
file</property>
- <property name="label" translatable="yes">Load</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-open</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="pressed" handler="on_load_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image35">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Load</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -341,10 +449,64 @@
<widget class="GtkButton" id="button3">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save a config
file</property>
- <property name="label" translatable="yes">Save</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-save</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="pressed" handler="on_save_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image37">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Save</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -358,10 +520,64 @@
<widget class="GtkButton" id="button4">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Single
view</property>
- <property name="label" translatable="yes">Single</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-missing-image</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="clicked" handler="on_single_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:39 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image39">
+ <property name="visible">True</property>
+ <property name="stock">gtk-justify-fill</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Single</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -369,10 +585,64 @@
<widget class="GtkButton" id="button5">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Split
view</property>
- <property name="label" translatable="yes">Split</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-missing-image</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="clicked" handler="on_split_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:45 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment7">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image40">
+ <property name="visible">True</property>
+ <property name="stock">gtk-justify-fill</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Split</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -380,10 +650,64 @@
<widget class="GtkButton" id="button6">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Full
view</property>
- <property name="label" translatable="yes">Full</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-missing-image</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="clicked" handler="on_full_clicked"
last_modification_time="Sun, 12 Jan 2003 14:28:50 GMT"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image41">
+ <property name="visible">True</property>
+ <property name="stock">gtk-justify-fill</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Full</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -397,9 +721,64 @@
<widget class="GtkButton" id="button7">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Collapse the
whole tree in the right frame</property>
- <property name="label" translatable="yes">Collapse</property>
- <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="pressed" handler="on_collapse_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image42">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Collapse</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -407,9 +786,64 @@
<widget class="GtkButton" id="button8">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Expand the whole
tree in the right frame</property>
- <property name="label" translatable="yes">Expand</property>
- <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
<signal name="pressed" handler="on_expand_pressed"/>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox10">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image43">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Expand</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property
name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
Modified: GNUnet/src/conf/gconf_interface.c
===================================================================
--- GNUnet/src/conf/gconf_interface.c 2005-03-21 21:00:22 UTC (rev 478)
+++ GNUnet/src/conf/gconf_interface.c 2005-03-21 21:23:39 UTC (rev 479)
@@ -62,16 +62,48 @@
GtkWidget *handlebox1;
GtkWidget *toolbar1;
GtkWidget *button1;
+ GtkWidget *alignment11;
+ GtkWidget *hbox11;
+ GtkWidget *image44;
+ GtkWidget *label11;
GtkWidget *vseparator1;
GtkWidget *button2;
+ GtkWidget *alignment2;
+ GtkWidget *hbox2;
+ GtkWidget *image35;
+ GtkWidget *label2;
GtkWidget *button3;
+ GtkWidget *alignment4;
+ GtkWidget *hbox4;
+ GtkWidget *image37;
+ GtkWidget *label4;
GtkWidget *vseparator2;
GtkWidget *button4;
+ GtkWidget *alignment6;
+ GtkWidget *hbox6;
+ GtkWidget *image39;
+ GtkWidget *label6;
GtkWidget *button5;
+ GtkWidget *alignment7;
+ GtkWidget *hbox7;
+ GtkWidget *image40;
+ GtkWidget *label7;
GtkWidget *button6;
+ GtkWidget *alignment8;
+ GtkWidget *hbox8;
+ GtkWidget *image41;
+ GtkWidget *label8;
GtkWidget *vseparator3;
GtkWidget *button7;
+ GtkWidget *alignment9;
+ GtkWidget *hbox9;
+ GtkWidget *image42;
+ GtkWidget *label9;
GtkWidget *button8;
+ GtkWidget *alignment10;
+ GtkWidget *hbox10;
+ GtkWidget *image43;
+ GtkWidget *label10;
GtkWidget *hpaned1;
GtkWidget *scrolledwindow1;
GtkWidget *treeview1;
@@ -242,68 +274,199 @@
gtk_container_add (GTK_CONTAINER (handlebox1), toolbar1);
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar1), GTK_TOOLBAR_BOTH);
- button1 = gtk_button_new_with_mnemonic (_("Back"));
+ button1 = gtk_button_new ();
gtk_widget_show (button1);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button1,
_("Goes up of one level (single view)"), NULL);
GTK_WIDGET_UNSET_FLAGS (button1, GTK_CAN_FOCUS);
+ alignment11 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment11);
+ gtk_container_add (GTK_CONTAINER (button1), alignment11);
+
+ hbox11 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox11);
+ gtk_container_add (GTK_CONTAINER (alignment11), hbox11);
+
+ image44 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image44);
+ gtk_box_pack_start (GTK_BOX (hbox11), image44, FALSE, FALSE, 0);
+
+ label11 = gtk_label_new_with_mnemonic (_("Up"));
+ gtk_widget_show (label11);
+ gtk_box_pack_start (GTK_BOX (hbox11), label11, FALSE, FALSE, 0);
+
vseparator1 = gtk_vseparator_new ();
gtk_widget_show (vseparator1);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), vseparator1, NULL, NULL);
- button2 = gtk_button_new_with_mnemonic (_("Load"));
+ button2 = gtk_button_new ();
gtk_widget_show (button2);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button2,
_("Load a config file"), NULL);
GTK_WIDGET_UNSET_FLAGS (button2, GTK_CAN_FOCUS);
- button3 = gtk_button_new_with_mnemonic (_("Save"));
+ alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment2);
+ gtk_container_add (GTK_CONTAINER (button2), alignment2);
+
+ hbox2 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox2);
+ gtk_container_add (GTK_CONTAINER (alignment2), hbox2);
+
+ image35 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image35);
+ gtk_box_pack_start (GTK_BOX (hbox2), image35, FALSE, FALSE, 0);
+
+ label2 = gtk_label_new_with_mnemonic (_("Load"));
+ gtk_widget_show (label2);
+ gtk_box_pack_start (GTK_BOX (hbox2), label2, FALSE, FALSE, 0);
+
+ button3 = gtk_button_new ();
gtk_widget_show (button3);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button3,
_("Save a config file"), NULL);
GTK_WIDGET_UNSET_FLAGS (button3, GTK_CAN_FOCUS);
+ alignment4 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment4);
+ gtk_container_add (GTK_CONTAINER (button3), alignment4);
+
+ hbox4 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox4);
+ gtk_container_add (GTK_CONTAINER (alignment4), hbox4);
+
+ image37 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image37);
+ gtk_box_pack_start (GTK_BOX (hbox4), image37, FALSE, FALSE, 0);
+
+ label4 = gtk_label_new_with_mnemonic (_("Save"));
+ gtk_widget_show (label4);
+ gtk_box_pack_start (GTK_BOX (hbox4), label4, FALSE, FALSE, 0);
+
vseparator2 = gtk_vseparator_new ();
gtk_widget_show (vseparator2);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), vseparator2, NULL, NULL);
- button4 = gtk_button_new_with_mnemonic (_("Single"));
+ button4 = gtk_button_new ();
gtk_widget_show (button4);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button4,
_("Single view"), NULL);
GTK_WIDGET_UNSET_FLAGS (button4, GTK_CAN_FOCUS);
- button5 = gtk_button_new_with_mnemonic (_("Split"));
+ alignment6 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment6);
+ gtk_container_add (GTK_CONTAINER (button4), alignment6);
+
+ hbox6 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox6);
+ gtk_container_add (GTK_CONTAINER (alignment6), hbox6);
+
+ image39 =
+ gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image39);
+ gtk_box_pack_start (GTK_BOX (hbox6), image39, FALSE, FALSE, 0);
+
+ label6 = gtk_label_new_with_mnemonic (_("Single"));
+ gtk_widget_show (label6);
+ gtk_box_pack_start (GTK_BOX (hbox6), label6, FALSE, FALSE, 0);
+
+ button5 = gtk_button_new ();
gtk_widget_show (button5);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button5, _("Split view"),
NULL);
GTK_WIDGET_UNSET_FLAGS (button5, GTK_CAN_FOCUS);
- button6 = gtk_button_new_with_mnemonic (_("Full"));
+ alignment7 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment7);
+ gtk_container_add (GTK_CONTAINER (button5), alignment7);
+
+ hbox7 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox7);
+ gtk_container_add (GTK_CONTAINER (alignment7), hbox7);
+
+ image40 =
+ gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image40);
+ gtk_box_pack_start (GTK_BOX (hbox7), image40, FALSE, FALSE, 0);
+
+ label7 = gtk_label_new_with_mnemonic (_("Split"));
+ gtk_widget_show (label7);
+ gtk_box_pack_start (GTK_BOX (hbox7), label7, FALSE, FALSE, 0);
+
+ button6 = gtk_button_new ();
gtk_widget_show (button6);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button6, _("Full view"),
NULL);
GTK_WIDGET_UNSET_FLAGS (button6, GTK_CAN_FOCUS);
+ alignment8 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment8);
+ gtk_container_add (GTK_CONTAINER (button6), alignment8);
+
+ hbox8 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox8);
+ gtk_container_add (GTK_CONTAINER (alignment8), hbox8);
+
+ image41 =
+ gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image41);
+ gtk_box_pack_start (GTK_BOX (hbox8), image41, FALSE, FALSE, 0);
+
+ label8 = gtk_label_new_with_mnemonic (_("Full"));
+ gtk_widget_show (label8);
+ gtk_box_pack_start (GTK_BOX (hbox8), label8, FALSE, FALSE, 0);
+
vseparator3 = gtk_vseparator_new ();
gtk_widget_show (vseparator3);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), vseparator3, NULL, NULL);
- button7 = gtk_button_new_with_mnemonic (_("Collapse"));
+ button7 = gtk_button_new ();
gtk_widget_show (button7);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button7,
_("Collapse the whole tree in the right frame"),
NULL);
GTK_WIDGET_UNSET_FLAGS (button7, GTK_CAN_FOCUS);
- button8 = gtk_button_new_with_mnemonic (_("Expand"));
+ alignment9 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment9);
+ gtk_container_add (GTK_CONTAINER (button7), alignment9);
+
+ hbox9 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox9);
+ gtk_container_add (GTK_CONTAINER (alignment9), hbox9);
+
+ image42 = gtk_image_new_from_stock ("gtk-remove", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image42);
+ gtk_box_pack_start (GTK_BOX (hbox9), image42, FALSE, FALSE, 0);
+
+ label9 = gtk_label_new_with_mnemonic (_("Collapse"));
+ gtk_widget_show (label9);
+ gtk_box_pack_start (GTK_BOX (hbox9), label9, FALSE, FALSE, 0);
+
+ button8 = gtk_button_new ();
gtk_widget_show (button8);
gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar1), button8,
_("Expand the whole tree in the right frame"),
NULL);
GTK_WIDGET_UNSET_FLAGS (button8, GTK_CAN_FOCUS);
+ alignment10 = gtk_alignment_new (0.5, 0.5, 0, 0);
+ gtk_widget_show (alignment10);
+ gtk_container_add (GTK_CONTAINER (button8), alignment10);
+
+ hbox10 = gtk_hbox_new (FALSE, 2);
+ gtk_widget_show (hbox10);
+ gtk_container_add (GTK_CONTAINER (alignment10), hbox10);
+
+ image43 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image43);
+ gtk_box_pack_start (GTK_BOX (hbox10), image43, FALSE, FALSE, 0);
+
+ label10 = gtk_label_new_with_mnemonic (_("Expand"));
+ gtk_widget_show (label10);
+ gtk_box_pack_start (GTK_BOX (hbox10), label10, FALSE, FALSE, 0);
+
hpaned1 = gtk_hpaned_new ();
gtk_widget_show (hpaned1);
gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
@@ -453,16 +616,48 @@
GLADE_HOOKUP_OBJECT (main_wnd, handlebox1, "handlebox1");
GLADE_HOOKUP_OBJECT (main_wnd, toolbar1, "toolbar1");
GLADE_HOOKUP_OBJECT (main_wnd, button1, "button1");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment11, "alignment11");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox11, "hbox11");
+ GLADE_HOOKUP_OBJECT (main_wnd, image44, "image44");
+ GLADE_HOOKUP_OBJECT (main_wnd, label11, "label11");
GLADE_HOOKUP_OBJECT (main_wnd, vseparator1, "vseparator1");
GLADE_HOOKUP_OBJECT (main_wnd, button2, "button2");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment2, "alignment2");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox2, "hbox2");
+ GLADE_HOOKUP_OBJECT (main_wnd, image35, "image35");
+ GLADE_HOOKUP_OBJECT (main_wnd, label2, "label2");
GLADE_HOOKUP_OBJECT (main_wnd, button3, "button3");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment4, "alignment4");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox4, "hbox4");
+ GLADE_HOOKUP_OBJECT (main_wnd, image37, "image37");
+ GLADE_HOOKUP_OBJECT (main_wnd, label4, "label4");
GLADE_HOOKUP_OBJECT (main_wnd, vseparator2, "vseparator2");
GLADE_HOOKUP_OBJECT (main_wnd, button4, "button4");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment6, "alignment6");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox6, "hbox6");
+ GLADE_HOOKUP_OBJECT (main_wnd, image39, "image39");
+ GLADE_HOOKUP_OBJECT (main_wnd, label6, "label6");
GLADE_HOOKUP_OBJECT (main_wnd, button5, "button5");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment7, "alignment7");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox7, "hbox7");
+ GLADE_HOOKUP_OBJECT (main_wnd, image40, "image40");
+ GLADE_HOOKUP_OBJECT (main_wnd, label7, "label7");
GLADE_HOOKUP_OBJECT (main_wnd, button6, "button6");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment8, "alignment8");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox8, "hbox8");
+ GLADE_HOOKUP_OBJECT (main_wnd, image41, "image41");
+ GLADE_HOOKUP_OBJECT (main_wnd, label8, "label8");
GLADE_HOOKUP_OBJECT (main_wnd, vseparator3, "vseparator3");
GLADE_HOOKUP_OBJECT (main_wnd, button7, "button7");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment9, "alignment9");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox9, "hbox9");
+ GLADE_HOOKUP_OBJECT (main_wnd, image42, "image42");
+ GLADE_HOOKUP_OBJECT (main_wnd, label9, "label9");
GLADE_HOOKUP_OBJECT (main_wnd, button8, "button8");
+ GLADE_HOOKUP_OBJECT (main_wnd, alignment10, "alignment10");
+ GLADE_HOOKUP_OBJECT (main_wnd, hbox10, "hbox10");
+ GLADE_HOOKUP_OBJECT (main_wnd, image43, "image43");
+ GLADE_HOOKUP_OBJECT (main_wnd, label10, "label10");
GLADE_HOOKUP_OBJECT (main_wnd, hpaned1, "hpaned1");
GLADE_HOOKUP_OBJECT (main_wnd, scrolledwindow1, "scrolledwindow1");
GLADE_HOOKUP_OBJECT (main_wnd, treeview1, "treeview1");
Modified: GNUnet/src/conf/images.c
===================================================================
--- GNUnet/src/conf/images.c 2005-03-21 21:00:22 UTC (rev 478)
+++ GNUnet/src/conf/images.c 2005-03-21 21:23:39 UTC (rev 479)
@@ -1,3 +1,23 @@
+/*
+ This file is part of GNUnet.
+ (C) 2005 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
/*
* Copyright (C) 2002 Roman Zippel <address@hidden>
* Released under the terms of the GNU GPL v2.0.
@@ -5,8 +25,9 @@
/**
* @brief GNUnet Setup
- * @file
+ * @file conf/images.c
* @author Roman Zippel
+ * @author Nils Durner
*/
static const char *xpm_load[] = {
@@ -330,3 +351,98 @@
" ",
" ",
" "};
+
+static const char * minus_xpm[] = {
+"9 9 36 1",
+" c None",
+". c #B0C2D3",
+"+ c #7898B5",
+"@ c #FFFFFF",
+"# c #FCFCFB",
+"$ c #FDFDFB",
+"% c #FCFCFA",
+"& c #F7F6F3",
+"* c #F7F7F5",
+"= c #F7F7F4",
+"- c #F6F6F4",
+"; c #F1F0EB",
+"> c #E5E1DA",
+", c #F5F5F1",
+"' c #000000",
+") c #DFDBD2",
+"! c #F2F2EE",
+"~ c #F0F0EC",
+"{ c #EDEDE7",
+"] c #ECEBE6",
+"^ c #EAE9E3",
+"/ c #E3E0D9",
+"( c #DBD6CC",
+"_ c #E4E1D9",
+": c #DCD8CF",
+"< c #D8D3C9",
+"[ c #D7D2C7",
+"} c #D6D1C6",
+"| c #D2CCC0",
+"1 c #CFC8BB",
+"2 c #D2CCBF",
+"3 c #C6BEAE",
+"4 c #C2B8A8",
+"5 c #C1B8A7",
+"6 c #C0B7A6",
+"7 c #C3BAAA",
+".+++++++.",
+"+@@@@@@@+",
+"+#$$$#%&+",
+"+**==-;>+",
+"+,''''')+",
+"+!~{]^/(+",
+"+_:<[}|1+",
+"+2345567+",
+".+++++++."};
+
+static const char * plus_xpm[] = {
+"9 9 34 1",
+" c None",
+". c #B0C2D3",
+"+ c #7898B5",
+"@ c #FFFFFF",
+"# c #FCFCFB",
+"$ c #FDFDFB",
+"% c #000000",
+"& c #FCFCFA",
+"* c #F7F6F3",
+"= c #F7F7F5",
+"- c #F7F7F4",
+"; c #F6F6F4",
+"> c #F1F0EB",
+", c #E5E1DA",
+"' c #F5F5F1",
+") c #DFDBD2",
+"! c #F2F2EE",
+"~ c #F0F0EC",
+"{ c #EDEDE7",
+"] c #EAE9E3",
+"^ c #E3E0D9",
+"/ c #DBD6CC",
+"( c #E4E1D9",
+"_ c #DCD8CF",
+": c #D8D3C9",
+"< c #D6D1C6",
+"[ c #D2CCC0",
+"} c #CFC8BB",
+"| c #D2CCBF",
+"1 c #C6BEAE",
+"2 c #C2B8A8",
+"3 c #C1B8A7",
+"4 c #C0B7A6",
+"5 c #C3BAAA",
+".+++++++.",
+"+@@@@@@@+",
+"+#$$%#&*+",
+"+==-%;>,+",
+"+'%%%%%)+",
+"+!~{%]^/+",
+"+(_:%<[}+",
+"+|123345+",
+".+++++++."};
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r479 - GNUnet/src/conf,
durner <=