[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33481 - in gnunet-gtk: contrib src/conversation src/fs src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33481 - in gnunet-gtk: contrib src/conversation src/fs src/include src/lib src/main src/peerinfo |
|
Date: |
Mon, 2 Jun 2014 23:10:49 +0200 |
Author: grothoff
Date: 2014-06-02 23:10:49 +0200 (Mon, 02 Jun 2014)
New Revision: 33481
Modified:
gnunet-gtk/contrib/gnunet_gtk.glade
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c
gnunet-gtk/src/fs/gnunet-fs-gtk.c
gnunet-gtk/src/fs/gnunet-fs-gtk.h
gnunet-gtk/src/include/gnunet_gtk.h
gnunet-gtk/src/lib/trayicon.c
gnunet-gtk/src/main/gnunet-gtk.c
gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
Log:
make gnunet-gtk work with gtk3 widgets
Modified: gnunet-gtk/contrib/gnunet_gtk.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gtk.glade 2014-06-02 20:12:20 UTC (rev 33480)
+++ gnunet-gtk/contrib/gnunet_gtk.glade 2014-06-02 21:10:49 UTC (rev 33481)
@@ -18,13 +18,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkNotebook" id="gnunt_gtk_notebook">
+ <object class="GtkNotebook" id="gnunet_gtk_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK
| GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK |
GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK |
GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
<property name="scrollable">True</property>
<child>
- <object class="GtkHBox" id="gnunet_statistics_hbox">
+ <object class="GtkBox" id="gnunet_statistics_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK
| GDK_BUTTON1_MOTION_MASK | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK |
GDK_VISIBILITY_NOTIFY_MASK | GDK_PROXIMITY_IN_MASK | GDK_PROXIMITY_OUT_MASK |
GDK_SUBSTRUCTURE_MASK | GDK_SCROLL_MASK</property>
@@ -50,7 +50,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="gnunet_peerinfo_hbox">
+ <object class="GtkBox" id="gnunet_peerinfo_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -77,7 +77,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="gnunet_namestore_hbox">
+ <object class="GtkBox" id="gnunet_namestore_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -104,7 +104,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="gnunet_fs_hbox">
+ <object class="GtkBox" id="gnunet_fs_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -131,7 +131,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="gnunet_identity_hbox">
+ <object class="GtkBox" id="gnunet_identity_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -183,7 +183,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="gnunet_setup_hbox">
+ <object class="GtkBox" id="gnunet_setup_hbox">
<property name="can_focus">False</property>
<child>
<placeholder/>
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-06-02
20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-06-02
21:10:49 UTC (rev 33481)
@@ -161,7 +161,7 @@
run (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GtkWindow *main_window;
+ GtkWidget *main_window;
ml = cls;
if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
@@ -169,24 +169,22 @@
GNUNET_GTK_set_icon_search_path ();
GNUNET_GTK_setup_nls ();
/* setup main window */
- main_window = GTK_WINDOW (GCG_get_main_window_object
+ main_window = GTK_WIDGET (GCG_get_main_window_object
("gnunet_conversation_gtk_main_window"));
- main_window =
- GTK_WINDOW (GNUNET_GTK_plug_me
- ("GNUNET_CONVERSATION_GTK_PLUG",
- GTK_WIDGET (main_window)));
+ main_window = GNUNET_GTK_plug_me ("GNUNET_CONVERSATION_GTK_PLUG",
+ main_window);
+ gtk_window_maximize (GTK_WINDOW (main_window));
if (NULL == getenv ("GNUNET_CONVERSATION_GTK_PLUG"))
- GNUNET_GTK_tray_icon_create (ml, GTK_WINDOW (main_window),
- "gnunet-conversation-gtk"
- /* FIXME: different icon? */ ,
+ GNUNET_GTK_tray_icon_create (ml,
+ GTK_WINDOW (main_window),
+ "gnunet-gtk" /* FIXME: different icon? */,
"gnunet-conversation-gtk");
/* make GUI visible */
if (! tray_only)
{
- gtk_widget_show (GTK_WIDGET (main_window));
+ gtk_widget_show (main_window);
gtk_window_present (GTK_WINDOW (main_window));
}
-
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task,
NULL);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c 2014-06-02
20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_egos.c 2014-06-02
21:10:49 UTC (rev 33481)
@@ -61,6 +61,7 @@
*/
static char *default_ego;
+
/**
* Obtain the currently selected ego.
*
@@ -174,7 +175,7 @@
gnunet_conversation_gtk_ego_copy_button_clicked_cb (GtkButton *button,
gpointer user_data)
{
- GNUNET_break (0);
+ GNUNET_break (0); // FIXME: not implemented
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c 2014-06-02 20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c 2014-06-02 21:10:49 UTC (rev 33481)
@@ -426,7 +426,9 @@
struct GNUNET_GTK_MainWindowContext *main_context = user_data;
/* raise the window */
- gtk_window_present_with_time (GTK_WINDOW (main_context->main_window), time_);
+ if (GTK_IS_WINDOW (main_context->main_window))
+ gtk_window_present_with_time (GTK_WINDOW (main_context->main_window),
+ time_);
switch (command)
{
@@ -720,7 +722,7 @@
main_context.download_anonymity_combo = GTK_COMBO_BOX
(GNUNET_FS_GTK_get_main_window_object
("main_window_download_anonymity_combobox"));
main_context.download_recursive_checkbutton = GTK_CHECK_BUTTON
(GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_search_frame_download_recursive_checkbox"));
main_context.download_download_button = GTK_BUTTON
(GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_search_frame_download_download_button"));
- main_context.download_panel = GTK_VBOX (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_search_frame_download_vbox"));
+ main_context.download_panel = GTK_BOX (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_search_frame_download_vbox"));
main_context.notebook = GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
("GNUNET_GTK_main_window_notebook"));
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.h 2014-06-02 20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.h 2014-06-02 21:10:49 UTC (rev 33481)
@@ -203,7 +203,7 @@
GtkComboBox *download_anonymity_combo;
GtkCheckButton *download_recursive_checkbutton;
GtkButton *download_download_button;
- GtkVBox *download_panel;
+ GtkBox *download_panel;
GtkNotebook *notebook;
Modified: gnunet-gtk/src/include/gnunet_gtk.h
===================================================================
--- gnunet-gtk/src/include/gnunet_gtk.h 2014-06-02 20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/include/gnunet_gtk.h 2014-06-02 21:10:49 UTC (rev 33481)
@@ -167,8 +167,10 @@
* @param tooltip tooltip for the tray icon
*/
void
-GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml, GtkWindow * main,
- const char *icon_name, const char *tooltip);
+GNUNET_GTK_tray_icon_create (struct GNUNET_GTK_MainLoop *ml,
+ GtkWindow *main,
+ const char *icon_name,
+ const char *tooltip);
/**
* Change our tray icon.
Modified: gnunet-gtk/src/lib/trayicon.c
===================================================================
--- gnunet-gtk/src/lib/trayicon.c 2014-06-02 20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/lib/trayicon.c 2014-06-02 21:10:49 UTC (rev 33481)
@@ -161,10 +161,7 @@
const char *tooltip)
{
if (NULL == tray_icon)
- {
- GNUNET_break (0);
return;
- }
gtk_status_icon_set_from_icon_name (tray_icon, icon_name);
gtk_status_icon_set_tooltip_text (tray_icon, tooltip);
gtk_status_icon_set_visible (tray_icon, TRUE);
Modified: gnunet-gtk/src/main/gnunet-gtk.c
===================================================================
--- gnunet-gtk/src/main/gnunet-gtk.c 2014-06-02 20:12:20 UTC (rev 33480)
+++ gnunet-gtk/src/main/gnunet-gtk.c 2014-06-02 21:10:49 UTC (rev 33481)
@@ -263,15 +263,23 @@
const char *binary,
const char *env_var)
{
- GtkContainer *v;
+ GtkWidget *v;
+ GtkWidget *l;
struct Plug *p;
+ GtkNotebook *n;
p = GNUNET_new (struct Plug);
p->s = gtk_socket_new ();
gtk_widget_set_events (p->s,
GDK_ALL_EVENTS_MASK);
- v = GTK_CONTAINER (get_object (container));
- gtk_container_add (v, p->s);
+ n = GTK_NOTEBOOK (get_object ("gnunet_gtk_notebook"));
+ v = GTK_WIDGET (get_object (container));
+ l = gtk_notebook_get_tab_label (n, v);
+ g_object_ref (l);
+ gtk_notebook_remove_page (n,
+ gtk_notebook_page_num (n, v));
+ gtk_notebook_append_page (n, p->s, l);
+ g_object_unref (l);
p->binary = binary;
p->env_var = env_var;
p->sig_id = g_signal_connect (p->s,
Modified: gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c
===================================================================
--- gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2014-06-02 20:12:20 UTC
(rev 33480)
+++ gnunet-gtk/src/peerinfo/gnunet-peerinfo-gtk.c 2014-06-02 21:10:49 UTC
(rev 33481)
@@ -1530,7 +1530,7 @@
if (NULL == getenv ("GNUNET_PEERINFO_GTK_PLUG"))
GNUNET_GTK_tray_icon_create (ml,
GTK_WINDOW (main_window),
- "gnunet-gtk" /* FIXME: different icon? */ ,
+ "gnunet-gtk" /* FIXME: different icon? */,
"gnunet-peerinfo-gtk");
tv = GTK_TREE_VIEW (get_object ("GNUNET_PEERINFO_GTK_main_window_treeview"));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33481 - in gnunet-gtk: contrib src/conversation src/fs src/include src/lib src/main src/peerinfo,
gnunet <=