[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22326 - in gnunet-gtk: . contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22326 - in gnunet-gtk: . contrib src |
|
Date: |
Tue, 26 Jun 2012 23:12:35 +0200 |
Author: grothoff
Date: 2012-06-26 23:12:35 +0200 (Tue, 26 Jun 2012)
New Revision: 22326
Removed:
gnunet-gtk/contrib/gnunet_gns_gtk_about_window.glade
gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_gns_gtk_zone_open.glade
gnunet-gtk/src/gns/
Modified:
gnunet-gtk/configure.ac
gnunet-gtk/src/Makefile.am
Log:
gnunet-gns-gtk integrated with gnunet-setup
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2012-06-26 21:11:32 UTC (rev 22325)
+++ gnunet-gtk/configure.ac 2012-06-26 21:12:35 UTC (rev 22326)
@@ -125,14 +125,6 @@
])
AC_SUBST(GNUNET_FS_APP)
-GNUNET_GNS_APP=""
-AC_ARG_ENABLE([gns-app],
- AS_HELP_STRING([--disable-gns-app],[Do not build gnunet-gns-gtk
application]))
-AS_IF([test "x$enable_gns_app" != "xno"], [
- GNUNET_GNS_APP="gns"
-])
-AC_SUBST(GNUNET_GNS_APP)
-
GNUNET_SETUP_APP=""
AC_ARG_ENABLE([setup-app],
AS_HELP_STRING([--disable-setup-app],[Do not build gnunet-setup
application]))
@@ -495,7 +487,6 @@
src/include/Makefile
src/lib/Makefile
src/fs/Makefile
-src/gns/Makefile
src/peerinfo/Makefile
src/setup/Makefile
src/statistics/Makefile
Deleted: gnunet-gtk/contrib/gnunet_gns_gtk_about_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gns_gtk_about_window.glade 2012-06-26
21:11:32 UTC (rev 22325)
+++ gnunet-gtk/contrib/gnunet_gns_gtk_about_window.glade 2012-06-26
21:12:35 UTC (rev 22326)
@@ -1,340 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkWindow" id="about_window">
- <property name="title" translatable="yes">gnunet-gns-gtk</property>
- <property name="modal">True</property>
- <property name="destroy_with_parent">True</property>
- <signal name="realize" handler="GNUNET_GTK_about_window_realized"/>
- <signal name="delete_event"
handler="GNUNET_GTK_about_window_got_delete_event"/>
- <child>
- <object class="GtkVBox" id="about_main_vbox">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkImage" id="about_logo_image">
- <property name="visible">True</property>
- <property name="pixbuf">gnunet_logo.png</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="about_name_version_label">
- <property name="visible">True</property>
- <property name="label">GNUnet-FS-GTK r20167</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- <attribute name="size" value="200"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="about_copyright_label">
- <property name="visible">True</property>
- <property name="label">(C) 2010-2012 The GNUnet Project</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="about_link_label">
- <property name="visible">True</property>
- <property name="label"><a href="https://gnunet.org/">GNUnet:
GNU's Framework for Secure P2P Networking</a></property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkNotebook" id="about_credits_notebook">
- <property name="can_focus">True</property>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_authors_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView"
id="about_credits_authors_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_authors_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_authors_tab">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Developed
by</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_docs_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView" id="about_credits_docs_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_docs_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_docs_tab">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Documented
by</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_trans_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView"
id="about_credits_trans_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_trans_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_trans_tab">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Translated
by</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="about_credits_art_scroller">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTextView" id="about_credits_art_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">credits_art_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="about_credits_art_tab">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Artwork by</property>
- </object>
- <packing>
- <property name="position">3</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow" id="about_license_scroller">
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">out</property>
- <child>
- <object class="GtkTextView" id="about_license_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="buffer">license_contents</property>
- <property name="accepts_tab">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="about_buttons_hbox">
- <property name="visible">True</property>
- <property name="border_width">5</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkButton" id="about_credits_button">
- <property name="label" translatable="yes">Credits</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_about_credits_button_clicked"/>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="about_license_button">
- <property name="label" translatable="yes">License</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_about_license_button_clicked"/>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton" id="about_close_button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_about_close_button_clicked"/>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">6</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <object class="GtkTextBuffer" id="credits_art_contents">
- <property name="text">Jakub 'jimmac' Steiner <address@hidden>
-Christian Muellner <address@hidden>
-Alex Jones <address@hidden>
-Nicklas Larsson <address@hidden>
-</property>
- </object>
- <object class="GtkTextBuffer" id="credits_authors_contents">
- <property name="text">Juergen Appel <address@hidden>
-Krista Grothoff <address@hidden>
-James Blackwell <address@hidden>
-Ludovic Courtes <address@hidden>
-Nils Durner <address@hidden>
-Renaldo Ferreira <address@hidden>
-Christian Grothoff <address@hidden>
-Eric Haumant
-Tzvetan Horozov <address@hidden>
-Gerd Knorr <address@hidden>
-Werner Koch <address@hidden>
-Uli Luckas <address@hidden>
-Blake Matheny
-Glenn McGrath
-Hendrik Pagenhardt <address@hidden>
-Ioana Patrascu <address@hidden>
-Marko Raeihae
-Paul Ruth <address@hidden>
-Risto Saarelma
-Antti Salonen
-Tiberius Stef <address@hidden>
-Tuomas Toivonen
-Tomi Tukiainen
-Kevin Vandersloot <address@hidden>
-Simo Viitanen
-Larry Waldo
-Igor Wronsky <address@hidden>
-<address@hidden></property>
- </object>
- <object class="GtkTextBuffer" id="credits_docs_contents">
- <property name="text">Christian Grothoff <address@hidden>
-Anders Carlsson <address@hidden>
-Nils Durner <address@hidden>
-Nicklas Larsson <address@hidden>
-Milan Bouchet-Valat <address@hidden>
-Igor Wronsky <address@hidden>
-</property>
- </object>
- <object class="GtkTextBuffer" id="credits_trans_contents">
- <property name="text">Di Ma
-Jens Palsberg <address@hidden>
-Christian Grothoff <address@hidden>
-Nils Durner <address@hidden>
-Mathieu <address@hidden>
-Eric Haumant
address@hidden
-Hiroshi Yamauchi <address@hidden>
-Adam Welc <address@hidden>
-Bogdan Carbunar <address@hidden>
-Steven Michael Murphy <address@hidden>
-Phan Vinh Thinh <address@hidden>
-Daniel Nylander <address@hidden>
-</property>
- </object>
- <object class="GtkTextBuffer" id="license_contents">
- <property name="text" translatable="yes">License should be loaded here at
runtime from the license file (no need to copy the whole GPL in
here...).</property>
- </object>
-</interface>
Deleted: gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade 2012-06-26 21:11:32 UTC
(rev 22325)
+++ gnunet-gtk/contrib/gnunet_gns_gtk_main_window.glade 2012-06-26 21:12:35 UTC
(rev 22326)
@@ -1,483 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkMenu" id="GNUNET_GNS_GTK_delete_popup_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="GNUNET_GNS_GTK_delete_button">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Delete Record</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_delete_popup_menu_delete_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="GNUNET_GTK_delete_sep">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="1d_exp">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Record expires in 1
day</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_exp1d_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="1w_exp">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Record expires in 1
week</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_exp1w_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="1y_exp">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Record expires in 1
year</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_exp1y_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="exp_inf">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Record never
expires</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_expinf_cb" swapped="no"/>
- </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"/>
- <!-- column-name name_is_editable -->
- <column type="gboolean"/>
- <!-- column-name name_is_row -->
- <column type="gboolean"/>
- <!-- column-name not_dummy_row -->
- <column type="gboolean"/>
- <!-- column-name expiration_time_as_color -->
- <column type="gchararray"/>
- <!-- column-name name_color -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GNS_GTK_type_liststore">
- <columns>
- <!-- column-name type -->
- <column type="guint"/>
- <!-- column-name typename -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">1</col>
- <col id="1" translatable="yes">A</col>
- </row>
- <row>
- <col id="0">2</col>
- <col id="1" translatable="yes">NS</col>
- </row>
- <row>
- <col id="0">5</col>
- <col id="1" translatable="yes">CNAME</col>
- </row>
- <row>
- <col id="0">6</col>
- <col id="1" translatable="yes">SOA</col>
- </row>
- <row>
- <col id="0">12</col>
- <col id="1" translatable="yes">PTR</col>
- </row>
- <row>
- <col id="0">15</col>
- <col id="1" translatable="yes">MX</col>
- </row>
- <row>
- <col id="0">16</col>
- <col id="1" translatable="yes">TXT</col>
- </row>
- <row>
- <col id="0">28</col>
- <col id="1" translatable="yes">AAAA</col>
- </row>
- <row>
- <col id="0">65536</col>
- <col id="1" translatable="yes">PKEY</col>
- </row>
- <row>
- <col id="0">65538</col>
- <col id="1" translatable="yes">LEHO</col>
- </row>
- </data>
- </object>
- <object class="GtkWindow" id="GNUNET_GNS_GTK_main_window">
- <property name="can_focus">False</property>
- <property name="title" translatable="yes">gnunet-gns-gtk</property>
- <property name="default_height">500</property>
- <signal name="delete-event"
handler="GNUNET_GNS_GTK_main_window_delete_event_cb" swapped="no"/>
- <child>
- <object class="GtkVBox" id="GNUNET_GNS_GTK_main_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuBar" id="GNUNET_GNS_GTK_menubar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="GNUNET_GNS_GTK_file_menuitem">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem"
id="GNUNET_GNS_GTK_new_imagemenuitem">
- <property name="label">gtk-new</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_new_imagemenuitem_activate_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem"
id="GNUNET_GNS_GTK_open_imagemenuitem">
- <property name="label">gtk-open</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_open_imagemenuitem_activate_cb" swapped="no"/>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem"
id="separatormenuitem1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem"
id="GNUNET_GNS_GTK_quit_imagemenuitem">
- <property name="label">gtk-quit</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_quit_imagemenuitem_activate_cb" swapped="no"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="GNUNET_GNS_GTK_options_menuitem">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Options</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkCheckMenuItem"
id="GNUNET_GNS_GTK_autoshort_imagemenuitem">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Automatically shorten names</property>
- <property name="use_underline">True</property>
- <signal name="toggled"
handler="GNUNET_GNS_GTK_autoshort_imagemenuitem_toggled_cb" swapped="no"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkMenuItem" id="GNUNET_GNS_GTK_help_menuitem">
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child type="submenu">
- <object class="GtkMenu" id="menu3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem"
id="GNUNET_GNS_GTK_about_imagemenuitem">
- <property name="label">gtk-about</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate"
handler="GNUNET_GNS_GTK_about_imagemenuitem_activate_cb" swapped="no"/>
- </object>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="GNUNET_GNS_GTK_main_frame">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="GNUNET_GNS_GTK_main_alignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkHBox" id="GNUNET_GNS_GTK_pseu_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="GNUNET_GNS_GTK_pseu_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Preferred
zone name (PSEU):</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="GNUNET_GNS_GTK_pseu_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Enter
the preferred name for this zone here. The value will be stored in the PSEU
record for your public key. This is the GNS equivalent of your domain name.
You should try to pick a name that is globally unique.</property>
- <property name="max_length">63</property>
- <property name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <signal name="changed"
handler="GNUNET_GNS_GTK_pseu_entry_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GNS_GTK_public_key_copy_button">
- <property name="label">gtk-copy</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Copy
the public key of this zone to the clipboard.</property>
- <property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GNS_GTK_public_key_copy_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="GNUNET_GNS_GTK_zone_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>SET TO
PUBLIC KEY OF THE ZONE</b></property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow"
id="GNUNET_GNS_GTK_main_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <object class="GtkTreeView" id="GNUNET_GNS_GTK_main_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="model">GNUNET_GNS_GTK_treestore</property>
- <signal name="button-press-event"
handler="GNUNET_GNS_GTK_main_treeview_button_press_popup_menu_cb" swapped="no"/>
- <signal name="key-press-event"
handler="GNUNET_GNS_GTK_main_treeview_key_press_popup_menu_cb" after="yes"
swapped="no"/>
- <signal name="realize"
handler="GNUNET_GNS_GTK_main_treeview_realize_cb" swapped="no"/>
- <signal name="popup-menu"
handler="GNUNET_GNS_GTK_main_treeview_popup_menu_cb" swapped="no"/>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GNS_GTK_name_treeviewcolumn">
- <property name="title">Name</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">0</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GNS_GTK_name_cellrenderertext">
- <signal name="edited"
handler="GNUNET_GNS_GTK_name_cellrenderertext_edited_cb" swapped="no"/>
- </object>
- <attributes>
- <attribute name="visible">9</attribute>
- <attribute name="background">13</attribute>
- <attribute name="editable">9</attribute>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GNS_GTK_ispublic_treeviewcolumn">
- <property name="sizing">fixed</property>
- <property name="fixed_width">50</property>
- <property name="title">Public</property>
- <property name="clickable">True</property>
- <child>
- <object class="GtkCellRendererToggle"
id="GNUNET_GNS_GTK_ispublic_cellrenderertoggle">
- <signal name="toggled"
handler="GNUNET_GNS_GTK_ispublic_cellrenderertoggle_toggled_cb" swapped="no"/>
- </object>
- <attributes>
- <attribute name="visible">10</attribute>
- <attribute name="active">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GNS_GTK_type_treeviewcolumn">
- <property name="sizing">autosize</property>
- <property name="fixed_width">90</property>
- <property name="title">Type</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">3</property>
- <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="visible">11</attribute>
- <attribute name="text">3</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GNS_GTK_expiration_treeviewcolumn">
- <property name="title">Expiration</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">4</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GNS_GTK_expiration_cellrenderertext">
- <property name="editable">True</property>
- <signal name="edited"
handler="GNUNET_GNS_GTK_expiration_cellrenderertext_edited_cb" swapped="no"/>
- </object>
- <attributes>
- <attribute name="visible">10</attribute>
- <attribute name="background">12</attribute>
- <attribute name="text">6</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GNS_GTK_value_treeviewcolumn">
- <property name="sizing">autosize</property>
- <property name="title">Value</property>
- <property name="expand">True</property>
- <property name="sort_column_id">7</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GNS_GTK_value_cellrenderertext">
- <property name="editable">True</property>
- <signal name="edited"
handler="GNUNET_GNS_GTK_value_cellrenderertext_edited_cb" swapped="no"/>
- </object>
- <attributes>
- <attribute name="visible">10</attribute>
- <attribute name="background">8</attribute>
- <attribute name="text">7</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
-</interface>
Deleted: gnunet-gtk/contrib/gnunet_gns_gtk_zone_open.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gns_gtk_zone_open.glade 2012-06-26 21:11:32 UTC
(rev 22325)
+++ gnunet-gtk/contrib/gnunet_gns_gtk_zone_open.glade 2012-06-26 21:12:35 UTC
(rev 22326)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <object class="GtkFileFilter" id="GNUNET_GNS_GTK_zone_open_filefilter">
- </object>
- <object class="GtkFileChooserDialog"
id="GNUNET_GNS_GTK_zone_open_filechooserdialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Open zone file...</property>
- <property name="type_hint">dialog</property>
- <property name="filter">GNUNET_GNS_GTK_zone_open_filefilter</property>
- <signal name="response"
handler="GNUNET_GNS_GTK_zone_open_dialog_response_cb" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkBox"
id="GNUNET_GNS_GTK_zone_open_filechooserdialog-vbox">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox"
id="GNUNET_GNS_GTK_zone_open_filechooserdialog-action_area">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton"
id="GNUNET_GNS_GTK_zone_open_cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GNS_GTK_zone_open_ok_button">
- <property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">GNUNET_GNS_GTK_zone_open_cancel_button</action-widget>
- <action-widget
response="-5">GNUNET_GNS_GTK_zone_open_ok_button</action-widget>
- </action-widgets>
- </object>
-</interface>
Modified: gnunet-gtk/src/Makefile.am
===================================================================
--- gnunet-gtk/src/Makefile.am 2012-06-26 21:11:32 UTC (rev 22325)
+++ gnunet-gtk/src/Makefile.am 2012-06-26 21:12:35 UTC (rev 22326)
@@ -1 +1 @@
-SUBDIRS = . include lib $(GNUNET_FS_APP) $(GNUNET_GNS_APP) $(GNUNET_SETUP_APP)
$(GNUNET_PEERINFO_APP) statistics
+SUBDIRS = . include lib $(GNUNET_FS_APP) $(GNUNET_SETUP_APP)
$(GNUNET_PEERINFO_APP) statistics
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22326 - in gnunet-gtk: . contrib src,
gnunet <=