[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r660 - GNUnet/src/conf
|
From: |
durner |
|
Subject: |
[GNUnet-SVN] r660 - GNUnet/src/conf |
|
Date: |
Sun, 17 Apr 2005 11:00:14 -0700 (PDT) |
Author: durner
Date: 2005-04-17 10:59:34 -0700 (Sun, 17 Apr 2005)
New Revision: 660
Added:
GNUnet/src/conf/wizard.gladep
Modified:
GNUnet/src/conf/wizard.c
GNUnet/src/conf/wizard.glade
GNUnet/src/conf/wizard_callbacks.c
GNUnet/src/conf/wizard_interface.c
Log:
GUI cleanup and Linux & OS X support
Modified: GNUnet/src/conf/wizard.c
===================================================================
--- GNUnet/src/conf/wizard.c 2005-04-17 17:57:27 UTC (rev 659)
+++ GNUnet/src/conf/wizard.c 2005-04-17 17:59:34 UTC (rev 660)
@@ -61,7 +61,7 @@
int niclen = strlen(nic);
int inslen = strlen(name);
- if (inslen > niclen)
+ if (inslen >= niclen)
{
#ifdef MINGW
if (strncmp(name + inslen - niclen - 1, nic, niclen) == 0)
@@ -77,7 +77,6 @@
{
GtkTreeModel *model;
GtkTreeIter cur, last;
-
model = gtk_combo_box_get_model(GTK_COMBO_BOX(cmbNIC));
gtk_tree_model_get_iter_first(model, &cur);
last = cur;
@@ -106,18 +105,55 @@
cmbNIC = lookup_widget(table1, "cmbNIC");
entIP = lookup_widget(table1, "entIP");
- chkFW = lookup_widget(vbox6, "chkFW");
+ chkFW = lookup_widget(table1, "chkFW");
sym = sym_find("INTERFACE", "NETWORK");
if (sym)
- {
- gtk_widget_set_usize(cmbNIC, 10, -1);
-
+ {
#ifdef MINGW
ListNICs(insert_nic);
#else
- /* TODO: Other platforms! */
+ char entry[11], *dst;
+ FILE *f = popen("ifconfig", "r");
+ if (!f)
+ return;
+
+ while(1)
+ {
+ int i = 0;
+ int c = fgetc(f);
+
+ if (c == EOF)
+ break;
+
+ dst = entry;
+
+ /* Read interface name until the first space (or colon
under OS X) */
+ while (c != EOF && c != '\n' &&
+#ifdef OSX
+ c != ':'
+#else
+ c != ' '
#endif
+ && i < 10)
+ {
+ *dst++ = c;
+ i++;
+ c = fgetc(f);
+ }
+ *dst = 0;
+
+ if (entry[0])
+ insert_nic(entry, strcmp(entry, "eth0") == 0);
+
+ while(c != '\n' && c != EOF)
+ c = fgetc(f);
+ }
+
+ pclose(f);
+#endif
+
+ gtk_widget_set_usize(cmbNIC, 10, -1);
}
sym = sym_find("IP", "NETWORK");
@@ -244,9 +280,9 @@
wizard_main (int argc, char *argv[])
{
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
+ setlocale (LC_ALL, "");
+ bindtextdomain(PACKAGE, LOCALEDIR);
+ textdomain(PACKAGE);
#endif
gtk_set_locale ();
Modified: GNUnet/src/conf/wizard.glade
===================================================================
--- GNUnet/src/conf/wizard.glade 2005-04-17 17:57:27 UTC (rev 659)
+++ GNUnet/src/conf/wizard.glade 2005-04-17 17:59:34 UTC (rev 660)
@@ -31,7 +31,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -55,8 +55,10 @@
This assistant will ask you a few basic questions in order to configure GNUnet.
-Please visit our homepage at http://www.gnunet.org/ and join our community at
-http://www.gnunet.org/drupal/
+Please visit our homepage at
+ http://www.gnunet.org
+and join our community at
+ http://www.gnunet.org/drupal/
Have a lot of fun,
@@ -281,7 +283,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -325,8 +327,8 @@
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -346,7 +348,7 @@
<widget class="GtkTable" id="table1">
<property name="border_width">5</property>
<property name="visible">True</property>
- <property name="n_rows">2</property>
+ <property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">5</property>
@@ -436,6 +438,29 @@
<property name="y_options">fill</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="chkFW">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label"
translatable="yes">Computer cannot receive inbound connections
(SNAT/Firewall)</property>
+ <property name="use_underline">True</property>
+ <property
name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_chkFW_toggled"
last_modification_time="Sun, 17 Apr 2005 15:46:13 GMT"/>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -445,27 +470,6 @@
</child>
<child>
- <widget class="GtkCheckButton" id="chkFW">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Computer
cannot receive inbound connections (SNAT/Firewall)</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_chkFW_toggled"
last_modification_time="Sat, 16 Apr 2005 15:41:18 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<placeholder/>
</child>
</widget>
@@ -781,7 +785,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -1468,7 +1472,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
@@ -1511,7 +1515,7 @@
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
Added: GNUnet/src/conf/wizard.gladep
===================================================================
--- GNUnet/src/conf/wizard.gladep 2005-04-17 17:57:27 UTC (rev 659)
+++ GNUnet/src/conf/wizard.gladep 2005-04-17 17:59:34 UTC (rev 660)
@@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd";>
+
+<glade-project>
+ <name>Wizard-conf</name>
+ <program_name>wizard-conf</program_name>
+ <style>GNU</style>
+ <gnome_support>FALSE</gnome_support>
+ <main_source_file>wizard_interface.c</main_source_file>
+ <main_header_file>wizard_interface.h</main_header_file>
+ <handler_source_file>wizard_callbacks.c</handler_source_file>
+ <handler_header_file>wizard_callbacks.h</handler_header_file>
+ <support_source_file>wizard_support.c</support_source_file>
+ <support_header_file>wizard_support.h</support_header_file>
+</glade-project>
Property changes on: GNUnet/src/conf/wizard.gladep
___________________________________________________________________
Name: svn:eol-style
+ LF
Modified: GNUnet/src/conf/wizard_callbacks.c
===================================================================
--- GNUnet/src/conf/wizard_callbacks.c 2005-04-17 17:57:27 UTC (rev 659)
+++ GNUnet/src/conf/wizard_callbacks.c 2005-04-17 17:59:34 UTC (rev 660)
@@ -197,15 +197,22 @@
GtkTreeIter iter;
GValue val;
char *entry, *idx;
- char *dst, nic[21];
+ char *dst;
+#ifdef MINGW
+ char nic[21];
+#else
+ char *nic;
+#endif
struct symbol *sym;
GtkTreeModel *model;
gtk_combo_box_get_active_iter(combobox, &iter);
model = gtk_combo_box_get_model(combobox);
+ memset(&val, 0, sizeof(val));
gtk_tree_model_get_value(model, &iter, 0, &val);
entry = (char *) g_value_get_string(&val);
+#ifdef MINGW
idx = strrchr(entry, '-');
if (! idx)
return;
@@ -214,7 +221,9 @@
while(*idx)
*dst++ = *idx++;
dst[-1] = 0;
-
+#else
+ nic = entry;
+#endif
sym = sym_lookup("INTERFACE", "NETWORK", 0);
sym_set_string_value(sym, nic);
sym = sym_lookup("INTERFACES", "LOAD", 0);
@@ -274,7 +283,6 @@
struct symbol *sym = sym_lookup("ACTIVEMIGRATION", "AFS", 0);
sym_set_tristate_value(sym,
gtk_toggle_button_get_active(togglebutton) ? yes : no);
-printf("Hit: %i\n", gtk_toggle_button_get_active(togglebutton));
}
void
Modified: GNUnet/src/conf/wizard_interface.c
===================================================================
--- GNUnet/src/conf/wizard_interface.c 2005-04-17 17:57:27 UTC (rev 659)
+++ GNUnet/src/conf/wizard_interface.c 2005-04-17 17:59:34 UTC (rev 660)
@@ -62,7 +62,7 @@
gtk_widget_show (scoll_welcome);
gtk_box_pack_start (GTK_BOX (vbox2), scoll_welcome, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scoll_welcome),
- GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
textview11 = gtk_text_view_new ();
gtk_widget_show (textview11);
@@ -74,7 +74,7 @@
gtk_text_buffer_set_text (gtk_text_view_get_buffer
(GTK_TEXT_VIEW (textview11)),
_
- ("Welcome to GNUnet!\n\nThis assistant will ask you
a few basic questions in order to configure GNUnet.\n\nPlease visit our
homepage at http://www.gnunet.org/ and join our community
at\nhttp://www.gnunet.org/drupal/\n\nHave a lot of fun,\n\nthe GNUnet team"),
+ ("Welcome to GNUnet!\n\nThis assistant will ask you
a few basic questions in order to configure GNUnet.\n\nPlease visit our
homepage at\n\thttp://www.gnunet.org\nand join our community
at\n\thttp://www.gnunet.org/drupal/\n\nHave a lot of fun,\n\nthe GNUnet team"),
-1);
hseparator2 = gtk_hseparator_new ();
@@ -214,7 +214,7 @@
gtk_widget_show (scrolledwindow5);
gtk_box_pack_start (GTK_BOX (vbox4), scrolledwindow5, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow5),
- GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
textview8 = gtk_text_view_new ();
gtk_widget_show (textview8);
@@ -231,7 +231,7 @@
hseparator3 = gtk_hseparator_new ();
gtk_widget_show (hseparator3);
- gtk_box_pack_start (GTK_BOX (vbox4), hseparator3, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox4), hseparator3, FALSE, FALSE, 0);
vbox5 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox5);
@@ -241,7 +241,7 @@
gtk_widget_show (vbox6);
gtk_box_pack_start (GTK_BOX (vbox5), vbox6, TRUE, TRUE, 0);
- table1 = gtk_table_new (2, 2, FALSE);
+ table1 = gtk_table_new (3, 2, FALSE);
gtk_widget_show (table1);
gtk_box_pack_start (GTK_BOX (vbox6), table1, TRUE, TRUE, 0);
gtk_container_set_border_width (GTK_CONTAINER (table1), 5);
@@ -278,8 +278,9 @@
gtk_check_button_new_with_mnemonic (_
("Computer cannot receive inbound
connections (SNAT/Firewall)"));
gtk_widget_show (chkFW);
- gtk_box_pack_start (GTK_BOX (vbox6), chkFW, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (chkFW), 5);
+ gtk_table_attach (GTK_TABLE (table1), chkFW, 0, 2, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
labelLimit = gtk_label_new (_("Network connection"));
gtk_widget_show (labelLimit);
@@ -476,7 +477,7 @@
gtk_widget_show (scrolledwindow6);
gtk_box_pack_start (GTK_BOX (vbox8), scrolledwindow6, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow6),
- GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
textview9 = gtk_text_view_new ();
gtk_widget_show (textview9);
@@ -798,7 +799,7 @@
gtk_widget_show (scrolledwindow7);
gtk_box_pack_start (GTK_BOX (vbox13), scrolledwindow7, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow7),
- GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
textview10 = gtk_text_view_new ();
gtk_widget_show (textview10);
@@ -815,7 +816,7 @@
hseparator5 = gtk_hseparator_new ();
gtk_widget_show (hseparator5);
- gtk_box_pack_start (GTK_BOX (vbox13), hseparator5, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox13), hseparator5, FALSE, FALSE, 0);
vbox14 = gtk_vbox_new (FALSE, 0);
gtk_widget_show (vbox14);
Property changes on: GNUnet/src/conf/wizard_interface.c
___________________________________________________________________
Name: svn:eol-style
+ LF
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r660 - GNUnet/src/conf,
durner <=