[f-spot] TabbloExport UI migrated to GtkBuilder
- From: Lorenzo Milesi <lmilesi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [f-spot] TabbloExport UI migrated to GtkBuilder
- Date: Tue, 11 Aug 2009 19:44:07 +0000 (UTC)
commit 04655b45fbcc60e7722f87caf142b634378dd0d4
Author: Wojciech Dzierżanowski <wojciech dzierzanowski gmail com>
Date: Tue Aug 11 21:39:23 2009 +0200
TabbloExport UI migrated to GtkBuilder
extensions/Exporters/TabbloExport/AssemblyInfo.cs | 2 +-
extensions/Exporters/TabbloExport/Makefile.am | 31 ++--
.../Exporters/TabbloExport/TabbloExport.addin.xml | 2 +-
extensions/Exporters/TabbloExport/TabbloExport.cs | 10 +-
.../Exporters/TabbloExport/TabbloExportView.cs | 57 +++---
.../TabbloExport/UserDecisionCertificatePolicy.cs | 22 +-
.../{TabbloExport.glade => ui/TabbloExport.ui} | 230 ++++++++++----------
.../{TrustError.glade => ui/TrustError.ui} | 107 ++++++----
8 files changed, 245 insertions(+), 216 deletions(-)
---
diff --git a/extensions/Exporters/TabbloExport/AssemblyInfo.cs b/extensions/Exporters/TabbloExport/AssemblyInfo.cs
index 776edc6..2a99d5e 100644
--- a/extensions/Exporters/TabbloExport/AssemblyInfo.cs
+++ b/extensions/Exporters/TabbloExport/AssemblyInfo.cs
@@ -29,4 +29,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion ("0.3.*")]
+[assembly: AssemblyVersion ("0.3.1.*")]
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index 5d73ddc..23fe482 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -17,6 +17,12 @@ PLUGIN_SOURCES = \
$(srcdir)/TabbloExportView.cs \
$(srcdir)/UserDecisionCertificatePolicy.cs
+PLUGIN_INPUT = \
+ $(PLUGIN_SOURCES) \
+ $(PLUGIN_MANIFEST) \
+ ui/$(PLUGIN_NAME).ui \
+ ui/TrustError.ui
+
REFS = \
-r:$(top_builddir)/src/f-spot.exe \
@@ -24,31 +30,30 @@ REFS = \
-r:$(top_builddir)/src/FSpot.Utils.dll \
-r:Tabblo/Mono.Tabblo.dll \
$(LINK_KEYRING) \
- $(LINK_MONO_ADDINS) \
- $(LINK_SEMWEB) \
- $(LINK_GIOSHARP) \
- $(LINK_GTKSHARPBEANS) \
- $(LINK_GPHOTO2) \
+ $(LINK_MONO_ADDINS) \
+ $(LINK_SEMWEB) \
+ $(LINK_GIOSHARP) \
+ $(LINK_GTKSHARPBEANS) \
+ $(LINK_GPHOTO2) \
-r:Mono.Posix.dll
PKGS = \
- -pkg:gtk-sharp-2.0 \
- -pkg:glade-sharp-2.0
+ -pkg:gtk-sharp-2.0
SUBDIRS = \
Tabblo
RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
- -resource:$(srcdir)/$(PLUGIN_NAME).glade \
- -resource:$(srcdir)/TrustError.glade
+ -resource:$(srcdir)/ui/$(PLUGIN_NAME).ui \
+ -resource:$(srcdir)/ui/TrustError.ui
all: $(PLUGIN_ASSEMBLY)
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
-$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
+$(PLUGIN_ASSEMBLY): $(PLUGIN_INPUT)
$(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
@@ -60,11 +65,7 @@ install-data-hook:
plugin_DATA = \
$(PLUGIN_ASSEMBLY)
-EXTRA_DIST = \
- $(PLUGIN_SOURCES) \
- $(PLUGIN_MANIFEST) \
- TrustError.glade \
- $(PLUGIN_NAME).glade
+EXTRA_DIST = $(PLUGIN_INPUT)
CLEANFILES = \
$(PLUGIN_ASSEMBLY) \
diff --git a/extensions/Exporters/TabbloExport/TabbloExport.addin.xml b/extensions/Exporters/TabbloExport/TabbloExport.addin.xml
index 7e33457..d78cc17 100644
--- a/extensions/Exporters/TabbloExport/TabbloExport.addin.xml
+++ b/extensions/Exporters/TabbloExport/TabbloExport.addin.xml
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="0.6.1.2"
+ version="0.6.1.3"
name="Tabblo Export"
description="This extension allows you to export your photos to Tabblo."
author="Wojciech Dzierżanowski"
diff --git a/extensions/Exporters/TabbloExport/TabbloExport.cs b/extensions/Exporters/TabbloExport/TabbloExport.cs
index 51b81f3..a5ea18e 100644
--- a/extensions/Exporters/TabbloExport/TabbloExport.cs
+++ b/extensions/Exporters/TabbloExport/TabbloExport.cs
@@ -82,6 +82,8 @@ namespace FSpotTabbloExport {
// focus (it can be invalid, and hence disabled, for a
// moment).
main_dialog.ResetFocus ();
+
+ main_dialog.Show ();
}
@@ -90,8 +92,7 @@ namespace FSpotTabbloExport {
Debug.Assert (null != model);
Debug.Assert (null != main_dialog);
- main_dialog.tabblo_export_dialog.Response +=
- HandleResponse;
+ main_dialog.Response += HandleResponse;
// Account data
model.UsernameChanged += HandleUsernameChanged;
@@ -252,9 +253,8 @@ namespace FSpotTabbloExport {
private FSpot.Tag [] SelectTags ()
{
TagStore tag_store = FSpot.Core.Database.Tags;
- FSpot.UI.Dialog.TagSelectionDialog tagDialog =
- new FSpot.UI.Dialog.TagSelectionDialog (
- tag_store);
+ TagSelectionDialog tagDialog =
+ new TagSelectionDialog (tag_store);
FSpot.Tag [] tags = tagDialog.Run ();
tagDialog.Hide ();
diff --git a/extensions/Exporters/TabbloExport/TabbloExportView.cs b/extensions/Exporters/TabbloExport/TabbloExportView.cs
index 89e9e4d..77659dd 100644
--- a/extensions/Exporters/TabbloExport/TabbloExportView.cs
+++ b/extensions/Exporters/TabbloExport/TabbloExportView.cs
@@ -29,43 +29,55 @@
using System;
using System.Diagnostics;
+using System.Reflection;
namespace FSpotTabbloExport {
- class TabbloExportView {
+ class TabbloExportView : FSpot.UI.Dialog.BuilderDialog {
private const string DialogName = "tabblo_export_dialog";
- [Glade.Widget] internal Gtk.Dialog tabblo_export_dialog;
+ [GtkBeans.Builder.Object]
+ private Gtk.ScrolledWindow thumb_scrolled_window;
- [Glade.Widget] private Gtk.ScrolledWindow thumb_scrolled_window;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Entry username_entry;
- [Glade.Widget] internal Gtk.Entry username_entry;
- [Glade.Widget] internal Gtk.Entry password_entry;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Entry password_entry;
+
+ [GtkBeans.Builder.Object]
+ internal Gtk.CheckButton attach_tags_button;
+
+ [GtkBeans.Builder.Object]
+ private Gtk.Alignment attached_tags_alignment;
- [Glade.Widget] internal Gtk.CheckButton attach_tags_button;
- [Glade.Widget] private Gtk.Alignment attached_tags_alignment;
internal FSpot.Widgets.TagView attached_tags_view;
- [Glade.Widget] internal Gtk.Button attached_tags_select_button;
- [Glade.Widget] internal Gtk.CheckButton remove_tags_button;
- [Glade.Widget] private Gtk.Alignment removed_tags_alignment;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Button attached_tags_select_button;
+
+ [GtkBeans.Builder.Object]
+ internal Gtk.CheckButton remove_tags_button;
+
+ [GtkBeans.Builder.Object]
+ private Gtk.Alignment removed_tags_alignment;
+
internal FSpot.Widgets.TagView removed_tags_view;
- [Glade.Widget] internal Gtk.Button removed_tags_select_button;
- [Glade.Widget] private Gtk.Button export_button;
+ [GtkBeans.Builder.Object]
+ internal Gtk.Button removed_tags_select_button;
+
+ [GtkBeans.Builder.Object]
+ private Gtk.Button export_button;
- // The dialog is constructed and shown.
internal TabbloExportView (FSpot.IBrowsableCollection photos)
+ : base (Assembly.GetExecutingAssembly (),
+ "TabbloExport.ui", DialogName)
{
- Glade.XML glade_xml = new Glade.XML (
- null, "TabbloExport.glade", DialogName,
- "f-spot");
- glade_xml.Autoconnect (this);
-
// Thumbnails
FSpot.Widgets.IconView icon_view =
new FSpot.Widgets.IconView (photos);
@@ -83,15 +95,6 @@ namespace FSpotTabbloExport {
removed_tags_view = new FSpot.Widgets.TagView ();
removed_tags_alignment.Add (removed_tags_view);
removed_tags_view.Show ();
-
- tabblo_export_dialog.Show ();
- }
-
-
- internal void Destroy ()
- {
- Debug.Assert (null != tabblo_export_dialog);
- tabblo_export_dialog.Destroy ();
}
diff --git a/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs b/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs
index ccda10d..fb5bce9 100644
--- a/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs
+++ b/extensions/Exporters/TabbloExport/UserDecisionCertificatePolicy.cs
@@ -30,6 +30,7 @@
using System;
using System.Diagnostics;
using System.Net;
+using System.Reflection;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
@@ -41,11 +42,11 @@ namespace FSpotTabbloExport {
: ApplicationCentricCertificatePolicy {
private const string DialogName = "trust_error_dialog";
- [Glade.Widget] Gtk.Dialog dialog;
- [Glade.Widget] Gtk.Label url_label;
- [Glade.Widget] Gtk.RadioButton abort_radiobutton;
- [Glade.Widget] Gtk.RadioButton once_radiobutton;
- [Glade.Widget] Gtk.RadioButton always_radiobutton;
+ [GtkBeans.Builder.Object] Gtk.Dialog dialog;
+ [GtkBeans.Builder.Object] Gtk.Label url_label;
+ [GtkBeans.Builder.Object] Gtk.RadioButton abort_radiobutton;
+ [GtkBeans.Builder.Object] Gtk.RadioButton once_radiobutton;
+ [GtkBeans.Builder.Object] Gtk.RadioButton always_radiobutton;
private X509Certificate certificate;
private WebRequest request;
@@ -73,12 +74,11 @@ namespace FSpotTabbloExport {
private bool DoGetDecision ()
{
- Glade.XML glade_xml = new Glade.XML (
- null, "TrustError.glade", DialogName,
- "f-spot");
- glade_xml.Autoconnect (this);
-
- dialog = (Gtk.Dialog) glade_xml.GetWidget (DialogName);
+ GtkBeans.Builder builder = new GtkBeans.Builder (
+ Assembly.GetExecutingAssembly (),
+ "TrustError.ui", null);
+ builder.Autoconnect (this);
+ dialog = (Gtk.Dialog) builder.GetObject (DialogName);
url_label.Markup = String.Format (
url_label.Text, String.Format (
diff --git a/extensions/Exporters/TabbloExport/TabbloExport.glade b/extensions/Exporters/TabbloExport/ui/TabbloExport.ui
similarity index 72%
rename from extensions/Exporters/TabbloExport/TabbloExport.glade
rename to extensions/Exporters/TabbloExport/ui/TabbloExport.ui
index 3deb54c..527ab0c 100644
--- a/extensions/Exporters/TabbloExport/TabbloExport.glade
+++ b/extensions/Exporters/TabbloExport/ui/TabbloExport.ui
@@ -1,77 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
-<glade-interface>
- <requires lib="canvas"/>
- <requires lib="gnome"/>
- <widget class="GtkDialog" id="tabblo_export_dialog">
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.6 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="tabblo_export_dialog">
<property name="title" translatable="yes">Export</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox11">
+ <object class="GtkVBox" id="dialog-vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="border_width">6</property>
<child>
- <widget class="GtkFrame" id="frame8">
+ <object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment12">
+ <object class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="thumb_scrolled_window">
+ <object class="GtkScrolledWindow" id="thumb_scrolled_window">
<property name="width_request">180</property>
<property name="height_request">180</property>
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="can_focus">False</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="photo_frame">
+ <child type="label">
+ <object class="GtkLabel" id="photo_frame">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Photos</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox11">
+ <object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame9">
+ <object class="GtkFrame" id="frame9">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkLabel" id="label44">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Tabblo account</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table10">
+ <object class="GtkTable" id="table10">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">2</property>
@@ -79,13 +70,13 @@
<property name="column_spacing">7</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="password_label">
+ <object class="GtkLabel" id="password_label">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Password:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">password_entry</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -94,12 +85,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="password_entry">
+ <object class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -109,50 +99,52 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="username_label">
+ <object class="GtkLabel" id="username_label">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">_Username:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="username_entry">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
+ </object>
</child>
- </widget>
+ <child type="label">
+ <object class="GtkLabel" id="label44">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Tabblo account</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame10">
+ <object class="GtkFrame" id="frame10">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <property name="shadow_type">none</property>
<child>
- <widget class="GtkTable" id="table11">
+ <object class="GtkTable" id="table11">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="n_rows">3</property>
@@ -160,28 +152,27 @@
<property name="column_spacing">7</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="xpad">12</property>
<property name="xalign">0</property>
+ <property name="xpad">12</property>
<property name="label" translatable="yes"><small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small></property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="width_chars">42</property>
- </widget>
+ </object>
<packing>
- <property name="left_attach">0</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="removed_tags_alignment">
+ <object class="GtkAlignment" id="removed_tags_alignment">
<property name="visible">True</property>
<property name="sensitive">False</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -190,13 +181,13 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="attached_tags_alignment">
+ <object class="GtkAlignment" id="attached_tags_alignment">
<property name="visible">True</property>
<property name="sensitive">False</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -205,13 +196,13 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="removed_tags_select_button">
+ <object class="GtkButton" id="removed_tags_select_button">
+ <property name="label" translatable="yes">Select...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Select...</property>
- <property name="response_id">0</property>
- </widget>
+ <property name="receives_default">False</property>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -220,13 +211,13 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="attached_tags_select_button">
+ <object class="GtkButton" id="attached_tags_select_button">
+ <property name="label" translatable="yes">Select...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Select...</property>
- <property name="response_id">0</property>
- </widget>
+ <property name="receives_default">False</property>
+ </object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
@@ -235,97 +226,110 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="remove_tags_button">
+ <object class="GtkCheckButton" id="remove_tags_button">
+ <property name="label" translatable="yes">Rem_ove from exported photos:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Rem_ove from exported photos:</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="attach_tags_button">
+ <object class="GtkCheckButton" id="attach_tags_button">
+ <property name="label" translatable="yes">_Attach to exported photos:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Attach to exported photos:</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label1">
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>F-Spot tags</b></property>
<property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area11">
+ <object class="GtkHButtonBox" id="dialog-action_area11">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">True</property>
+ <property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="cancel_button">
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="export_button">
+ <object class="GtkButton" id="export_button">
+ <property name="label" translatable="yes">_Export</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">_Export</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">-5</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="-6">cancel_button</action-widget>
+ <action-widget response="-5">export_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/extensions/Exporters/TabbloExport/TrustError.glade b/extensions/Exporters/TabbloExport/ui/TrustError.ui
similarity index 65%
rename from extensions/Exporters/TabbloExport/TrustError.glade
rename to extensions/Exporters/TabbloExport/ui/TrustError.ui
index 57c4c8d..280d1c9 100644
--- a/extensions/Exporters/TabbloExport/TrustError.glade
+++ b/extensions/Exporters/TabbloExport/ui/TrustError.ui
@@ -1,145 +1,166 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Sep 7 21:22:13 2008 -->
-<glade-interface>
- <widget class="GtkDialog" id="trust_error_dialog">
+<?xml version="1.0"?>
+<interface>
+ <!-- interface-requires gtk+ 2.10 -->
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="trust_error_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Trust Error</property>
<property name="resizable">False</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="deletable">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
- <widget class="GtkLabel" id="label0">
+ <object class="GtkLabel" id="label0">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">A trust error occured while attempting to access</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="url_label">
+ <object class="GtkLabel" id="url_label">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes"><b>{0}</b>.</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">-1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">12</property>
<property name="label" translatable="yes">Do you wish to:</property>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVButtonBox" id="vbuttonbox1">
+ <object class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkRadioButton" id="abort_radiobutton">
+ <object class="GtkRadioButton" id="abort_radiobutton">
+ <property name="label" translatable="yes">Abort this session</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Abort this session</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
- <widget class="GtkRadioButton" id="once_radiobutton">
+ <object class="GtkRadioButton" id="once_radiobutton">
+ <property name="label" translatable="yes">Trust the site's certificate this once</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Trust the site's certificate this once</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">abort_radiobutton</property>
- </widget>
+ </object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="always_radiobutton">
+ <object class="GtkRadioButton" id="always_radiobutton">
+ <property name="label" translatable="yes">Always trust this site's certificate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Always trust this site's certificate</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<property name="draw_indicator">True</property>
<property name="group">once_radiobutton</property>
- </widget>
+ </object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="ok_button">
+ <object class="GtkButton" id="ok_button">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="0">ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
