[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20509 - in gnunet-gtk: contrib src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20509 - in gnunet-gtk: contrib src/gns |
Date: |
Thu, 15 Mar 2012 10:34:11 +0100 |
Author: wachs
Date: 2012-03-15 10:34:11 +0100 (Thu, 15 Mar 2012)
New Revision: 20509
Modified:
gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade
gnunet-gtk/src/gns/gnunet-gns-gtk.c
gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- fixes
Modified: gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade 2012-03-15 09:02:08 UTC
(rev 20508)
+++ gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade 2012-03-15 09:34:11 UTC
(rev 20509)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="GNUNET_GNS_GTK_main_window">
<property name="can_focus">False</property>
@@ -231,7 +231,6 @@
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">0</property>
- <signal name="clicked"
handler="GNUNET_GNS_GTK_main_treeview_click_cb" swapped="no"/>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GNS_GTK_name_cellrenderertext">
<property name="editable">True</property>
@@ -271,11 +270,10 @@
<child>
<object class="GtkCellRendererCombo"
id="GNUNET_GNS_GTK_type_cellrenderercombo">
<property name="editable">True</property>
+ <property
name="model">GNUNET_GNS_GTK_type_liststore</property>
+ <property name="text_column">1</property>
<signal name="changed"
handler="GNUNET_GNS_GTK_type_cellrenderercombo_changed_cb" swapped="no"/>
</object>
- <attributes>
- <attribute name="text-column">3</attribute>
- </attributes>
</child>
</object>
</child>
@@ -325,28 +323,6 @@
</object>
</child>
</object>
- <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name is_public -->
- <column type="gboolean"/>
- <!-- column-name record_type -->
- <column type="guint"/>
- <!-- column-name record_type_as_string -->
- <column type="gchararray"/>
- <!-- column-name expiration_time -->
- <column type="guint64"/>
- <!-- column-name expiration_time_is_relative -->
- <column type="gboolean"/>
- <!-- column-name expiration_time_as_string -->
- <column type="gchararray"/>
- <!-- column-name value_as_string -->
- <column type="gchararray"/>
- <!-- column-name value_color -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
<columns>
<!-- column-name type -->
@@ -397,4 +373,26 @@
</row>
</data>
</object>
+ <object class="GtkTreeStore" id="GNUNET_GNS_GTK_treestore">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name is_public -->
+ <column type="gboolean"/>
+ <!-- column-name record_type -->
+ <column type="guint"/>
+ <!-- column-name record_type_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name expiration_time -->
+ <column type="guint64"/>
+ <!-- column-name expiration_time_is_relative -->
+ <column type="gboolean"/>
+ <!-- column-name expiration_time_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name value_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name value_color -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
</interface>
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-15 09:02:08 UTC (rev 20508)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-15 09:34:11 UTC (rev 20509)
@@ -408,6 +408,7 @@
"gnunet-gtk" /* FIXME: different icon? */ ,
"gnunet-gns-gtk");
+ /*
struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct
ZoneIteration_Context));
zc_ctx->zone = zone;
GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
@@ -415,6 +416,7 @@
GNUNET_NAMESTORE_RF_NONE,
&zone_iteration_proc,
zc_ctx);
+ */
/* make GUI visible */
if (!tray_only)
Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-15 09:02:08 UTC (rev
20508)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c 2012-03-15 09:34:11 UTC (rev
20509)
@@ -140,43 +140,6 @@
return FALSE;
}
-enum
-{
- COL_FIRST_NAME = 0,
- COL_LAST_NAME,
- COL_YEAR_BORN,
- NUM_COLS
-} ;
-
-static void
-test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_GNS_Context *gns=cls;
- GtkBuilder *builder = gns->builder;
- GtkTreeStore *ts;
- GtkTreeIter toplevel, child;
-
- ts = GTK_TREE_STORE (gtk_builder_get_object (builder,
"GNUNET_GNS_GTK_treestore"));
- GNUNET_assert (ts != NULL);
-
- GNUNET_break (0);
- /* Append a top level row and leave it empty */
- gtk_tree_store_append(ts, &toplevel, NULL);
- /*
- gtk_tree_store_set(ts, &toplevel,
- COL_FIRST_NAME, "Maria",
- COL_LAST_NAME, "Incognito",
- -1);*/
-}
-
-void
-GNUNET_GNS_GTK_main_treeview_click_cb (GtkTreeViewColumn *treeviewcolumn,
- gpointer user_data)
-{
-
- GNUNET_SCHEDULER_add_now (&test, user_data);
-}
-
/**
* The zone treeview was realized. Setup the model.
*
@@ -187,20 +150,22 @@
GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
gpointer user_data)
{
- /*
- struct GNUNET_GNS_Context *gns=user_data;
+ struct GNUNET_GNS_Context *gns = user_data;
GtkBuilder *builder = gns->builder;
- GNUNET_assert (GTK_IS_BUILDER(user_data));
+ GtkTreeStore *ts;
+ GtkTreeIter toplevel;
- GtkTreeModel * tm;
- tm = GTK_TREE_MODEL(gtk_builder_get_object (builder,
"GNUNET_GNS_GTK_treestore"));
- GNUNET_assert (tm != NULL);
-
- //gtk_tree
-*/
+ GNUNET_assert (GTK_IS_BUILDER(builder));
GNUNET_break (0);
+ ts = GTK_TREE_STORE (gtk_builder_get_object (builder,
"GNUNET_GNS_GTK_treestore"));
+ GNUNET_assert (GTK_IS_TREE_STORE(ts));
+ GNUNET_assert (ts != NULL);
+ /* Append a top level row and leave it empty */
+ gtk_tree_store_append(ts, &toplevel, NULL);
+
+ GNUNET_break (0);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20509 - in gnunet-gtk: contrib src/gns,
gnunet <=