[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2809 - in GNUnet: . contrib src/conf
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r2809 - in GNUnet: . contrib src/conf |
|
Date: |
Sun, 14 May 2006 03:24:08 -0700 (PDT) |
Author: grothoff
Date: 2006-05-14 03:24:05 -0700 (Sun, 14 May 2006)
New Revision: 2809
Modified:
GNUnet/AUTHORS
GNUnet/Makefile.am
GNUnet/contrib/Makefile.am
GNUnet/src/conf/wizard.glade
Log:
sync
Modified: GNUnet/AUTHORS
===================================================================
--- GNUnet/AUTHORS 2006-05-14 10:13:53 UTC (rev 2808)
+++ GNUnet/AUTHORS 2006-05-14 10:24:05 UTC (rev 2809)
@@ -28,6 +28,8 @@
Paul Ruth <address@hidden>
Renaldo Ferreira <address@hidden>
Risto Saarelma
+Roman Zippel
+Romain Lievin
Simo Viitanen
Tiberius Stef <address@hidden>
Tomi Tukiainen
Modified: GNUnet/Makefile.am
===================================================================
--- GNUnet/Makefile.am 2006-05-14 10:13:53 UTC (rev 2808)
+++ GNUnet/Makefile.am 2006-05-14 10:24:05 UTC (rev 2809)
@@ -11,4 +11,5 @@
PLATFORMS \
acinclude.m4
+
ACLOCAL_AMFLAGS = -I m4
Modified: GNUnet/contrib/Makefile.am
===================================================================
--- GNUnet/contrib/Makefile.am 2006-05-14 10:13:53 UTC (rev 2808)
+++ GNUnet/contrib/Makefile.am 2006-05-14 10:24:05 UTC (rev 2809)
@@ -6,7 +6,13 @@
config-client.in \
config-daemon.in
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
+ $(INSTALL_DATA) gnunet-logo-color.png $(DESTDIR)$(pkgdatadir)
+ @$(NORMAL_INSTALL)
+
EXTRA_DIST = \
+ gnunet-logo-color.png \
hostlist.cgi \
hostlist.php \
gnunet-download-manager.scm \
Modified: GNUnet/src/conf/wizard.glade
===================================================================
--- GNUnet/src/conf/wizard.glade 2006-05-14 10:13:53 UTC (rev 2808)
+++ GNUnet/src/conf/wizard.glade 2006-05-14 10:24:05 UTC (rev 2809)
@@ -979,6 +979,8 @@
<property name="homogeneous">False</property>
<property name="spacing">0</property>
+
+
<child>
<widget class="GtkRadioButton" id="radGNUnet">
<property name="visible">True</property>
@@ -2836,7 +2838,222 @@
<property name="spacing">0</property>
<child>
- <placeholder/>
+ <widget class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkMenuItem" id="file1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="file1_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="load1">
+ <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>
+ <signal name="activate" handler="on_load1_activate"/>
+ <accelerator key="L" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image27">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="save1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Save the
config in .config</property>
+ <property name="label" translatable="yes">_Save</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_save1_activate"/>
+ <accelerator key="S" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image28">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="separator1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="quit1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Quit</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_quit1_activate"/>
+ <accelerator key="Q" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image30">
+ <property name="visible">True</property>
+ <property name="stock">gtk-quit</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="options1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Options</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="options1_menu">
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="show_name1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show
name</property>
+ <property name="label" translatable="yes">Show
_name</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate" handler="on_show_name1_activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="show_range1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show range
(Y/M/N)</property>
+ <property name="label" translatable="yes">Show
_range</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate"
handler="on_show_range1_activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="show_data1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show value of
the option</property>
+ <property name="label" translatable="yes">Show
_data</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate" handler="on_show_data1_activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="separator2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="show_all_options1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show all
options</property>
+ <property name="label" translatable="yes">Show all
_options</property>
+ <property name="use_underline">True</property>
+ <property name="active">False</property>
+ <signal name="activate"
handler="on_show_all_options1_activate"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="help1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="help1_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="introduction1">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_Introduction</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="on_introduction1_activate" last_modification_time="Fri, 15 Nov 2002
20:26:30 GMT"/>
+ <accelerator key="I" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image31">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-question</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="about1">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">_About</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_about1_activate"
last_modification_time="Fri, 15 Nov 2002 20:26:30 GMT"/>
+ <accelerator key="A" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image32">
+ <property name="visible">True</property>
+ <property name="stock">gtk-properties</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
<child>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2809 - in GNUnet: . contrib src/conf,
grothoff <=