[GNUnet-SVN] r1557 - in gnunet-gtk: . src/plugins/fs

[grothoff]

Author: grothoff
Date: 2005-07-16 11:16:30 -0700 (Sat, 16 Jul 2005)
New Revision: 1557

Modified:
   gnunet-gtk/TODO
   gnunet-gtk/gnunet-gtk.glade
   gnunet-gtk/src/plugins/fs/fs.c
Log:
workaround fs focus issue

Modified: gnunet-gtk/TODO
===================================================================
--- gnunet-gtk/TODO     2005-07-16 16:36:33 UTC (rev 1556)
+++ gnunet-gtk/TODO     2005-07-16 18:16:30 UTC (rev 1557)
@@ -5,9 +5,6 @@
 3) various minor memory leaks in models (esp. on shutdown)
 4) figure out where seemingly spurious "pending" downloads 
    come from (still there?)
-5) why can the "file sharing" tab not be selected first
-   (I can select first "General" and then "file sharing"!,
-    glade shows no difference between the two!!!)
 
 Later (0.7.1+):
 1) auto-rename downloaded files 

Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2005-07-16 16:36:33 UTC (rev 1556)
+++ gnunet-gtk/gnunet-gtk.glade 2005-07-16 18:16:30 UTC (rev 1557)
@@ -31,7 +31,6 @@
       <child>
        <widget class="GtkNotebook" id="mainnotebook">
          <property name="visible">True</property>
-         <property name="can_focus">True</property>
          <property name="show_tabs">True</property>
          <property name="show_border">False</property>
          <property name="tab_pos">GTK_POS_TOP</property>
@@ -41,6 +40,8 @@
          <child>
            <widget class="GtkScrolledWindow" id="welcomeScrolledWindow">
              <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="has_focus">True</property>
              <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
              <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
              <property name="shadow_type">GTK_SHADOW_NONE</property>
@@ -175,6 +176,8 @@
          <child>
            <widget class="GtkHBox" id="welcomeHBox">
              <property name="visible">True</property>
+             <property name="can_default">True</property>
+             <property name="has_default">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
 
@@ -636,6 +639,8 @@
                <widget class="GtkVBox" id="fsstatusvbox">
                  <property name="border_width">5</property>
                  <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="has_focus">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
@@ -899,6 +904,8 @@
              <child>
                <widget class="GtkHBox" id="hbox44">
                  <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="has_focus">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2005-07-16 16:36:33 UTC (rev 1556)
+++ gnunet-gtk/src/plugins/fs/fs.c      2005-07-16 18:16:30 UTC (rev 1557)
@@ -130,13 +130,19 @@
 
 void init_fs() {
   GtkWidget * tab;
-
+  GtkWidget * book;
+  gint num;
+  
   tab
     = glade_xml_get_widget(getMainXML(),
                           "fsnotebook");
   gtk_widget_show(tab);
-
-
+  book  
+    = glade_xml_get_widget(getMainXML(), "mainnotebook");
+  num = gtk_notebook_get_current_page(GTK_NOTEBOOK(book));
+  gtk_notebook_set_current_page(GTK_NOTEBOOK(book), 1);
+  gtk_notebook_set_current_page(GTK_NOTEBOOK(book), num);
+  
   ctx = FSUI_start("gnunet-gtk",
                   YES,
                   &eventProcessor,