[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36513 - gnunet-gtk/contrib
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r36513 - gnunet-gtk/contrib |
|
Date: |
Sat, 17 Oct 2015 03:34:47 +0200 |
Author: grothoff
Date: 2015-10-17 03:34:47 +0200 (Sat, 17 Oct 2015)
New Revision: 36513
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade
gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade
gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
Log:
-refining glade files to remove deprecated widgets
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -76,7 +76,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="GNUNET_GTK_save_as_dialog_options_hbox">
+ <object class="GtkBox" id="GNUNET_GTK_save_as_dialog_options_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -87,22 +87,22 @@
<object class="GtkImage" id="add_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
+ <property name="icon_name">list-add</property>
</object>
<object class="GtkImage" id="add_stock_image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
+ <property name="icon_name">list-add</property>
</object>
<object class="GtkImage" id="del_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
+ <property name="icon_name">list-remove</property>
</object>
<object class="GtkImage" id="del_stock_image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
+ <property name="icon_name">list-remove</property>
</object>
<object class="GtkAdjustment" id="expiration_year_adjustment">
<property name="upper">9999</property>
@@ -127,26 +127,29 @@
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_edit_publication_master_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_edit_publication_master_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <object class="GtkVPaned"
id="GNUNET_GTK_edit_publication_main_vpaned">
+ <object class="GtkPaned"
id="GNUNET_GTK_edit_publication_main_vpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHPaned"
id="GNUNET_GTK_edit_publication_top_hpaned">
+ <object class="GtkPaned"
id="GNUNET_GTK_edit_publication_top_hpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="position_set">True</property>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_edit_publication_metadata_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_metadata_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -309,7 +312,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_edit_publication_metadata_preview_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_metadata_preview_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -380,15 +383,16 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_secondary_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_secondary_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -532,11 +536,12 @@
<property name="left_padding">4</property>
<property name="right_padding">4</property>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_edit_publication_misc_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_misc_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_index_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_index_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -543,10 +548,10 @@
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_index_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label"
translatable="yes">_Index file:</property>
<property
name="use_underline">True</property>
<property
name="mnemonic_widget">GNUNET_GTK_edit_publication_index_checkbutton</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -578,7 +583,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_root_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_root_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -585,9 +590,9 @@
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_root_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label"
translatable="yes">_Root keyword:</property>
<property
name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -619,7 +624,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_anonymity_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_anonymity_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -626,9 +631,9 @@
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_anonymity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label"
translatable="yes">A_nonymity:</property>
<property
name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -677,7 +682,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_priority_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_edit_publication_priority_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -684,9 +689,9 @@
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_priority_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label"
translatable="yes">_Priority:</property>
<property
name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -719,7 +724,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox4">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -726,9 +731,9 @@
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_expiration_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label"
translatable="yes">_Expriation year:</property>
<property
name="use_underline">True</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -763,7 +768,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox9">
+ <object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -835,7 +840,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_buttons_hbox">
+ <object class="GtkBox" id="GNUNET_GTK_edit_publication_buttons_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -14,12 +14,13 @@
<property name="deletable">False</property>
<signal name="delete-event"
handler="GNUNET_GTK_enter_nick_window_delete_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_enter_nick_window_main_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_enter_nick_window_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <object class="GtkHBox" id="GNUNET_GTK_enter_nick_window__nick_hbox">
+ <object class="GtkBox" id="GNUNET_GTK_enter_nick_window__nick_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -62,7 +63,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_enter_nick_window_dialog_button_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_enter_nick_window_dialog_button_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -118,6 +119,6 @@
<object class="GtkImage" id="execute-stock-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-execute</property>
+ <property name="icon_name">system-run</property>
</object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2015-10-17 00:19:16 UTC
(rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2015-10-17 01:34:47 UTC
(rev 36513)
@@ -182,7 +182,7 @@
<object class="GtkImage" id="down_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-down</property>
+ <property name="icon_name">go-down</property>
</object>
<object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
<property name="mode">vertical</property>
@@ -195,12 +195,12 @@
<object class="GtkImage" id="find_and_replace_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-find-and-replace</property>
+ <property name="icon_name">edit-find-replace</property>
</object>
<object class="GtkImage" id="find_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-find</property>
+ <property name="icon_name">edit-find</property>
</object>
<object class="GtkImage" id="index_stock_image">
<property name="visible">True</property>
@@ -423,11 +423,12 @@
<signal name="configure-event"
handler="GNUNET_GTK_main_window_configure_event_cb" swapped="no"/>
<signal name="delete-event" handler="GNUNET_FS_GTK_delete_event_cb"
after="yes" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_main_window_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="main_window_bottom_hbox">
+ <object class="GtkBox" id="main_window_bottom_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -662,15 +663,16 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="main_window_search_hbox">
+ <object class="GtkBox" id="main_window_search_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">4</property>
<child>
- <object class="GtkVBox" id="main_window_namespace_vbox">
+ <object class="GtkBox" id="main_window_namespace_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel"
id="main_window_search_namespace_label">
<property name="can_focus">False</property>
@@ -733,9 +735,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="main_window_keywords_vbox">
+ <object class="GtkBox" id="main_window_keywords_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="GNUNET_FS_GTK_keyword_label">
<property name="visible">True</property>
@@ -797,9 +800,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="main_window_anonymity_vbox">
+ <object class="GtkBox" id="main_window_anonymity_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkLabel"
id="main_window_search_anonymity_label">
<property name="visible">True</property>
@@ -853,7 +857,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="main_window_mime_vbox">
+ <object class="GtkBox" id="main_window_mime_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -939,13 +943,14 @@
</packing>
</child>
<child>
- <object class="GtkHPaned" id="main_window_hpaned">
+ <object class="GtkPaned" id="main_window_hpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_main_window_left_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_main_window_left_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkNotebook"
id="GNUNET_GTK_main_window_notebook">
<property name="visible">True</property>
@@ -1111,7 +1116,7 @@
</object>
</child>
<child type="tab">
- <object class="GtkHBox"
id="GNUNET_GTK_download_frame_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_download_frame_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1162,10 +1167,11 @@
</packing>
</child>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_search_frame_download_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_search_frame_download_vbox">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_search_frame_download_into_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_search_frame_download_into_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -1173,10 +1179,10 @@
<object class="GtkLabel"
id="GNUNET_GTK_search_frame_download_location_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Download
into:</property>
+ <property name="single_line_mode">True</property>
<property name="xalign">1</property>
<property
name="yalign">0.43999999761581421</property>
- <property name="label" translatable="yes">Download
into:</property>
- <property name="single_line_mode">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1205,7 +1211,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_search_frame_download_filename_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_search_frame_download_filename_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -1213,10 +1219,10 @@
<object class="GtkLabel"
id="GNUNET_GTK_search_frame_download_filename_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes">Download
as:</property>
+ <property name="single_line_mode">True</property>
<property name="xalign">1</property>
<property
name="yalign">0.43999999761581421</property>
- <property name="label" translatable="yes">Download
as:</property>
- <property name="single_line_mode">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1263,7 +1269,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_search_frame_download_misc_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_search_frame_download_misc_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -1271,8 +1277,8 @@
<object class="GtkLabel"
id="GNUNET_GTK_search_frame_download_anonymity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Anonymity:</property>
<property name="xalign">1</property>
- <property name="label"
translatable="yes">Anonymity:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1337,7 +1343,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_search_frame_download_download_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_search_frame_download_download_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1375,7 +1381,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_main_window_extras_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -8,7 +8,7 @@
<object class="GtkImage" id="execute-stock-image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-execute</property>
+ <property name="icon_name">system-run</property>
</object>
<object class="GtkWindow" id="GNUNET_GTK_open_url_window">
<property name="can_focus">False</property>
@@ -22,12 +22,13 @@
<property name="deletable">False</property>
<signal name="delete-event"
handler="GNUNET_GTK_open_url_window_delete_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
+ <object class="GtkBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -88,7 +89,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_button_hbox">
+ <object class="GtkBox" id="GNUNET_GTK_open_url_dialog_button_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -139,7 +140,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_open_url_dialog_anonymity_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_open_url_dialog_anonymity_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -28,9 +28,10 @@
<property name="default_height">600</property>
<signal name="delete-event"
handler="GNUNET_FS_GTK_progress_dialog_delete_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox">
+ <object class="GtkBox" id="GNUNET_FS_GTK_progress_dialog_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkFrame" id="GNUNET_FS_GTK_progress_dialog_frame">
@@ -94,7 +95,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_FS_GTK_progress_dialog_buttons_hbox">
+ <object class="GtkBox"
id="GNUNET_FS_GTK_progress_dialog_buttons_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -18,9 +18,10 @@
<property name="default_height">600</property>
<signal name="delete-event"
handler="GNUNET_FS_GTK_pseu_progress_dialog_delete_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox"
id="GNUNET_FS_GTK_pseu_progress_dialog_main_vbox">
+ <object class="GtkBox" id="GNUNET_FS_GTK_pseu_progress_dialog_main_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkProgressBar"
id="GNUNET_FS_GTK_pseu_progress_dialog_progressbar">
@@ -37,7 +38,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_FS_GTK_pseu_progress_dialog_buttons_hbox">
+ <object class="GtkBox"
id="GNUNET_FS_GTK_pseu_progress_dialog_buttons_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -44,21 +44,41 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkImage" id="delete_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">edit-delete</property>
+ </object>
+ <object class="GtkImage" id="down_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-down</property>
+ </object>
+ <object class="GtkImage" id="edit_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">edit-select-all</property>
+ </object>
<object class="GtkImage" id="left_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
+ <property name="icon_name">go-previous</property>
</object>
<object class="GtkImage" id="new_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-new</property>
+ <property name="icon_name">document-new</property>
</object>
<object class="GtkImage" id="right_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
+ <property name="icon_name">go-next</property>
</object>
+ <object class="GtkImage" id="up_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-up</property>
+ </object>
<object class="GtkWindow" id="GNUNET_GTK_master_publish_dialog">
<property name="height_request">500</property>
<property name="can_focus">False</property>
@@ -67,15 +87,17 @@
<property name="window_position">center-on-parent</property>
<signal name="delete-event"
handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_GTK_master_publish_dialog_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_master_publish_dialog_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
+ <property name="orientation">vertical</property>
<property name="spacing">7</property>
<child>
- <object class="GtkVPaned"
id="GNUNET_GTK_master_publish_dialog_vpaned">
+ <object class="GtkPaned"
id="GNUNET_GTK_master_publish_dialog_vpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkFrame"
id="GNUNET_GTK_master_publish_dialog_top_frame">
<property name="height_request">200</property>
@@ -85,9 +107,10 @@
<property name="label_yalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_master_publish_dialog_top_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_top_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow"
id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window">
<property name="visible">True</property>
@@ -144,15 +167,14 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_master_dialog_modification_button_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_dialog_modification_button_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable"
id="GNUNET_GTK_master_publish_dialog_action_table">
+ <object class="GtkGrid"
id="GNUNET_GTK_master_publish_dialog_action_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
+ <property name="row_homogeneous">True</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_add_button">
<property name="label" translatable="yes">Add
_File</property>
@@ -163,6 +185,10 @@
<property name="use_underline">True</property>
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_add_button_clicked_cb" swapped="no"/>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_new_button">
@@ -177,7 +203,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -191,44 +218,40 @@
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_open_button_clicked_cb" swapped="no"/>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_edit_button">
- <property name="label">gtk-edit</property>
+ <property name="label">Edit</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">edit_image</property>
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_delete_button">
- <property name="label">gtk-delete</property>
+ <property name="label">Delete</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">delete_image</property>
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb"
swapped="no"/>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</object>
@@ -240,27 +263,26 @@
</packing>
</child>
<child>
- <object class="GtkTable"
id="GNUNET_GTK_master_publish_dialog_arrow_table">
+ <object class="GtkGrid"
id="GNUNET_GTK_master_publish_dialog_arrow_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="homogeneous">True</property>
+ <property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_up_button">
- <property name="label">gtk-go-up</property>
+ <property name="label">Up</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">up_image</property>
<property name="xalign">0</property>
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_up_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -277,27 +299,25 @@
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_left_button_clicked_cb" swapped="no"/>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_down_button">
- <property name="label">gtk-go-down</property>
+ <property name="label">Down</property>
<property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property
name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">down_image</property>
<property name="xalign">0</property>
<signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_down_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -315,9 +335,7 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -326,102 +344,6 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -456,11 +378,12 @@
<property name="label_yalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_master_publish_dialog_bottom_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_bottom_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="dummy_hbox_1">
+ <object class="GtkBox" id="dummy_hbox_1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -493,7 +416,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_master_publish_dialog_own_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_own_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -550,11 +473,12 @@
</packing>
</child>
<child>
- <object class="GtkVBox"
id="GNUNET_GTK_master_publish_dialog_own_vbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_own_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_master_publish_dialog_identifier_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_identifier_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -562,8 +486,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Name under which the publication will appear in your
namespace. Equivalent to the keyword that is used when publishing in the global
namespace.</property>
+ <property name="label"
translatable="yes">Identifier:</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Identifier:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -683,7 +607,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="dummy_hbox_2">
+ <object class="GtkBox" id="dummy_hbox_2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -718,7 +642,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_master_publish_dialog_update_id_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_update_id_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -785,7 +709,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_master_publish_dialog_master_buttons_hbox">
+ <object class="GtkBox"
id="GNUNET_GTK_master_publish_dialog_master_buttons_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
2015-10-17 00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
2015-10-17 01:34:47 UTC (rev 36513)
@@ -228,7 +228,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="GNUNET_GTK_publish_dialog_index_hbox">
+ <object class="GtkBox" id="GNUNET_GTK_publish_dialog_index_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -80,7 +80,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade 2015-10-17 00:19:16 UTC
(rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade 2015-10-17 01:34:47 UTC
(rev 36513)
@@ -99,7 +99,7 @@
<object class="GtkWindow" id="_publish_label_window">
<property name="can_focus">False</property>
<child>
- <object class="GtkHBox" id="_publish_label_hbox">
+ <object class="GtkBox" id="_publish_label_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade 2015-10-17 00:19:16 UTC
(rev 36512)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade 2015-10-17 01:34:47 UTC
(rev 36513)
@@ -231,7 +231,7 @@
<property name="decorated">False</property>
<property name="deletable">False</property>
<child>
- <object class="GtkHBox" id="_search_result_label_hbox">
+ <object class="GtkBox" id="_search_result_label_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
Modified: gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2015-10-17
00:19:16 UTC (rev 36512)
+++ gnunet-gtk/contrib/gnunet_peerinfo_gtk_main_window.glade 2015-10-17
01:34:47 UTC (rev 36513)
@@ -1,7 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.18.3
+
+Copyright (C)
+
+This file is part of gnunet-peerinfo-gtk.
+
+gnunet-peerinfo-gtk is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+gnunet-peerinfo-gtk is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with gnunet-peerinfo-gtk. If not, see <http://www.gnu.org/licenses/>.
+
+-->
<interface>
<requires lib="gtk+" version="3.0"/>
+ <!-- interface-license-type gplv3 -->
+ <!-- interface-name gnunet-peerinfo-gtk -->
<object class="GtkTreeStore" id="GNUNET_PEERINFO_GTK_tree_store">
<columns>
<!-- column-name peer_identity -->
@@ -74,30 +95,35 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">ATS</property>
- <property name="stock">gtk-connect</property>
+ <property name="icon_name">network-transmit</property>
</object>
<object class="GtkImage" id="connected_image_core">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">CORE</property>
- <property name="stock">gtk-dialog-authentication</property>
+ <property name="icon_name">dialog-password</property>
</object>
<object class="GtkImage" id="connected_image_neighbours">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">TRANSPORT</property>
- <property name="stock">gtk-connect</property>
+ <property name="icon_name">object-flip-horizontal</property>
</object>
<object class="GtkImage" id="connected_image_plugin">
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">PLUGIN</property>
- <property name="stock">gtk-connect</property>
+ <property name="icon_name">network-transmit-receive</property>
</object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">help-about</property>
+ </object>
<object class="GtkImage" id="validated_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Address valid?</property>
- <property name="stock">gtk-connect</property>
+ <property name="icon_name">address-book-new</property>
</object>
<object class="GtkWindow" id="GNUNET_PEERINFO_GTK_main_window">
<property name="can_focus">False</property>
@@ -108,9 +134,10 @@
<property name="icon_name">gnunet-gtk</property>
<signal name="delete-event" handler="GNUNET_PEERINFO_GTK_quit_cb"
after="yes" swapped="no"/>
<child>
- <object class="GtkVBox" id="GNUNET_PEERINFO_GTK_main_window_vbox">
+ <object class="GtkBox" id="GNUNET_PEERINFO_GTK_main_window_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkMenuBar" id="GNUNET_PEERINFO_GTK_main_menu">
<property name="visible">True</property>
@@ -127,13 +154,14 @@
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_PEERINFO_GTK_main_menu_help_about">
- <property name="label">gtk-about</property>
+ <property name="label">_About</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Display information about this version of
gnunet-peerinfo-gtk</property>
<property
name="accel_path"><gnunet-peerinfo-gtk>/Help/About</property>
<property name="use_underline">True</property>
- <property name="use_stock">True</property>
+ <property name="image">image1</property>
+ <property name="use_stock">False</property>
<signal name="activate"
handler="GNUNET_PEERINFO_GTK_main_menu_help_about_activate_cb" swapped="no"/>
</object>
</child>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36513 - gnunet-gtk/contrib,
gnunet <=