glom r1998 - in trunk: . glom glom/bakery glom/layout_item_dialogs glom/libglom glom/libglom/data_structure glom/mode_data glom/mode_design glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/navigation glom/relationships_overview glom/reports glom/translation glom/utility_widgets glom/utility_widgets/adddel
- From: murrayc svn gnome org
- To: svn-commits-list gnome org
- Subject: glom r1998 - in trunk: . glom glom/bakery glom/layout_item_dialogs glom/libglom glom/libglom/data_structure glom/mode_data glom/mode_design glom/mode_design/fields glom/mode_design/print_layouts glom/mode_design/script_library glom/mode_design/users glom/navigation glom/relationships_overview glom/reports glom/translation glom/utility_widgets glom/utility_widgets/adddel
- Date: Tue, 17 Mar 2009 14:42:09 +0000 (UTC)
Author: murrayc
Date: Tue Mar 17 14:42:09 2009
New Revision: 1998
URL: http://svn.gnome.org/viewvc/glom?rev=1998&view=rev
Log:
2009-03-17 Murray Cumming <murrayc murrayc com>
* configure.ac: Remove the libglademm dependency.
* glom/glom.glade:
* glom/glom_developer.glade: Resaved as GtkBuilder format in glade-3.
* glom/Makefile.am:
* glom/variablesmap.[h|cc]: Copied this from libglademm and adapted it to
Gtk::Builder.
* glom/*.[h|cc]: Use Gtk::Builder instead of Gnome::Glade::Xml. The changes
are mostly just search/replace.
Added:
trunk/glom/variablesmap.cc
trunk/glom/variablesmap.h
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/glom/Makefile.am
trunk/glom/application.cc
trunk/glom/application.h
trunk/glom/bakery/App_Gtk.cc
trunk/glom/bakery/App_Gtk.h
trunk/glom/bakery/App_WithDoc_Gtk.cc
trunk/glom/bakery/App_WithDoc_Gtk.h
trunk/glom/base_db.cc
trunk/glom/box_db_table.cc
trunk/glom/box_db_table.h
trunk/glom/box_reports.cc
trunk/glom/box_reports.h
trunk/glom/box_withbuttons.cc
trunk/glom/box_withbuttons.h
trunk/glom/combobox_fields.cc
trunk/glom/combobox_fields.h
trunk/glom/combobox_relationship.cc
trunk/glom/combobox_relationship.h
trunk/glom/dialog_connection.cc
trunk/glom/dialog_connection.h
trunk/glom/dialog_database_preferences.cc
trunk/glom/dialog_database_preferences.h
trunk/glom/dialog_existing_or_new.cc
trunk/glom/dialog_existing_or_new.h
trunk/glom/dialog_import_csv.cc
trunk/glom/dialog_import_csv.h
trunk/glom/dialog_import_csv_progress.cc
trunk/glom/dialog_import_csv_progress.h
trunk/glom/dialog_invalid_data.cc
trunk/glom/dialog_invalid_data.h
trunk/glom/dialog_new_self_hosted_connection.cc
trunk/glom/dialog_new_self_hosted_connection.h
trunk/glom/filechooser_export.cc
trunk/glom/frame_glom.cc
trunk/glom/frame_glom.h
trunk/glom/glom.glade
trunk/glom/glom_developer.glade
trunk/glom/layout_item_dialogs/box_formatting.cc
trunk/glom/layout_item_dialogs/box_formatting.h
trunk/glom/layout_item_dialogs/combo_summarytype.cc
trunk/glom/layout_item_dialogs/combo_summarytype.h
trunk/glom/layout_item_dialogs/comboentry_borderwidth.cc
trunk/glom/layout_item_dialogs/comboentry_borderwidth.h
trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
trunk/glom/layout_item_dialogs/dialog_buttonscript.h
trunk/glom/layout_item_dialogs/dialog_field_layout.cc
trunk/glom/layout_item_dialogs/dialog_field_layout.h
trunk/glom/layout_item_dialogs/dialog_field_summary.cc
trunk/glom/layout_item_dialogs/dialog_field_summary.h
trunk/glom/layout_item_dialogs/dialog_group_by.cc
trunk/glom/layout_item_dialogs/dialog_group_by.h
trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc
trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h
trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.cc
trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h
trunk/glom/layout_item_dialogs/dialog_imageobject.cc
trunk/glom/layout_item_dialogs/dialog_imageobject.h
trunk/glom/layout_item_dialogs/dialog_notebook.cc
trunk/glom/layout_item_dialogs/dialog_notebook.h
trunk/glom/layout_item_dialogs/dialog_textobject.cc
trunk/glom/layout_item_dialogs/dialog_textobject.h
trunk/glom/libglom/data_structure/glomconversions.cc
trunk/glom/libglom/dialog_progress_creating.cc
trunk/glom/libglom/dialog_progress_creating.h
trunk/glom/libglom/glade_utils.h
trunk/glom/libglom/spawn_with_feedback.cc
trunk/glom/main.cc
trunk/glom/mode_data/box_data_calendar_related.cc
trunk/glom/mode_data/box_data_details.cc
trunk/glom/mode_data/box_data_list.cc
trunk/glom/mode_data/box_data_list_related.cc
trunk/glom/mode_data/dialog_choose_field.cc
trunk/glom/mode_data/dialog_choose_field.h
trunk/glom/mode_data/dialog_choose_relationship.cc
trunk/glom/mode_data/dialog_choose_relationship.h
trunk/glom/mode_data/dialog_layout.cc
trunk/glom/mode_data/dialog_layout.h
trunk/glom/mode_data/dialog_layout_calendar_related.cc
trunk/glom/mode_data/dialog_layout_calendar_related.h
trunk/glom/mode_data/dialog_layout_details.cc
trunk/glom/mode_data/dialog_layout_details.h
trunk/glom/mode_data/dialog_layout_export.cc
trunk/glom/mode_data/dialog_layout_export.h
trunk/glom/mode_data/dialog_layout_list.cc
trunk/glom/mode_data/dialog_layout_list.h
trunk/glom/mode_data/dialog_layout_list_related.cc
trunk/glom/mode_data/dialog_layout_list_related.h
trunk/glom/mode_data/flowtablewithfields.cc
trunk/glom/mode_data/flowtablewithfields.h
trunk/glom/mode_design/box_db_table_relationships.cc
trunk/glom/mode_design/box_db_table_relationships.h
trunk/glom/mode_design/dialog_add_related_table.cc
trunk/glom/mode_design/dialog_add_related_table.h
trunk/glom/mode_design/dialog_design.cc
trunk/glom/mode_design/dialog_design.h
trunk/glom/mode_design/dialog_fields.cc
trunk/glom/mode_design/dialog_fields.h
trunk/glom/mode_design/dialog_relationships.cc
trunk/glom/mode_design/dialog_relationships.h
trunk/glom/mode_design/fields/box_db_table_definition.cc
trunk/glom/mode_design/fields/box_db_table_definition.h
trunk/glom/mode_design/fields/combo_fieldtype.cc
trunk/glom/mode_design/fields/combo_fieldtype.h
trunk/glom/mode_design/fields/dialog_fieldcalculation.cc
trunk/glom/mode_design/fields/dialog_fieldcalculation.h
trunk/glom/mode_design/fields/dialog_fielddefinition.cc
trunk/glom/mode_design/fields/dialog_fielddefinition.h
trunk/glom/mode_design/print_layouts/box_print_layouts.cc
trunk/glom/mode_design/print_layouts/box_print_layouts.h
trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc
trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc
trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
trunk/glom/mode_design/script_library/dialog_new_script.cc
trunk/glom/mode_design/script_library/dialog_new_script.h
trunk/glom/mode_design/script_library/dialog_script_library.cc
trunk/glom/mode_design/script_library/dialog_script_library.h
trunk/glom/mode_design/users/dialog_choose_user.cc
trunk/glom/mode_design/users/dialog_choose_user.h
trunk/glom/mode_design/users/dialog_groups_list.cc
trunk/glom/mode_design/users/dialog_groups_list.h
trunk/glom/mode_design/users/dialog_new_group.cc
trunk/glom/mode_design/users/dialog_new_group.h
trunk/glom/mode_design/users/dialog_user.cc
trunk/glom/mode_design/users/dialog_user.h
trunk/glom/mode_design/users/dialog_users_list.cc
trunk/glom/mode_design/users/dialog_users_list.h
trunk/glom/navigation/box_tables.cc
trunk/glom/navigation/box_tables.h
trunk/glom/relationships_overview/dialog_relationships_overview.cc
trunk/glom/relationships_overview/dialog_relationships_overview.h
trunk/glom/reports/dialog_layout_report.cc
trunk/glom/reports/dialog_layout_report.h
trunk/glom/translation/combobox_locale.cc
trunk/glom/translation/combobox_locale.h
trunk/glom/translation/dialog_change_language.cc
trunk/glom/translation/dialog_change_language.h
trunk/glom/translation/dialog_copy_translation.cc
trunk/glom/translation/dialog_copy_translation.h
trunk/glom/translation/dialog_identify_original.cc
trunk/glom/translation/dialog_identify_original.h
trunk/glom/translation/window_translations.cc
trunk/glom/translation/window_translations.h
trunk/glom/utility_widgets/adddel/adddel.cc
trunk/glom/utility_widgets/adddel/adddel.h
trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc
trunk/glom/utility_widgets/adddel/adddel_withbuttons.h
trunk/glom/utility_widgets/buttonglom.cc
trunk/glom/utility_widgets/buttonglom.h
trunk/glom/utility_widgets/checkglom.h
trunk/glom/utility_widgets/combo_textglade.cc
trunk/glom/utility_widgets/combo_textglade.h
trunk/glom/utility_widgets/comboentry_currency.cc
trunk/glom/utility_widgets/comboentry_currency.h
trunk/glom/utility_widgets/comboentryglom.cc
trunk/glom/utility_widgets/comboentryglom.h
trunk/glom/utility_widgets/comboglom.cc
trunk/glom/utility_widgets/comboglom.h
trunk/glom/utility_widgets/datawidget.cc
trunk/glom/utility_widgets/datawidget.h
trunk/glom/utility_widgets/dialog_choose_date.cc
trunk/glom/utility_widgets/dialog_choose_date.h
trunk/glom/utility_widgets/dialog_choose_id.cc
trunk/glom/utility_widgets/dialog_choose_id.h
trunk/glom/utility_widgets/dialog_flowtable.cc
trunk/glom/utility_widgets/dialog_flowtable.h
trunk/glom/utility_widgets/dialog_layoutitem_properties.cc
trunk/glom/utility_widgets/dialog_layoutitem_properties.h
trunk/glom/utility_widgets/dialog_properties.cc
trunk/glom/utility_widgets/dialog_properties.h
trunk/glom/utility_widgets/entryglom.cc
trunk/glom/utility_widgets/entryglom.h
trunk/glom/utility_widgets/imageglom.cc
trunk/glom/utility_widgets/imageglom.h
trunk/glom/utility_widgets/labelglom.cc
trunk/glom/utility_widgets/labelglom.h
trunk/glom/utility_widgets/notebookglom.cc
trunk/glom/utility_widgets/notebookglom.h
trunk/glom/utility_widgets/notebooklabelglom.h
trunk/glom/utility_widgets/placeholder-glom.h
trunk/glom/utility_widgets/placeholder.cc
trunk/glom/utility_widgets/placeholder.h
trunk/glom/utility_widgets/textviewglom.cc
trunk/glom/utility_widgets/textviewglom.h
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Mar 17 14:42:09 2009
@@ -106,7 +106,7 @@
# Do not require, goocanvas and gtksourceviewmm in client only mode
-REQUIRED_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 libglademm-2.4 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.12 libgda-4.0 >= 3.99.13 libgda-postgres-4.0 goocanvasmm-1.0 >= 0.13.0"
+REQUIRED_LIBS="gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 pygda-4.0 >= 2.25.3 pygtk-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.12 libgda-4.0 >= 3.99.13 libgda-postgres-4.0 goocanvasmm-1.0 >= 0.13.0"
if test $enable_client_only != yes; then
REQUIRED_LIBS="$REQUIRED_LIBS gtksourceviewmm-2.0"
fi
Modified: trunk/glom/Makefile.am
==============================================================================
--- trunk/glom/Makefile.am (original)
+++ trunk/glom/Makefile.am Tue Mar 17 14:42:09 2009
@@ -50,6 +50,7 @@
filechooser_export.h filechooser_export.cc \
box_reports.h box_reports.cc \
xsl_utils.h xsl_utils.cc \
+ variablesmap.h variablesmap.cc \
signal_reemitter.h
if !GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/application.cc
==============================================================================
--- trunk/glom/application.cc (original)
+++ trunk/glom/application.cc Tue Mar 17 14:42:09 2009
@@ -92,7 +92,7 @@
// Global application variable
App_Glom* global_application = NULL;
-App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+App_Glom::App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
// Note cobject is actually a GtkWindow, not a HildonWindow, because the
// glade file specified the type as GtkWindow.
// ParentWindow is defined in Bakery.
@@ -143,9 +143,9 @@
}
//Load widgets from glade file:
- refGlade->get_widget("bakery_vbox", m_pBoxTop);
- refGlade->get_widget("sidebar_vbox", m_pBoxSidebar);
- refGlade->get_widget_derived("vbox_frame", m_pFrame); //This one is derived. There's a lot happening here.
+ builder->get_widget("bakery_vbox", m_pBoxTop);
+ builder->get_widget("sidebar_vbox", m_pBoxSidebar);
+ builder->get_widget_derived("vbox_frame", m_pFrame); //This one is derived. There's a lot happening here.
add_mime_type("application/x-glom"); //TODO: make this actually work - we need to register it properly.
@@ -851,10 +851,10 @@
GlomBakery::App* App_Glom::new_instance() //Override
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "window_main");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "window_main");
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "window_main", "", error);
+ std::auto_ptr<Glib::Error> error;
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "window_main", "", error);
if(error.get())
return 0;
#endif
@@ -1182,10 +1182,10 @@
{
#ifdef GLIBMM_EXCEPTIONS_ENABLED
//Offer to load an existing document, or start a new one.
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_existing_or_new");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_existing_or_new");
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_existing_or_new", "", error);
+ std::auto_ptr<Glib::Error> error;
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_existing_or_new", "", error);
if(error.get())
return false;
#endif
@@ -1443,7 +1443,7 @@
//Show the user that something is happening, because the INSERTS might take time.
//TOOD: This doesn't actually show up until near the end, even with Gtk::Main::instance()->iteration().
std::auto_ptr<Dialog_ProgressCreating> dialog_progress;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "window_progress");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "window_progress");
if(refXml)
{
Dialog_ProgressCreating* dialog_progress_temp = 0;
@@ -2298,7 +2298,7 @@
void App_Glom::on_menu_developer_changelanguage()
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_change_language");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_change_language");
if(refXml)
{
Dialog_ChangeLanguage* dialog = 0;
@@ -2329,7 +2329,7 @@
{
if(!m_window_translations)
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_translations");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_translations");
refXml->get_widget_derived("window_translations", m_window_translations);
if(m_window_translations)
{
Modified: trunk/glom/application.h
==============================================================================
--- trunk/glom/application.h (original)
+++ trunk/glom/application.h Tue Mar 17 14:42:09 2009
@@ -43,7 +43,7 @@
class App_Glom : public GlomBakery::App_WithDoc_Gtk
{
public:
- App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ App_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~App_Glom();
virtual bool init(const Glib::ustring& document_uri = Glib::ustring()); //override
Modified: trunk/glom/bakery/App_Gtk.cc
==============================================================================
--- trunk/glom/bakery/App_Gtk.cc (original)
+++ trunk/glom/bakery/App_Gtk.cc Tue Mar 17 14:42:09 2009
@@ -46,7 +46,7 @@
#endif
}
-/// This constructor can be used with Gnome::Glade::Xml::get_derived_widget().
+/// This constructor can be used with Gtk::Builder::get_derived_widget().
App_Gtk::App_Gtk(BaseObjectType* cobject, const Glib::ustring& appname)
: ParentWindow(cobject),
m_pVBox(0)
@@ -100,7 +100,7 @@
set_resizable(); //resizable
set_default_size(640, 400); //A sensible default.
- //This might have been instantiated by Gnome::Glade::Xml::get_widget() instead.
+ //This might have been instantiated by Gtk::Builder::get_widget() instead.
//If not, then we create a default one and add it to the window.
if(!m_pVBox)
{
Modified: trunk/glom/bakery/App_Gtk.h
==============================================================================
--- trunk/glom/bakery/App_Gtk.h (original)
+++ trunk/glom/bakery/App_Gtk.h Tue Mar 17 14:42:09 2009
@@ -32,7 +32,7 @@
#include <gtkmm/handlebox.h>
#include <gtkmm/dialog.h>
#include <gtkmm/uimanager.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace GlomBakery
{
@@ -62,7 +62,7 @@
///Don't forget to call init() too.
App_Gtk(const Glib::ustring& appname);
- /// This constructor can be used to implement derived classes for use with Gnome::Glade::Xml::get_derived_widget().
+ /// This constructor can be used to implement derived classes for use with Gtk::Builder::get_derived_widget().
App_Gtk(BaseObjectType* cobject, const Glib::ustring& appname);
virtual ~App_Gtk();
Modified: trunk/glom/bakery/App_WithDoc_Gtk.cc
==============================================================================
--- trunk/glom/bakery/App_WithDoc_Gtk.cc (original)
+++ trunk/glom/bakery/App_WithDoc_Gtk.cc Tue Mar 17 14:42:09 2009
@@ -45,7 +45,7 @@
{
}
-/// This constructor can be used with Gnome::Glade::Xml::get_derived_widget().
+/// This constructor can be used with Gtk::Builder::get_derived_widget().
App_WithDoc_Gtk::App_WithDoc_Gtk(BaseObjectType* cobject, const Glib::ustring& appname)
: App_WithDoc(appname),
App_Gtk(cobject, appname),
Modified: trunk/glom/bakery/App_WithDoc_Gtk.h
==============================================================================
--- trunk/glom/bakery/App_WithDoc_Gtk.h (original)
+++ trunk/glom/bakery/App_WithDoc_Gtk.h Tue Mar 17 14:42:09 2009
@@ -45,7 +45,7 @@
///Don't forget to call init() too.
App_WithDoc_Gtk(const Glib::ustring& appname);
- /// This constructor can be used to implement derived classes for use with Gnome::Glade::Xml::get_derived_widget().
+ /// This constructor can be used to implement derived classes for use with Gtk::Builder::get_derived_widget().
App_WithDoc_Gtk(BaseObjectType* cobject, const Glib::ustring& appname);
virtual ~App_WithDoc_Gtk();
Modified: trunk/glom/base_db.cc
==============================================================================
--- trunk/glom/base_db.cc (original)
+++ trunk/glom/base_db.cc Tue Mar 17 14:42:09 2009
@@ -1627,21 +1627,21 @@
{
sharedptr<LayoutItem_Field> result;
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field");
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field");
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
return result;
}
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field", "", error);
+ std::auto_ptr<Gtk::BuilderError> error;
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field", "", error);
if(error.get())
{
std::cerr << error->what() << std::endl;
@@ -1681,7 +1681,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_layout_field_properties");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_layout_field_properties");
Dialog_FieldLayout* dialog = 0;
refXml->get_widget_derived("dialog_layout_field_properties", dialog);
@@ -1709,7 +1709,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1723,7 +1723,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
Dialog_TextObject* dialog = 0;
refXml->get_widget_derived("window_textobject", dialog);
@@ -1744,7 +1744,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1758,7 +1758,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_imageobject");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_imageobject");
Dialog_ImageObject* dialog = 0;
refXml->get_widget_derived("window_imageobject", dialog);
@@ -1779,7 +1779,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1793,7 +1793,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_notebook");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_notebook");
Dialog_Notebook* dialog = 0;
refXml->get_widget_derived("dialog_notebook", dialog);
@@ -1815,7 +1815,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/box_db_table.cc
==============================================================================
--- trunk/glom/box_db_table.cc (original)
+++ trunk/glom/box_db_table.cc Tue Mar 17 14:42:09 2009
@@ -30,8 +30,8 @@
{
}
-Box_DB_Table::Box_DB_Table(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Box_WithButtons(cobject, refGlade)
+Box_DB_Table::Box_DB_Table(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Box_WithButtons(cobject, builder)
{
}
Modified: trunk/glom/box_db_table.h
==============================================================================
--- trunk/glom/box_db_table.h (original)
+++ trunk/glom/box_db_table.h Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
#include <glom/box_withbuttons.h>
#include <glom/base_db_table.h>
#include <libglom/data_structure/field.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <algorithm> //find_if used in various places.
namespace Glom
@@ -39,7 +39,7 @@
{
public:
Box_DB_Table();
- Box_DB_Table(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_DB_Table(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_DB_Table();
Gtk::Window* get_app_window();
Modified: trunk/glom/box_reports.cc
==============================================================================
--- trunk/glom/box_reports.cc (original)
+++ trunk/glom/box_reports.cc Tue Mar 17 14:42:09 2009
@@ -25,22 +25,22 @@
namespace Glom
{
-Box_Reports::Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Box_DB_Table(cobject, refGlade),
+Box_Reports::Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Box_DB_Table(cobject, builder),
m_pLabelFrameTitle(0),
m_colReportName(0),
m_colTitle(0)
{
//Get the Glade-instantiated widgets, and connect signal handlers:
Gtk::Button* pButtonCancel = 0;
- refGlade->get_widget("button_cancel", pButtonCancel);
+ builder->get_widget("button_cancel", pButtonCancel);
set_button_cancel(*pButtonCancel);
Gtk::Alignment* pAligmentPlaceholder = 0;
- refGlade->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
+ builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
pAligmentPlaceholder->add(m_AddDel);
- //refGlade->get_widget("label_frame_title", m_pLabelFrameTitle);
+ //builder->get_widget("label_frame_title", m_pLabelFrameTitle);
m_AddDel.signal_user_added().connect(sigc::mem_fun(*this, &Box_Reports::on_adddel_Add));
m_AddDel.signal_user_requested_delete().connect(sigc::mem_fun(*this, &Box_Reports::on_adddel_Delete));
Modified: trunk/glom/box_reports.h
==============================================================================
--- trunk/glom/box_reports.h (original)
+++ trunk/glom/box_reports.h Tue Mar 17 14:42:09 2009
@@ -30,7 +30,7 @@
class Box_Reports : public Box_DB_Table
{
public:
- Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_Reports(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_Reports();
private:
Modified: trunk/glom/box_withbuttons.cc
==============================================================================
--- trunk/glom/box_withbuttons.cc (original)
+++ trunk/glom/box_withbuttons.cc Tue Mar 17 14:42:09 2009
@@ -41,7 +41,7 @@
m_Button_Cancel.signal_clicked().connect(sigc::mem_fun(*this, &Box_WithButtons::on_Button_Cancel));
}
-Box_WithButtons::Box_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+Box_WithButtons::Box_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::VBox(cobject),
m_Box_Buttons(false, Utils::DEFAULT_SPACING_SMALL),
m_Button_Cancel(Gtk::Stock::CANCEL)
Modified: trunk/glom/box_withbuttons.h
==============================================================================
--- trunk/glom/box_withbuttons.h (original)
+++ trunk/glom/box_withbuttons.h Tue Mar 17 14:42:09 2009
@@ -29,7 +29,7 @@
#include <libglom/appstate.h>
#include "base_db.h"
#include <libglom/busy_cursor.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -43,7 +43,8 @@
{
public:
Box_WithButtons();
- Box_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+
+ Box_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
///For use with libglademm's get_widget_derived():
Box_WithButtons(BaseObjectType* cobject);
Modified: trunk/glom/combobox_fields.cc
==============================================================================
--- trunk/glom/combobox_fields.cc (original)
+++ trunk/glom/combobox_fields.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-ComboBox_Fields::ComboBox_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboBox_Fields::ComboBox_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBox(cobject),
m_renderer_title(0)
{
Modified: trunk/glom/combobox_fields.h
==============================================================================
--- trunk/glom/combobox_fields.h (original)
+++ trunk/glom/combobox_fields.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_TRANSLATION_COMBOBOX_FIELDS_HH
#include <gtkmm/combobox.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/field.h>
#include <libglom/document/document_glom.h>
#include <libglom/sharedptr.h>
@@ -35,7 +35,7 @@
class ComboBox_Fields : public Gtk::ComboBox
{
public:
- ComboBox_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ ComboBox_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~ComboBox_Fields();
typedef std::vector< sharedptr<Field> > type_vecFields;
Modified: trunk/glom/combobox_relationship.cc
==============================================================================
--- trunk/glom/combobox_relationship.cc (original)
+++ trunk/glom/combobox_relationship.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-ComboBox_Relationship::ComboBox_Relationship(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboBox_Relationship::ComboBox_Relationship(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBox(cobject),
m_renderer_title(0),
m_renderer_fromfield(0)
Modified: trunk/glom/combobox_relationship.h
==============================================================================
--- trunk/glom/combobox_relationship.h (original)
+++ trunk/glom/combobox_relationship.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_TRANSLATION_COMBOBOX_RELATIONSHIP_HH
#include <gtkmm/combobox.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/relationship.h>
#include <libglom/document/document_glom.h>
#include <libglom/sharedptr.h>
@@ -35,7 +35,7 @@
class ComboBox_Relationship : public Gtk::ComboBox
{
public:
- ComboBox_Relationship(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ ComboBox_Relationship(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~ComboBox_Relationship();
typedef std::vector< sharedptr<Relationship> > type_vecRelationships;
Modified: trunk/glom/dialog_connection.cc
==============================================================================
--- trunk/glom/dialog_connection.cc (original)
+++ trunk/glom/dialog_connection.cc Tue Mar 17 14:42:09 2009
@@ -32,7 +32,7 @@
namespace Glom
{
-Dialog_Connection::Dialog_Connection(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_Connection::Dialog_Connection(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
Base_DB(),
m_entry_host(0),
@@ -40,10 +40,10 @@
m_entry_password(0),
m_label_database(0)
{
- refGlade->get_widget("entry_host", m_entry_host);
- refGlade->get_widget("entry_user", m_entry_user);
- refGlade->get_widget("entry_password", m_entry_password);
- refGlade->get_widget("label_database", m_label_database);
+ builder->get_widget("entry_host", m_entry_host);
+ builder->get_widget("entry_user", m_entry_user);
+ builder->get_widget("entry_password", m_entry_password);
+ builder->get_widget("label_database", m_label_database);
#ifdef GLOM_ENABLE_MAEMO
// Make the bold title the window title (which cannot be empty in maemo
@@ -53,8 +53,8 @@
Gtk::Label* title;
Gtk::Label* note;
- refGlade->get_widget("connection_title", title);
- refGlade->get_widget("connection_note", note);
+ builder->get_widget("connection_title", title);
+ builder->get_widget("connection_note", note);
set_title(title->get_text());
title->hide();
Modified: trunk/glom/dialog_connection.h
==============================================================================
--- trunk/glom/dialog_connection.h (original)
+++ trunk/glom/dialog_connection.h Tue Mar 17 14:42:09 2009
@@ -21,10 +21,10 @@
#ifndef GLOM_DIALOG_CONNECTION_H
#define GLOM_DIALOG_CONNECTION_H
-#include <libglademm.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
+#include <gtkmm/builder.h>
#include "base_db.h"
#include <libglom/connectionpool.h>
@@ -36,7 +36,7 @@
public Base_DB
{
public:
- Dialog_Connection(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Connection(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Connection();
#ifdef GLIBMM_EXCEPTIONS_ENABLED
Modified: trunk/glom/dialog_database_preferences.cc
==============================================================================
--- trunk/glom/dialog_database_preferences.cc (original)
+++ trunk/glom/dialog_database_preferences.cc Tue Mar 17 14:42:09 2009
@@ -28,10 +28,10 @@
namespace Glom
{
-Dialog_Database_Preferences::Dialog_Database_Preferences(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_Database_Preferences::Dialog_Database_Preferences(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
Base_DB(),
- m_glade_variables_map(refGlade)
+ m_glade_variables_map(builder)
{
m_glade_variables_map.connect_widget("entry_name", m_system_prefs.m_name);
m_glade_variables_map.connect_widget("entry_org_name", m_system_prefs.m_org_name);
@@ -42,11 +42,11 @@
m_glade_variables_map.connect_widget("entry_org_address_country", m_system_prefs.m_org_address_country);
m_glade_variables_map.connect_widget("entry_org_address_postcode", m_system_prefs.m_org_address_postcode);
- refGlade->get_widget_derived("imageglom", m_image);
- refGlade->get_widget("button_choose_image", m_button_choose_image);
+ builder->get_widget_derived("imageglom", m_image);
+ builder->get_widget("button_choose_image", m_button_choose_image);
m_button_choose_image->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Database_Preferences::on_button_choose_image));
- refGlade->get_widget("treeview_autoincrements", m_treeview_autoincrements);
+ builder->get_widget("treeview_autoincrements", m_treeview_autoincrements);
m_model_autoincrements = Gtk::ListStore::create(m_columns);
m_treeview_autoincrements->set_model(m_model_autoincrements);
Modified: trunk/glom/dialog_database_preferences.h
==============================================================================
--- trunk/glom/dialog_database_preferences.h (original)
+++ trunk/glom/dialog_database_preferences.h Tue Mar 17 14:42:09 2009
@@ -21,8 +21,8 @@
#ifndef GLOM_DIALOG_DATABASE_PREFERENCES_H
#define GLOM_DIALOG_DATABASE_PREFERENCES_H
-#include <libglademm.h>
-#include <libglademm/variablesmap.h>
+#include <gtkmm/builder.h>
+#include <glom/variablesmap.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
@@ -39,7 +39,7 @@
public Base_DB
{
public:
- Dialog_Database_Preferences(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Database_Preferences(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Database_Preferences();
sharedptr<SharedConnection> connect_to_server_with_connection_settings() const;
@@ -72,7 +72,7 @@
Glib::RefPtr<Gtk::ListStore> m_model_autoincrements;
- Gnome::Glade::VariablesMap m_glade_variables_map;
+ Glom::VariablesMap m_glade_variables_map;
Gtk::TreeView* m_treeview_autoincrements;
ImageGlom* m_image;
Modified: trunk/glom/dialog_existing_or_new.cc
==============================================================================
--- trunk/glom/dialog_existing_or_new.cc (original)
+++ trunk/glom/dialog_existing_or_new.cc Tue Mar 17 14:42:09 2009
@@ -94,17 +94,17 @@
namespace Glom
{
-Dialog_ExistingOrNew::Dialog_ExistingOrNew(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ExistingOrNew::Dialog_ExistingOrNew(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject)
{
- refGlade->get_widget("existing_or_new_existing_treeview", m_existing_view);
- refGlade->get_widget("existing_or_new_new_treeview", m_new_view);
+ builder->get_widget("existing_or_new_existing_treeview", m_existing_view);
+ builder->get_widget("existing_or_new_new_treeview", m_new_view);
if(!m_existing_view || !m_new_view)
throw std::runtime_error("Glade file does not contain treeviews for ExistingOrNew dialog.");
- refGlade->get_widget("existing_or_new_notebook", m_notebook);
- refGlade->get_widget("existing_or_new_button_select", m_select_button);
+ builder->get_widget("existing_or_new_notebook", m_notebook);
+ builder->get_widget("existing_or_new_button_select", m_select_button);
if(!m_notebook || !m_select_button)
throw std::runtime_error("Glade file does not contain the notebook or the select button for ExistingOrNew dialog.");
Modified: trunk/glom/dialog_existing_or_new.h
==============================================================================
--- trunk/glom/dialog_existing_or_new.h (original)
+++ trunk/glom/dialog_existing_or_new.h Tue Mar 17 14:42:09 2009
@@ -32,7 +32,7 @@
#include <gtkmm/treestore.h>
#include <gtkmm/recentinfo.h>
#include <gtkmm/notebook.h>
-#include <libglademm/xml.h>
+#include <gtkmm/builder.h>
#ifndef G_OS_WIN32
# include <libepc/service-monitor.h>
@@ -53,7 +53,7 @@
OPEN_REMOTE
};
- Dialog_ExistingOrNew(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ExistingOrNew(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ExistingOrNew();
Action get_action() const;
Modified: trunk/glom/dialog_import_csv.cc
==============================================================================
--- trunk/glom/dialog_import_csv.cc (original)
+++ trunk/glom/dialog_import_csv.cc Tue Mar 17 14:42:09 2009
@@ -38,87 +38,6 @@
const gunichar DELIMITER = ',';
-#if 0
-// TODO: Perhaps we should change this to std::string to allow binary data, such
-// as images.
-// TODO: What escaping system is this? Can't we reuse some standard escaping function from somewhere? murrayc
-Glib::ustring::const_iterator advance_escape(const Glib::ustring::const_iterator& iter, const Glib::ustring::const_iterator& end, gunichar& c)
-{
- // TODO: Throw an error if there is nothing to be escaped (iter == end)?
- Glib::ustring::const_iterator walk = iter;
- if(walk == end)
- return walk;
-
- if(*walk == 'x')
- {
- // Hexadecimal number, insert according unichar
- ++ walk;
- guint num = 0;
-
- // TODO: Limit?
- Glib::ustring::const_iterator pos = walk;
- for(; (walk != end) && isxdigit(*walk); ++ walk)
- {
- num *= 16;
-
- if(isdigit(*walk))
- num += *walk - '0';
- else if(isupper(*walk))
- num += *walk - 'A' + 10;
- else
- num += *walk - 'a' + 10;
- }
-
- c = num;
- return walk;
- }
- else if(isdigit(*walk) && *walk != '8' && *walk != '9')
- {
- guint num = 0;
-
- // TODO: Limit?
- for(; (walk != end) && isdigit(*walk) && *walk != '8' && *walk != '9'; ++ walk)
- {
- num *= 8;
- num += *walk - '0';
- }
-
- c = num;
- return walk;
- }
- else
- {
- switch(*walk)
- {
- case 'n':
- c = '\n';
- break;
- case '\\':
- c = '\\';
- break;
- case 'r':
- c = '\r';
- break;
- case 'a':
- c = '\a';
- break;
- case 'v':
- c = '\f';
- break;
- case 't':
- c = '\t';
- break;
- default:
- // Unrecognized escape sequence, TODO: throw error?
- c = *walk;
- break;
- }
-
- ++ walk;
- return walk;
- }
-}
-#endif
Glib::ustring::const_iterator advance_field(const Glib::ustring::const_iterator& iter, const Glib::ustring::const_iterator& end, Glib::ustring& field)
{
@@ -231,17 +150,17 @@
namespace Glom
{
-Dialog_Import_CSV::Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_Import_CSV::Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject), m_auto_detect_encoding(0), m_state(NONE)
{
- refGlade->get_widget("import_csv_fields", m_sample_view);
- refGlade->get_widget("import_csv_target_table", m_target_table);
- refGlade->get_widget("import_csv_encoding", m_encoding_combo);
- refGlade->get_widget("import_csv_encoding_info", m_encoding_info);
- refGlade->get_widget("import_csv_first_line_as_title", m_first_line_as_title);
- refGlade->get_widget("import_csv_sample_rows", m_sample_rows);
- refGlade->get_widget("import_csv_advice_label", m_advice_label);
- refGlade->get_widget("import_csv_error_label", m_error_label);
+ builder->get_widget("import_csv_fields", m_sample_view);
+ builder->get_widget("import_csv_target_table", m_target_table);
+ builder->get_widget("import_csv_encoding", m_encoding_combo);
+ builder->get_widget("import_csv_encoding_info", m_encoding_info);
+ builder->get_widget("import_csv_first_line_as_title", m_first_line_as_title);
+ builder->get_widget("import_csv_sample_rows", m_sample_rows);
+ builder->get_widget("import_csv_advice_label", m_advice_label);
+ builder->get_widget("import_csv_error_label", m_error_label);
if(!m_sample_view || !m_encoding_combo || !m_target_table || !m_encoding_info || !m_first_line_as_title || !m_sample_rows || !m_error_label)
throw std::runtime_error("Missing widgets from glade file for Dialog_Import_CSV");
Modified: trunk/glom/dialog_import_csv.h
==============================================================================
--- trunk/glom/dialog_import_csv.h (original)
+++ trunk/glom/dialog_import_csv.h Tue Mar 17 14:42:09 2009
@@ -32,8 +32,9 @@
#include <gtkmm/liststore.h>
#include <gtkmm/combobox.h>
#include <gtkmm/spinbutton.h>
+#include <gtkmm/builder.h>
#include <libgdamm/datamodelimport.h>
-#include <libglademm/xml.h>
+
namespace Glom
{
@@ -52,7 +53,7 @@
PARSED
};
- Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Import_CSV(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
void import(const Glib::ustring& uri, const Glib::ustring& into_table);
Modified: trunk/glom/dialog_import_csv_progress.cc
==============================================================================
--- trunk/glom/dialog_import_csv_progress.cc (original)
+++ trunk/glom/dialog_import_csv_progress.cc Tue Mar 17 14:42:09 2009
@@ -27,11 +27,11 @@
namespace Glom
{
-Dialog_Import_CSV_Progress::Dialog_Import_CSV_Progress(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_Import_CSV_Progress::Dialog_Import_CSV_Progress(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject), m_data_source(NULL), m_current_row(0)
{
- refGlade->get_widget("import_csv_progress_progress_bar", m_progress_bar);
- refGlade->get_widget("import_csv_progress_textview", m_text_view);
+ builder->get_widget("import_csv_progress_progress_bar", m_progress_bar);
+ builder->get_widget("import_csv_progress_textview", m_text_view);
if(!m_progress_bar || !m_text_view)
throw std::runtime_error("Missing widgets from glade file for Dialog_Import_CSV_Progress");
Modified: trunk/glom/dialog_import_csv_progress.h
==============================================================================
--- trunk/glom/dialog_import_csv_progress.h (original)
+++ trunk/glom/dialog_import_csv_progress.h Tue Mar 17 14:42:09 2009
@@ -33,7 +33,7 @@
public Base_DB_Table_Data
{
public:
- Dialog_Import_CSV_Progress(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Import_CSV_Progress(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual bool init_db_details(const Glib::ustring& table_name);
Modified: trunk/glom/dialog_invalid_data.cc
==============================================================================
--- trunk/glom/dialog_invalid_data.cc (original)
+++ trunk/glom/dialog_invalid_data.cc Tue Mar 17 14:42:09 2009
@@ -33,10 +33,10 @@
{
//TODO: Share a global instance, to make this quicker?
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_data_invalid_format");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_data_invalid_format");
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_data_invalid_format", "", error);
+ std::auto_ptr<Glib::Error> error;
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_data_invalid_format", "", error);
if(error.get())
{
std::cerr << "glom_show_dialog_invalid_data() failed: " << error->what() << std::endl;
@@ -54,11 +54,11 @@
return (response == 2); //The glade file has a response of 2 for the Revert button.
}
-Dialog_InvalidData::Dialog_InvalidData(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_InvalidData::Dialog_InvalidData(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label(0)
{
- refGlade->get_widget("label_example_data", m_label);
+ builder->get_widget("label_example_data", m_label);
}
Dialog_InvalidData::~Dialog_InvalidData()
Modified: trunk/glom/dialog_invalid_data.h
==============================================================================
--- trunk/glom/dialog_invalid_data.h (original)
+++ trunk/glom/dialog_invalid_data.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <libglom/data_structure/field.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -37,7 +37,7 @@
class Dialog_InvalidData : public Gtk::Dialog
{
public:
- Dialog_InvalidData(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_InvalidData(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_InvalidData();
/** Show appropriate example data for this field type
Modified: trunk/glom/dialog_new_self_hosted_connection.cc
==============================================================================
--- trunk/glom/dialog_new_self_hosted_connection.cc (original)
+++ trunk/glom/dialog_new_self_hosted_connection.cc Tue Mar 17 14:42:09 2009
@@ -26,15 +26,15 @@
namespace Glom
{
-Dialog_NewSelfHostedConnection::Dialog_NewSelfHostedConnection(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_NewSelfHostedConnection::Dialog_NewSelfHostedConnection(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
Base_DB(),
m_entry_user(0),
m_entry_password(0)
{
- refGlade->get_widget("entry_user", m_entry_user);
- refGlade->get_widget("entry_password", m_entry_password);
- refGlade->get_widget("entry_password_confirm", m_entry_password_confirm);
+ builder->get_widget("entry_user", m_entry_user);
+ builder->get_widget("entry_password", m_entry_password);
+ builder->get_widget("entry_password_confirm", m_entry_password_confirm);
}
Dialog_NewSelfHostedConnection::~Dialog_NewSelfHostedConnection()
Modified: trunk/glom/dialog_new_self_hosted_connection.h
==============================================================================
--- trunk/glom/dialog_new_self_hosted_connection.h (original)
+++ trunk/glom/dialog_new_self_hosted_connection.h Tue Mar 17 14:42:09 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_DIALOG_NEWSELFHOSTEDCONNECTION_H
#define GLOM_DIALOG_NEWSELFHOSTEDCONNECTION_H
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <gtkmm/label.h>
@@ -36,7 +36,7 @@
public Base_DB
{
public:
- Dialog_NewSelfHostedConnection(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_NewSelfHostedConnection(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_NewSelfHostedConnection();
bool check_password();
Modified: trunk/glom/filechooser_export.cc
==============================================================================
--- trunk/glom/filechooser_export.cc (original)
+++ trunk/glom/filechooser_export.cc Tue Mar 17 14:42:09 2009
@@ -48,10 +48,10 @@
//TODO: Use a generic layout dialog?
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout_export");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout_export");
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout_export", "", error);
+ std::auto_ptr<Gtk::BuilderError> error;
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout_export", "", error);
// Ignore error, refXml is checked below
#endif
Modified: trunk/glom/frame_glom.cc
==============================================================================
--- trunk/glom/frame_glom.cc (original)
+++ trunk/glom/frame_glom.cc Tue Mar 17 14:42:09 2009
@@ -74,8 +74,8 @@
namespace Glom
{
-Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: PlaceHolder(cobject, refGlade),
+Frame_Glom::Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: PlaceHolder(cobject, builder),
m_pLabel_Table(0),
m_box_footer(0),
m_pLabel_Mode(0),
@@ -105,11 +105,11 @@
m_pDialogConnection(0)
{
//Load widgets from glade file:
- refGlade->get_widget("label_table_name", m_pLabel_Table);
+ builder->get_widget("label_table_name", m_pLabel_Table);
- refGlade->get_widget("hbox_footer", m_box_footer);
- refGlade->get_widget("label_mode", m_pLabel_Mode);
- refGlade->get_widget("label_user_level", m_pLabel_userlevel);
+ builder->get_widget("hbox_footer", m_box_footer);
+ builder->get_widget("label_mode", m_pLabel_Mode);
+ builder->get_widget("label_user_level", m_pLabel_userlevel);
//Hide the footer on maemo (It takes too much space),
//and reduce the border width:
@@ -118,25 +118,25 @@
set_border_width(Glom::Utils::DEFAULT_SPACING_LARGE);
#endif
- refGlade->get_widget("hbox_quickfind", m_pBox_QuickFind);
+ builder->get_widget("hbox_quickfind", m_pBox_QuickFind);
m_pBox_QuickFind->hide();
- refGlade->get_widget("entry_quickfind", m_pEntry_QuickFind);
+ builder->get_widget("entry_quickfind", m_pEntry_QuickFind);
m_pEntry_QuickFind->signal_activate().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) ); //Pressing Enter here is like pressing Find.
- refGlade->get_widget("button_quickfind", m_pButton_QuickFind);
+ builder->get_widget("button_quickfind", m_pButton_QuickFind);
m_pButton_QuickFind->signal_clicked().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_quickfind) );
- refGlade->get_widget("hbox_records_count", m_pBox_RecordsCount);
- refGlade->get_widget("label_records_count", m_pLabel_RecordsCount);
- refGlade->get_widget("label_records_found_count", m_pLabel_FoundCount);
- refGlade->get_widget("button_find_all", m_pButton_FindAll);
+ builder->get_widget("hbox_records_count", m_pBox_RecordsCount);
+ builder->get_widget("label_records_count", m_pLabel_RecordsCount);
+ builder->get_widget("label_records_found_count", m_pLabel_FoundCount);
+ builder->get_widget("button_find_all", m_pButton_FindAll);
m_pButton_FindAll->signal_clicked().connect(
sigc::mem_fun(*this, &Frame_Glom::on_button_find_all) );
- refGlade->get_widget_derived("vbox_mode", m_pBox_Mode);
+ builder->get_widget_derived("vbox_mode", m_pBox_Mode);
m_Mode = MODE_None;
m_Mode_Previous = MODE_None;
@@ -780,7 +780,7 @@
file_chooser.hide();
Dialog_Import_CSV* dialog = 0;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_import_csv");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_import_csv");
refXml->get_widget_derived("dialog_import_csv", dialog);
add_view(dialog);
@@ -790,7 +790,7 @@
dialog->hide();
Dialog_Import_CSV_Progress* progress_dialog = 0;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_import_csv_progress");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_import_csv_progress");
refXml->get_widget_derived("dialog_import_csv_progress", progress_dialog);
add_view(progress_dialog);
@@ -901,11 +901,11 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_add_related_table");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_add_related_table");
refXml->get_widget_derived("dialog_add_related_table", m_dialog_addrelatedtable);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1342,7 +1342,7 @@
Dialog_Database_Preferences* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_database_preferences");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_database_preferences");
refXml->get_widget_derived("dialog_database_preferences", dialog);
if(dialog)
{
@@ -1359,7 +1359,7 @@
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1379,12 +1379,12 @@
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_design");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_design");
refXml->get_widget_derived("window_design", m_pDialog_Fields);
m_pDialog_Fields->signal_hide().connect( sigc::mem_fun(*this, &Frame_Glom::on_developer_dialog_hide));
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1475,11 +1475,11 @@
Dialog_GroupsList* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_groups");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_groups");
refXml->get_widget_derived("window_groups", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1577,7 +1577,7 @@
void Frame_Glom::on_menu_developer_script_library()
{
Dialog_ScriptLibrary* dialog = 0;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_script_library");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_script_library");
refXml->get_widget_derived("dialog_script_library", dialog);
dialog->set_transient_for(*(get_app_window()));
add_view(dialog); //Give it access to the document.
@@ -1716,21 +1716,21 @@
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
Dialog_NewSelfHostedConnection* dialog = 0;
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection");
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection");
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
return false;
}
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection", error);
+ std::auto_ptr<Gtk::BuilderError> error;
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_self_hosted_connection", error);
if(error.get())
{
std::cerr << error->what() << std::endl;
@@ -2074,13 +2074,13 @@
try
{
// TODO: Tell the user what has gone wrong (ex.what())
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_error_create_database");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_error_create_database");
refXml->get_widget("dialog_error_create_database", dialog);
dialog->set_transient_for(*pWindowApp);
Glom::Utils::dialog_run_with_help(dialog, "dialog_error_create_database");
delete dialog;
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/frame_glom.h
==============================================================================
--- trunk/glom/frame_glom.h (original)
+++ trunk/glom/frame_glom.h Tue Mar 17 14:42:09 2009
@@ -60,7 +60,7 @@
public Base_DB //Inherits from View_Composite.
{
public:
- Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Frame_Glom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Frame_Glom();
void set_databases_selected(const Glib::ustring& strName);
Modified: trunk/glom/glom.glade
==============================================================================
--- trunk/glom/glom.glade (original)
+++ trunk/glom/glom.glade Tue Mar 17 14:42:09 2009
@@ -1,2863 +1,1808 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
-
-<glade-interface>
-
-<widget class="GtkWindow" id="window_tables">
- <property name="border_width">12</property>
- <property name="title" translatable="yes">window1</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="box_navigation_tables">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment_placeholder_adddel">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="checkbutton_show_hidden">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show hidden tables</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_frame_title">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Tables in database</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="button_cancel">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-close</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="window_adddel">
- <property name="title" translatable="yes">window2</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">True</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="button_add">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_remove">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_edit">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment6">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Edit</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog_existing_or_new">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">480</property>
- <property name="default_height">320</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="helpbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="cancelbutton1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-quit</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-7</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="existing_or_new_button_select">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Select</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">0</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox8">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-question</property>
- <property name="icon_size">6</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkLabel" id="existing_or_new_label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="larger">Open or create a Document</span></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkNotebook" id="existing_or_new_notebook">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_tabs">True</property>
- <property name="show_border">True</property>
- <property name="tab_pos">GTK_POS_TOP</property>
- <property name="scrollable">False</property>
- <property name="enable_popup">False</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="existing_or_new_existing_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Open Existing Document</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
- <property name="visible">True</property>
- <property name="can_focus">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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="existing_or_new_new_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="tab_expand">False</property>
- <property name="tab_fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Create New Document</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog_connection">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox27">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox16">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="button11">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button12">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button13">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment20">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox23">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image13">
- <property name="visible">True</property>
- <property name="stock">gtk-ok</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label67">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_onnect</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox22">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkImage" id="image12">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-question</property>
- <property name="icon_size">6</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox28">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="connection_title">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="larger">Connect to Server</span></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="connection_note">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Please enter the connection details for your database server.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table6">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
-
- <child>
- <widget class="GtkEntry" id="entry_host">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">â</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_password">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">False</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">â</property>
- <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_user">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">â</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label64">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Host</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">entry_host</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkrelation target="entry_host" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label68">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Database</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label65">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_User</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">entry_user</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkrelation target="entry_user" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label66">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Password</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">entry_password</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkrelation target="entry_password" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_database">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <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>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog_find_id">
- <property name="border_width">6</property>
- <property name="title" translatable="yes">Find Related Record</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">300</property>
- <property name="default_height">500</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox81">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox39">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="button_cancel">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox82">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkFrame" id="frame34">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment_parent">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox83">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox81">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label203">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Table:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_table_name">
- <property name="visible">True</property>
- <property name="label" translatable="yes">table_name</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox_quickfind">
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label206">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Quick Find</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_quickfind">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">â</property>
- <property name="activates_default">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_quickfind">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-find</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment_parent">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label202">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Find Related Record</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="window_progress">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Processing</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="vbox84">
- <property name="border_width">6</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label_message">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Processing</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkProgressBar" id="progressbar">
- <property name="visible">True</property>
- <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
- <property name="fraction">0</property>
- <property name="pulse_step">0.10000000149</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkWindow" id="window_main">
- <property name="title" translatable="yes">Glom</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="default_width">900</property>
- <property name="default_height">700</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
-
- <child>
- <widget class="GtkVBox" id="bakery_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox_frame">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label23">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Table:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_table_name">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b><span size="xx-large">None selected</span></b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_mode">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Data</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Mode:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox_quickfind">
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label_quickfind">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Quick Find</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="entry_quickfind">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">â</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_quickfind">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-find</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="vbox_main">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="sidebar_vbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox_mode">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox_footer">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label38">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>User Level:</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_user_level">
- <property name="visible">True</property>
- <property name="label" translatable="yes">None selected</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox_records_count">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="button_find_all">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Find All</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_records_found_count">
- <property name="visible">True</property>
- <property name="label" translatable="yes">0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label204">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Found:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_records_count">
- <property name="visible">True</property>
- <property name="label" translatable="yes">0</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label205">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Records: </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog_import_csv">
- <property name="border_width">5</property>
- <property name="title" translatable="yes">bla.blub - Import from CSV</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="modal">False</property>
- <property name="default_width">550</property>
- <property name="default_height">400</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area5">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="import_csv_cancel_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="import_csv_import_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-3</property>
-
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image6">
- <property name="visible">True</property>
- <property name="stock">gtk-convert</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Import</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="import_csv_help_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="import_csv_target_table">
- <property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="import_csv_encoding_info">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Detected as: UTF-8</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">30</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <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>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="import_csv_first_line_as_title">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_First line as title</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Encoding:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="import_csv_encoding">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- <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>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Import Into _Table:</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Import is a noun here. This is the title for a window showing options for an import operation."><b>Import Options</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">6</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Number of sample rows:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkSpinButton" id="import_csv_sample_rows">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="climb_rate">1</property>
- <property name="digits">0</property>
- <property name="numeric">False</property>
- <property name="update_policy">GTK_UPDATE_ALWAYS</property>
- <property name="snap_to_ticks">False</property>
- <property name="wrap">False</property>
- <property name="adjustment">5 0 100 1 10 0</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
- <property name="visible">True</property>
- <property name="can_focus">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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="import_csv_fields">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Import is a noun here. This is the title for a list of fields to import."><b>Import Fields</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="import_csv_advice_label">
- <property name="visible">True</property>
- <property name="label"></property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="import_csv_error_label">
- <property name="visible">True</property>
- <property name="label">label</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog_data_invalid_format">
- <property name="title" translatable="yes"></property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox17">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox12">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="button1">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_revert">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">2</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment13">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkHBox" id="hbox12">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child>
- <widget class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-undo</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label48">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Revert</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button4">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox11">
- <property name="border_width">12</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-dialog-question</property>
- <property name="icon_size">6</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox18">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label46">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes"><span weight="bold" size="larger">Invalid format</span>
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkWindow" id="window_tables">
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">window1</property>
+ <child>
+ <object class="GtkVBox" id="box_navigation_tables">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkAlignment" id="alignment_placeholder_adddel">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_show_hidden">
+ <property name="label" translatable="yes">Show hidden tables</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label_frame_title">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Tables in database</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox3">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_cancel">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkWindow" id="window_adddel">
+ <property name="title" translatable="yes">window2</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="reorderable">True</property>
+ <property name="rules_hint">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox4">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_remove">
+ <property name="label">gtk-remove</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_edit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment6">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Edit</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkDialog" id="dialog_existing_or_new">
+ <property name="default_width">480</property>
+ <property name="default_height">320</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="stock">gtk-dialog-question</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="existing_or_new_label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><span weight="bold" size="larger">Open or create a Document</span></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="existing_or_new_notebook">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="existing_or_new_existing_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Open Existing Document</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="existing_or_new_new_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Create New Document</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-quit</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="existing_or_new_button_select">
+ <property name="label" translatable="yes">_Select</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">helpbutton1</action-widget>
+ <action-widget response="-7">cancelbutton1</action-widget>
+ <action-widget response="0">existing_or_new_button_select</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_connection">
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="vbox27">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox22">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="stock">gtk-dialog-question</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox28">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="connection_title">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><span weight="bold" size="larger">Connect to Server</span></property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="connection_note">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Please enter the connection details for your database server.</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table6">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkEntry" id="entry_host">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_password">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_user">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label64">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Host</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">entry_host</property>
+ <accessibility>
+ <relation type="label-for" target="entry_host"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label68">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Database</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label65">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_User</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">entry_user</property>
+ <accessibility>
+ <relation type="label-for" target="entry_user"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label66">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Password</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">entry_password</property>
+ <accessibility>
+ <relation type="label-for" target="entry_password"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_database">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="hbuttonbox16">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button11">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button12">
+ <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="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button13">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment20">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox23">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image13">
+ <property name="visible">True</property>
+ <property name="stock">gtk-ok</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label67">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">C_onnect</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">button11</action-widget>
+ <action-widget response="-6">button12</action-widget>
+ <action-widget response="-5">button13</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_find_id">
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Find Related Record</property>
+ <property name="default_width">300</property>
+ <property name="default_height">500</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="vbox81">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox82">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame34">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment_parent">
+ <property name="visible">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox83">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox81">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label203">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Table:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_table_name">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">table_name</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_quickfind">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label206">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Quick Find</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_quickfind">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_quickfind">
+ <property name="label">gtk-find</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment_parent1">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label202">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Find Related Record</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="hbuttonbox39">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_cancel">
+ <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="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">button_cancel</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="window_progress">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Processing</property>
+ <child>
+ <object class="GtkVBox" id="vbox84">
+ <property name="visible">True</property>
+ <property name="border_width">6</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_message">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Processing</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="progressbar">
+ <property name="visible">True</property>
+ <property name="pulse_step">0.10000000149</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkWindow" id="window_main">
+ <property name="title" translatable="yes">Glom</property>
+ <property name="default_width">900</property>
+ <property name="default_height">700</property>
+ <child>
+ <object class="GtkVBox" id="bakery_vbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="vbox_frame">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Table:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_table_name">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b><span size="xx-large">None selected</span></b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Mode:</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_mode">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Data</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_quickfind">
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label_quickfind">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Quick Find</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_quickfind">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_quickfind">
+ <property name="label">gtk-find</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="vbox_main">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkVBox" id="sidebar_vbox">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox_mode">
+ <property name="visible">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_footer">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label38">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>User Level:</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_user_level">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">None selected</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_records_count">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label205">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Records: </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_records_count">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label204">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Found:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_records_found_count">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_find_all">
+ <property name="label" translatable="yes">Find All</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkDialog" id="dialog_import_csv">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">bla.blub - Import from CSV</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="default_width">550</property>
+ <property name="default_height">400</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox5">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="import_csv_target_table">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">label</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="import_csv_encoding_info">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Detected as: UTF-8</property>
+ <property name="wrap">True</property>
+ <property name="width_chars">30</property>
+ </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>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="import_csv_first_line_as_title">
+ <property name="label" translatable="yes">_First line as title</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">_Encoding:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="import_csv_encoding">
+ <property name="visible">True</property>
+ </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>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label11">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Import Into _Table:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Import is a noun here. This is the title for a window showing options for an import operation."><b>Import Options</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Number of sample rows:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xscale">0</property>
+ <child>
+ <object class="GtkSpinButton" id="import_csv_sample_rows">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="import_csv_fields">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Import is a noun here. This is the title for a list of fields to import."><b>Import Fields</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="import_csv_advice_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="import_csv_error_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">label</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area5">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="import_csv_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="import_csv_import_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkImage" id="image6">
+ <property name="visible">True</property>
+ <property name="stock">gtk-convert</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Import</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="import_csv_help_button">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">import_csv_cancel_button</action-widget>
+ <action-widget response="-3">import_csv_import_button</action-widget>
+ <action-widget response="-11">import_csv_help_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_data_invalid_format">
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="vbox17">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkHBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="stock">gtk-dialog-question</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox18">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><span weight="bold" size="larger">Invalid format</span>
The data in the field was not recognized. Please try to correct the data or revert to the previous value. Here is an example of correctly-formatted data for this field.
</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label_example_data">
- <property name="visible">True</property>
- <property name="label" translatable="yes">example data format</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-<widget class="GtkDialog" id="dialog_import_csv_progress">
- <property name="border_width">5</property>
- <property name="title" translatable="yes" comments="This is a status message for a progress dialog. It says that importing is currently happenning.">Importing Data</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">False</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">2</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area7">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="import_csv_progress_cancel_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="import_csv_progress_ok_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please wait, your data is being importedâ</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkProgressBar" id="import_csv_progress_progress_bar">
- <property name="visible">True</property>
- <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
- <property name="fraction">0</property>
- <property name="pulse_step">0.10000000149</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="import_csv_progress_textview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_WORD_CHAR</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_example_data">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">example data format</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="hbuttonbox12">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_revert">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <object class="GtkAlignment" id="alignment13">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <child>
+ <object class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="stock">gtk-undo</property>
+ <property name="icon-size">4</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label48">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Revert</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button4">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">button1</action-widget>
+ <action-widget response="2">button_revert</action-widget>
+ <action-widget response="-5">button4</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_import_csv_progress">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes" comments="This is a status message for a progress dialog. It says that importing is currently happenning.">Importing Data</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox7">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Please wait, your data is being imported…</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkProgressBar" id="import_csv_progress_progress_bar">
+ <property name="visible">True</property>
+ <property name="pulse_step">0.10000000149</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="import_csv_progress_textview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="buffer">textbuffer1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area7">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="import_csv_progress_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="import_csv_progress_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">import_csv_progress_cancel_button</action-widget>
+ <action-widget response="-5">import_csv_progress_ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="value">5</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkTextBuffer" id="textbuffer1"/>
+</interface>
Modified: trunk/glom/glom_developer.glade
==============================================================================
--- trunk/glom/glom_developer.glade (original)
+++ trunk/glom/glom_developer.glade Tue Mar 17 14:42:09 2009
@@ -1,26 +1,27 @@
<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.12 -->
+<interface>
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-requires gtksourceview 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="window_data_layout_export">
+ <object class="GtkWindow" id="window_data_layout_export">
<property name="border_width">12</property>
<property name="title" translatable="yes">Export Format</property>
<property name="default_width">600</property>
<property name="default_height">500</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox9">
+ <object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label40">
+ <object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Table:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -28,17 +29,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">table name</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="fill">False</property>
@@ -46,53 +47,53 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox9">
+ <object class="GtkVBox" id="vbox9">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_fields">
+ <object class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox9">
+ <object class="GtkHButtonBox" id="hbuttonbox9">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
- <widget class="GtkButton" id="button_field_up">
+ <object class="GtkButton" id="button_field_up">
<property name="label">gtk-go-up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -100,39 +101,39 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_down">
+ <object class="GtkButton" id="button_field_down">
<property name="label">gtk-go-down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox5">
+ <object class="GtkHButtonBox" id="hbuttonbox5">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_field_delete">
+ <object class="GtkButton" id="button_field_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -140,14 +141,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_add">
+ <object class="GtkButton" id="button_field_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -155,98 +156,95 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_edit">
+ <object class="GtkButton" id="button_field_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label28">
+ <child type="label">
+ <object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Fields</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">1</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox7">
+ <object class="GtkHButtonBox" id="hbuttonbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_field_definition_edit">
+ </object>
+ <object class="GtkWindow" id="window_field_definition_edit">
<property name="title" translatable="yes">Field Definition</property>
<child>
- <widget class="GtkVBox" id="vbox11">
+ <object class="GtkVBox" id="vbox11">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkNotebook" id="notebook1">
+ <object class="GtkNotebook" id="notebook1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkVBox" id="vbox13">
+ <object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkTable" id="table4">
+ <object class="GtkTable" id="table4">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
@@ -254,10 +252,10 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -265,21 +263,21 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label34">
+ <object class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="label" translatable="yes">Name:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -289,9 +287,9 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_type">
+ <object class="GtkComboBox" id="combobox_type">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -302,17 +300,17 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment10">
+ <object class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="xalign">1</property>
<child>
- <widget class="GtkLabel" id="label35">
+ <object class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="label" translatable="yes">Type:</property>
<property name="justify">right</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -321,17 +319,17 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment9">
+ <object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="xalign">1</property>
<child>
- <widget class="GtkLabel" id="label37">
+ <object class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="label" translatable="yes">Title:</property>
<property name="justify">right</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -339,7 +337,7 @@
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -347,19 +345,19 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox12">
+ <object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_primarykey">
+ <object class="GtkCheckButton" id="checkbutton_primarykey">
<property name="label" translatable="yes">Primary Key</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -367,14 +365,14 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_unique">
+ <object class="GtkCheckButton" id="checkbutton_unique">
<property name="label" translatable="yes">Unique</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -382,57 +380,56 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_autoincrement">
+ <object class="GtkCheckButton" id="checkbutton_autoincrement">
<property name="label" translatable="yes">Auto-increment</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label30">
+ <child type="tab">
+ <object class="GtkLabel" id="label30">
<property name="visible">True</property>
<property name="label" translatable="yes">Field</property>
- </widget>
+ </object>
<packing>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="box_default_value">
+ <object class="GtkVBox" id="box_default_value">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame39">
+ <object class="GtkFrame" id="frame39">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment_userentry">
+ <object class="GtkAlignment" id="alignment_userentry">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox96">
+ <object class="GtkVBox" id="vbox96">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox_default_value_simple">
+ <object class="GtkHBox" id="hbox_default_value_simple">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
@@ -441,20 +438,20 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_lookup">
+ <object class="GtkCheckButton" id="checkbutton_lookup">
<property name="label" translatable="yes">Lookup value when a field changes.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -462,11 +459,11 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment14">
+ <object class="GtkAlignment" id="alignment14">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table_lookup">
+ <object class="GtkTable" id="table_lookup">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">2</property>
@@ -474,9 +471,9 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="combobox_lookup_field">
+ <object class="GtkComboBox" id="combobox_lookup_field">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -487,9 +484,9 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_lookup_relationship">
+ <object class="GtkComboBox" id="combobox_lookup_relationship">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -498,28 +495,28 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label53">
+ <object class="GtkLabel" id="label53">
<property name="visible">True</property>
<property name="label" translatable="yes">Relationship</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment15">
+ <object class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
<property name="xalign">1</property>
<child>
- <widget class="GtkLabel" id="label51">
+ <object class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="label" translatable="yes">Field</property>
<property name="justify">right</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -527,31 +524,28 @@
<property name="y_options">GTK_EXPAND</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_userentry">
+ <child type="label">
+ <object class="GtkRadioButton" id="radiobutton_userentry">
<property name="label" translatable="yes">User Entry</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">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>
@@ -559,80 +553,67 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame38">
+ <object class="GtkFrame" id="frame38">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment_calculate">
+ <object class="GtkAlignment" id="alignment_calculate">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <object class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
+ <object class="GtkScrolledWindow" id="scrolledwindow5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
-
<child>
- <widget class="GtkSourceView" id="textview_calculate">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
+ <object class="GtkSourceView" id="textview_calculate">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="buffer">textbuffer3</property>
+ </object>
+ </child>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox22">
+ <object class="GtkVBox" id="vbox22">
<property name="visible">True</property>
<child>
- <widget class="GtkButton" id="button_edit_calculation">
+ <object class="GtkButton" id="button_edit_calculation">
<property name="label" translatable="yes">Edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_calculate">
+ <child type="label">
+ <object class="GtkRadioButton" id="radiobutton_calculate">
<property name="label" translatable="yes">Calculate Value</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -640,74 +621,69 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_userentry</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label31">
+ <child type="tab">
+ <object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="label" translatable="yes">Value</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="box_formatting_placeholder">
+ <object class="GtkVBox" id="box_formatting_placeholder">
<property name="visible">True</property>
<property name="border_width">6</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label188">
+ <child type="tab">
+ <object class="GtkLabel" id="label188">
<property name="visible">True</property>
<property name="label" translatable="yes">Default Formatting</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox8">
+ <object class="GtkHButtonBox" id="hbuttonbox8">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_cancel">
+ <object class="GtkButton" id="button_cancel">
<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="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -715,7 +691,7 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_save">
+ <object class="GtkButton" id="button_save">
<property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -724,54 +700,54 @@
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_design">
+ </object>
+ <object class="GtkWindow" id="window_design">
<property name="title" translatable="yes">Field Definitions</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
<child>
- <widget class="GtkVBox" id="vbox14">
+ <object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame4">
+ <object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="label_xalign">0</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="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox16">
+ <object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox10">
+ <object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label45">
+ <object class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Table:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -779,58 +755,55 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">None selected</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_placeholder">
+ <object class="GtkVBox" id="vbox_placeholder">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label_frame_title">
+ <child type="label">
+ <object class="GtkLabel" id="label_frame_title">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Field Definitions</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="GtkHButtonBox" id="hbuttonbox11">
+ <object class="GtkHButtonBox" id="hbuttonbox11">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -838,43 +811,43 @@
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="window_field_calculation">
+ </object>
+ <object class="GtkDialog" id="window_field_calculation">
<property name="title" translatable="yes">Field Calculation</property>
<property name="default_width">398</property>
<property name="default_height">400</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label54">
+ <object class="GtkLabel" id="label54">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">The field value will be the return value of the python function, which you implement here.</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -882,14 +855,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <object class="GtkLabel" id="label55">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label">import glom
<b>def calculate_field_value(record):</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -897,54 +870,54 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment16">
+ <object class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="left_padding">20</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow7">
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkViewport" id="viewport1">
+ <object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<child>
- <widget class="GtkSourceView" id="textview_calculation">
+ <object class="GtkSourceView" id="textview_calculation">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox14">
+ <object class="GtkHButtonBox" id="hbuttonbox14">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_test">
+ <object class="GtkButton" id="button_test">
<property name="label" translatable="yes">Test</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</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="fill">False</property>
@@ -952,14 +925,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox50">
+ <object class="GtkHBox" id="hbox50">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_trigger_prefix">
+ <object class="GtkLabel" id="label_trigger_prefix">
<property name="visible">True</property>
<property name="label" translatable="yes">Triggered by:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -967,41 +940,40 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_triggered_by">
+ <object class="GtkLabel" id="label_triggered_by">
<property name="visible">True</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="fill">False</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton2">
+ <object class="GtkButton" id="helpbutton2">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1009,15 +981,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton2">
+ <object class="GtkButton" id="cancelbutton2">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1025,55 +996,59 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="okbutton2">
+ <object class="GtkButton" id="okbutton2">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="window_button_script">
+ <action-widgets>
+ <action-widget response="-11">helpbutton2</action-widget>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-5">okbutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="window_button_script">
<property name="title" translatable="yes">Button Script</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label11">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1081,15 +1056,15 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1097,12 +1072,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label54">
+ <object class="GtkLabel" id="label54">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">When the button is clicked it will run the python function which you implement here.</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1110,14 +1085,14 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label55">
+ <object class="GtkLabel" id="label55">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label">import glom
<b>def on_button_clicked(record):</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1125,93 +1100,79 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment16">
+ <object class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="left_padding">20</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow7">
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkViewport" id="viewport1">
+ <object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
-
<child>
- <widget class="GtkSourceView" id="textview_calculation">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
- </child>
- </widget>
+ <object class="GtkSourceView" id="textview_calculation">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="buffer">textbuffer2</property>
+ </object>
+ </child>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox43">
+ <object class="GtkHButtonBox" id="hbuttonbox43">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_test">
+ <object class="GtkButton" id="button_test">
<property name="label" translatable="yes">Test</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</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="fill">False</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton2">
+ <object class="GtkButton" id="helpbutton2">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1219,15 +1180,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton2">
+ <object class="GtkButton" id="cancelbutton2">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1235,55 +1195,59 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="okbutton2">
+ <object class="GtkButton" id="okbutton2">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="window_textobject">
+ <action-widgets>
+ <action-widget response="-11">helpbutton2</action-widget>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-5">okbutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="window_textobject">
<property name="title" translatable="yes">Text Object</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox_title">
+ <object class="GtkHBox" id="hbox_title">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label232">
+ <object class="GtkLabel" id="label232">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1291,86 +1255,81 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame40">
+ <object class="GtkFrame" id="frame40">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment82">
+ <object class="GtkAlignment" id="alignment82">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow7">
+ <object class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkViewport" id="viewport1">
+ <object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
-
<child>
- <widget class="GtkTextView" id="textview_text">
+ <object class="GtkTextView" id="textview_text">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label233">
+ <child type="label">
+ <object class="GtkLabel" id="label233">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Text</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">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_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton2">
+ <object class="GtkButton" id="helpbutton2">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1378,15 +1337,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton2">
+ <object class="GtkButton" id="cancelbutton2">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1394,55 +1352,59 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="okbutton2">
+ <object class="GtkButton" id="okbutton2">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="window_imageobject">
+ <action-widgets>
+ <action-widget response="-11">helpbutton2</action-widget>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-5">okbutton2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="window_imageobject">
<property name="title" translatable="yes">Image Object</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox21">
+ <object class="GtkVBox" id="vbox21">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox_title">
+ <object class="GtkHBox" id="hbox_title">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label232">
+ <object class="GtkLabel" id="label232">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1450,71 +1412,71 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame40">
+ <object class="GtkFrame" id="frame40">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment82">
+ <object class="GtkAlignment" id="alignment82">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox97">
+ <object class="GtkVBox" id="vbox97">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkEventBox" id="imageglom">
+ <object class="GtkEventBox" id="imageglom">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox112">
+ <object class="GtkHBox" id="hbox112">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
- <widget class="GtkButton" id="button_choose_image">
+ <object class="GtkButton" id="button_choose_image">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment87">
+ <object class="GtkAlignment" id="alignment87">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox111">
+ <object class="GtkHBox" id="hbox111">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image48">
+ <object class="GtkImage" id="image48">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1522,73 +1484,69 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label241">
+ <object class="GtkLabel" id="label241">
<property name="visible">True</property>
<property name="label">Choose Image</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </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="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label233">
+ <child type="label">
+ <object class="GtkLabel" id="label233">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Image</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">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_area2">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton2">
+ <object class="GtkButton" id="helpbutton2">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1596,15 +1554,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton2">
+ <object class="GtkButton" id="cancelbutton2">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1612,69 +1569,73 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok">
+ <object class="GtkButton" id="button_ok">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_choose_field">
+ <action-widgets>
+ <action-widget response="-11">helpbutton2</action-widget>
+ <action-widget response="-6">cancelbutton2</action-widget>
+ <action-widget response="-5">button_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_choose_field">
<property name="title" translatable="yes">Select Field</property>
<property name="default_width">300</property>
<property name="default_height">500</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox3">
+ <object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox23">
+ <object class="GtkVBox" id="vbox23">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame5">
+ <object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment18">
+ <object class="GtkAlignment" id="alignment18">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox24">
+ <object class="GtkVBox" id="vbox24">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_show_related_relationships">
+ <object class="GtkCheckButton" id="checkbutton_show_related_relationships">
<property name="label" translatable="yes">Show Related Relationships</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">When this is selected you will see extra relationships in the Table list, allowing you to choose fields from relationships in related tables, instead of just regular fields from those related tables.</property>
+ <property name="tooltip_text" translatable="yes">When this is selected you will see extra relationships in the Table list, allowing you to choose fields from relationships in related tables, instead of just regular fields from those related tables.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1682,14 +1643,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox18">
+ <object class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">Table:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1697,16 +1658,16 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_relationship">
+ <object class="GtkComboBox" id="combobox_relationship">
<property name="visible">True</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="fill">False</property>
@@ -1714,61 +1675,57 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow8">
+ <object class="GtkScrolledWindow" id="scrolledwindow8">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_fields">
+ <object class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label57">
+ <child type="label">
+ <object class="GtkLabel" id="label57">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Select Field</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>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area3">
+ <object class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="cancelbutton3">
+ <object class="GtkButton" id="cancelbutton3">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1776,27 +1733,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_select">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button_select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment19">
+ <object class="GtkAlignment" id="alignment19">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox19">
+ <object class="GtkHBox" id="hbox19">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image9">
+ <object class="GtkImage" id="image9">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1804,129 +1760,130 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label58">
+ <object class="GtkLabel" id="label58">
<property name="visible">True</property>
<property name="label" translatable="yes">Select</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_print_layouts">
+ <action-widgets>
+ <action-widget response="-6">cancelbutton3</action-widget>
+ <action-widget response="-5">button_select</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="window_print_layouts">
<property name="border_width">12</property>
<property name="title" translatable="yes">Print Layouts</property>
<child>
- <widget class="GtkVBox" id="box_print_layouts">
+ <object class="GtkVBox" id="box_print_layouts">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame18">
+ <object class="GtkFrame" id="frame18">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment50">
+ <object class="GtkAlignment" id="alignment50">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox71">
+ <object class="GtkVBox" id="vbox71">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment_placeholder_adddel">
+ <object class="GtkAlignment" id="alignment_placeholder_adddel">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label170">
+ <child type="label">
+ <object class="GtkLabel" id="label170">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Print Layouts</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="GtkHButtonBox" id="hbuttonbox33">
+ <object class="GtkHButtonBox" id="hbuttonbox33">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_cancel">
+ <object class="GtkButton" id="button_cancel">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_print_layout_edit">
+ </object>
+ <object class="GtkWindow" id="window_print_layout_edit">
<property name="title" translatable="yes">Print Layout Editor</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox_menu">
+ <object class="GtkVBox" id="vbox_menu">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1934,25 +1891,25 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_inner">
+ <object class="GtkHBox" id="hbox_inner">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox_inner">
+ <object class="GtkVBox" id="vbox_inner">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox20">
+ <object class="GtkHBox" id="hbox20">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label207">
+ <object class="GtkLabel" id="label207">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Table:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1960,17 +1917,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">Table Name</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="fill">False</property>
@@ -1978,19 +1935,19 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox18">
+ <object class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label208">
+ <object class="GtkLabel" id="label208">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Layout name:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -1998,15 +1955,15 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2014,14 +1971,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox19">
+ <object class="GtkHBox" id="hbox19">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label209">
+ <object class="GtkLabel" id="label209">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2029,20 +1986,20 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2050,20 +2007,20 @@
</packing>
</child>
<child>
- <widget class="GtkTable" id="table1">
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkVRuler" id="vruler">
+ <object class="GtkVRuler" id="vruler">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="upper">10</property>
<property name="position">5</property>
<property name="max_size">10</property>
<property name="metric">centimeters</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -2071,14 +2028,14 @@
</packing>
</child>
<child>
- <widget class="GtkHRuler" id="hruler">
+ <object class="GtkHRuler" id="hruler">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="upper">10</property>
<property name="position">5</property>
<property name="max_size">10</property>
<property name="metric">centimeters</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -2086,12 +2043,12 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_canvas">
+ <object class="GtkVBox" id="vbox_canvas">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -2102,82 +2059,82 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox43">
+ <object class="GtkHButtonBox" id="hbuttonbox43">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHandleBox" id="handle_box">
+ <object class="GtkHandleBox" id="handle_box">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="handle_position">right</property>
<property name="snap_edge">right</property>
<property name="snap_edge_set">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_new_self_hosted_connection">
+ </object>
+ <object class="GtkDialog" id="dialog_new_self_hosted_connection">
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox27">
+ <object class="GtkVBox" id="vbox27">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox22">
+ <object class="GtkHBox" id="hbox22">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image12">
+ <object class="GtkImage" id="image12">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2185,11 +2142,11 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox28">
+ <object class="GtkVBox" id="vbox28">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label63">
+ <object class="GtkLabel" id="label63">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -2200,7 +2157,7 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2208,14 +2165,14 @@
</packing>
</child>
<child>
- <widget class="GtkTable" id="table6">
+ <object class="GtkTable" id="table6">
<property name="visible">True</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label65">
+ <object class="GtkLabel" id="label65">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_User</property>
@@ -2223,9 +2180,9 @@
<property name="justify">right</property>
<property name="mnemonic_widget">entry_user</property>
<accessibility>
- <atkrelation type="label-for" target="entry_user"/>
+ <relation type="label-for" target="entry_user"/>
</accessibility>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -2234,12 +2191,12 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_user">
+ <object class="GtkEntry" id="entry_user">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -2249,11 +2206,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_password">
+ <object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -2263,7 +2220,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label66">
+ <object class="GtkLabel" id="label66">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Password</property>
@@ -2271,9 +2228,9 @@
<property name="justify">right</property>
<property name="mnemonic_widget">entry_password</property>
<accessibility>
- <atkrelation type="label-for" target="entry_password"/>
+ <relation type="label-for" target="entry_password"/>
</accessibility>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -2282,12 +2239,12 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_password_confirm">
+ <object class="GtkEntry" id="entry_password_confirm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -2297,7 +2254,7 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_password_confirm">
+ <object class="GtkLabel" id="label_password_confirm">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Confirm Password</property>
@@ -2305,9 +2262,9 @@
<property name="justify">right</property>
<property name="mnemonic_widget">entry_password_confirm</property>
<accessibility>
- <atkrelation type="label-for" target="entry_password_confirm"/>
+ <relation type="label-for" target="entry_password_confirm"/>
</accessibility>
- </widget>
+ </object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
@@ -2327,39 +2284,38 @@
<child>
<placeholder/>
</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="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox16">
+ <object class="GtkHButtonBox" id="hbuttonbox16">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button11">
+ <object class="GtkButton" id="button11">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2367,15 +2323,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button12">
+ <object class="GtkButton" id="button12">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2383,27 +2338,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button13">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button13">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment20">
+ <object class="GtkAlignment" id="alignment20">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox23">
+ <object class="GtkHBox" id="hbox23">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image13">
+ <object class="GtkImage" id="image13">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2411,56 +2365,61 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label67">
+ <object class="GtkLabel" id="label67">
<property name="visible">True</property>
<property name="label" translatable="yes">C_reate</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_error_create_database">
+ <action-widgets>
+ <action-widget response="-11">button11</action-widget>
+ <action-widget response="-6">button12</action-widget>
+ <action-widget response="-5">button13</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_error_create_database">
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox31">
+ <object class="GtkVBox" id="vbox31">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox26">
+ <object class="GtkHBox" id="hbox26">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image16">
+ <object class="GtkImage" id="image16">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2468,10 +2427,10 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox32">
+ <object class="GtkVBox" id="vbox32">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label71">
+ <object class="GtkLabel" id="label71">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -2482,39 +2441,38 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox18">
+ <object class="GtkHButtonBox" id="hbuttonbox18">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button17">
+ <object class="GtkButton" id="button17">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2522,33 +2480,36 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button18">
+ <object class="GtkButton" id="button18">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_choose_relationship">
+ <action-widgets>
+ <action-widget response="-11">button17</action-widget>
+ <action-widget response="-5">button18</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_choose_relationship">
<property name="border_width">6</property>
<property name="title" translatable="yes">Select Relationship</property>
<property name="default_width">300</property>
@@ -2556,35 +2517,35 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox35">
+ <object class="GtkVBox" id="vbox35">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox36">
+ <object class="GtkVBox" id="vbox36">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame6">
+ <object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment24">
+ <object class="GtkAlignment" id="alignment24">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox37">
+ <object class="GtkVBox" id="vbox37">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox31">
+ <object class="GtkHBox" id="hbox31">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">Table:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2592,16 +2553,16 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label77">
+ <object class="GtkLabel" id="label77">
<property name="visible">True</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="fill">False</property>
@@ -2609,61 +2570,57 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow9">
+ <object class="GtkScrolledWindow" id="scrolledwindow9">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_relationships">
+ <object class="GtkTreeView" id="treeview_relationships">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label78">
+ <child type="label">
+ <object class="GtkLabel" id="label78">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Select Relationship</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>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox20">
+ <object class="GtkHButtonBox" id="hbuttonbox20">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button22">
+ <object class="GtkButton" id="button22">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2671,27 +2628,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_select">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button_select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment23">
+ <object class="GtkAlignment" id="alignment23">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox30">
+ <object class="GtkHBox" id="hbox30">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image20">
+ <object class="GtkImage" id="image20">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2699,39 +2655,43 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label75">
+ <object class="GtkLabel" id="label75">
<property name="visible">True</property>
<property name="label" translatable="yes">Select</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="window_groups">
+ <action-widgets>
+ <action-widget response="-6">button22</action-widget>
+ <action-widget response="-5">button_select</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="window_groups">
<property name="height_request">400</property>
<property name="visible">True</property>
<property name="border_width">6</property>
@@ -2739,77 +2699,77 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox4">
+ <object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox40">
+ <object class="GtkVBox" id="vbox40">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
- <widget class="GtkHBox" id="hbox35">
+ <object class="GtkHBox" id="hbox35">
<property name="visible">True</property>
<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">none</property>
<child>
- <widget class="GtkAlignment" id="alignment29">
+ <object class="GtkAlignment" id="alignment29">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox44">
+ <object class="GtkVBox" id="vbox44">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow12">
+ <object class="GtkScrolledWindow" id="scrolledwindow12">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_groups">
+ <object class="GtkTreeView" id="treeview_groups">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox36">
+ <object class="GtkHBox" id="hbox36">
<property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox26">
+ <object class="GtkHButtonBox" id="hbuttonbox26">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox27">
+ <object class="GtkHButtonBox" id="hbuttonbox27">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_group_delete">
+ <object class="GtkButton" id="button_group_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2817,14 +2777,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_group_new">
+ <object class="GtkButton" id="button_group_new">
<property name="label">gtk-new</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2832,25 +2792,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_group_users">
+ <object class="GtkButton" id="button_group_users">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment30">
+ <object class="GtkAlignment" id="alignment30">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox37">
+ <object class="GtkHBox" id="hbox37">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image21">
+ <object class="GtkImage" id="image21">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -2858,75 +2818,72 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label96">
+ <object class="GtkLabel" id="label96">
<property name="visible">True</property>
<property name="label" translatable="yes">Users</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label95">
+ <child type="label">
+ <object class="GtkLabel" id="label95">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Groups</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="GtkFrame" id="frame8">
+ <object class="GtkFrame" id="frame8">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment26">
+ <object class="GtkAlignment" id="alignment26">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox41">
+ <object class="GtkVBox" id="vbox41">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow11">
+ <object class="GtkScrolledWindow" id="scrolledwindow11">
<property name="width_request">350</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -2934,89 +2891,85 @@
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_tables">
+ <object class="GtkTreeView" id="treeview_tables">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox24">
+ <object class="GtkHButtonBox" id="hbuttonbox24">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox25">
+ <object class="GtkHButtonBox" id="hbuttonbox25">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label87">
+ <child type="label">
+ <object class="GtkLabel" id="label87">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Tables</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">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<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_area4">
+ <object class="GtkHButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_help">
+ <object class="GtkButton" id="button_help">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3024,32 +2977,35 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
- <property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="window_users">
+ <action-widgets>
+ <action-widget response="-11">button_help</action-widget>
+ <action-widget response="-7">button_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="window_users">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Users</property>
@@ -3058,22 +3014,22 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox4">
+ <object class="GtkVBox" id="dialog-vbox4">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox40">
+ <object class="GtkVBox" id="vbox40">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox34">
+ <object class="GtkHBox" id="hbox34">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label85">
+ <object class="GtkLabel" id="label85">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Group:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3081,16 +3037,16 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_group">
+ <object class="GtkComboBox" id="combobox_group">
<property name="visible">True</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="fill">False</property>
@@ -3098,64 +3054,64 @@
</packing>
</child>
<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">none</property>
<child>
- <widget class="GtkAlignment" id="alignment26">
+ <object class="GtkAlignment" id="alignment26">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox41">
+ <object class="GtkVBox" id="vbox41">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow11">
+ <object class="GtkScrolledWindow" id="scrolledwindow11">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_users">
+ <object class="GtkTreeView" id="treeview_users">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox35">
+ <object class="GtkHBox" id="hbox35">
<property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox24">
+ <object class="GtkHButtonBox" id="hbuttonbox24">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox25">
+ <object class="GtkHButtonBox" id="hbuttonbox25">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_new">
+ <object class="GtkButton" id="button_new">
<property name="label">gtk-new</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3163,14 +3119,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_delete">
+ <object class="GtkButton" id="button_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3178,14 +3134,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add">
+ <object class="GtkButton" id="button_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3193,14 +3149,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_remove">
+ <object class="GtkButton" id="button_remove">
<property name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3208,70 +3164,66 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_edit">
+ <object class="GtkButton" id="button_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label87">
+ <child type="label">
+ <object class="GtkLabel" id="label87">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Users</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">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_area4">
+ <object class="GtkHButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_help">
+ <object class="GtkButton" id="button_help">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3279,68 +3231,71 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
- <property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_user">
+ <action-widgets>
+ <action-widget response="-11">button_help</action-widget>
+ <action-widget response="-7">button_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_user">
<property name="visible">True</property>
<property name="title" translatable="yes">User</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox5">
+ <object class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox42">
+ <object class="GtkVBox" id="vbox42">
<property name="visible">True</property>
<property name="border_width">6</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">none</property>
<child>
- <widget class="GtkAlignment" id="alignment28">
+ <object class="GtkAlignment" id="alignment28">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox43">
+ <object class="GtkVBox" id="vbox43">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkTable" id="table7">
+ <object class="GtkTable" id="table7">
<property name="visible">True</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="combobox_group">
+ <object class="GtkComboBox" id="combobox_group">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -3351,11 +3306,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label97">
+ <object class="GtkLabel" id="label97">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Group</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -3364,11 +3319,11 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_password">
+ <object class="GtkEntry" id="entry_password">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -3378,12 +3333,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label90">
+ <object class="GtkLabel" id="label90">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Password</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -3392,12 +3347,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label91">
+ <object class="GtkLabel" id="label91">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Confirm Password</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -3406,13 +3361,13 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_password_confirm">
+ <object class="GtkEntry" id="entry_password_confirm">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="visibility">False</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -3422,75 +3377,71 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label89">
+ <object class="GtkLabel" id="label89">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">User</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_user">
+ <object class="GtkEntry" id="entry_user">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label93">
+ <child type="label">
+ <object class="GtkLabel" id="label93">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>User</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">0</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area5">
+ <object class="GtkHButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton3">
+ <object class="GtkButton" id="helpbutton3">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3498,15 +3449,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton4">
+ <object class="GtkButton" id="cancelbutton4">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3514,55 +3464,59 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="okbutton3">
+ <object class="GtkButton" id="okbutton3">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_new_group">
+ <action-widgets>
+ <action-widget response="-11">helpbutton3</action-widget>
+ <action-widget response="-6">cancelbutton4</action-widget>
+ <action-widget response="-5">okbutton3</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_new_group">
<property name="visible">True</property>
<property name="title" translatable="yes">Create Group</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox6">
+ <object class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox45">
+ <object class="GtkVBox" id="vbox45">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox39">
+ <object class="GtkHBox" id="hbox39">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image23">
+ <object class="GtkImage" id="image23">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3570,10 +3524,10 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label99">
+ <object class="GtkLabel" id="label99">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -3584,35 +3538,35 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox40">
+ <object class="GtkHBox" id="hbox40">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="Group Name">
+ <object class="GtkLabel" id="Group Name">
<property name="visible">True</property>
<property name="label" translatable="yes">Group Name</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3620,21 +3574,21 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_group_name">
+ <object class="GtkEntry" id="entry_group_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3642,19 +3596,18 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area6">
+ <object class="GtkHButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton4">
+ <object class="GtkButton" id="helpbutton4">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3662,15 +3615,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton5">
+ <object class="GtkButton" id="cancelbutton5">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3678,26 +3630,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button_ok">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment31">
+ <object class="GtkAlignment" id="alignment31">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox38">
+ <object class="GtkHBox" id="hbox38">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image22">
+ <object class="GtkImage" id="image22">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3705,62 +3656,67 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label98">
+ <object class="GtkLabel" id="label98">
<property name="visible">True</property>
<property name="label" translatable="yes">Create</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_choose_user">
+ <action-widgets>
+ <action-widget response="-11">helpbutton4</action-widget>
+ <action-widget response="-6">cancelbutton5</action-widget>
+ <action-widget response="-5">button_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_choose_user">
<property name="visible">True</property>
<property name="title" translatable="yes">Choose User</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox46">
+ <object class="GtkVBox" id="vbox46">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox47">
+ <object class="GtkVBox" id="vbox47">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox42">
+ <object class="GtkHBox" id="hbox42">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image25">
+ <object class="GtkImage" id="image25">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3768,10 +3724,10 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox48">
+ <object class="GtkVBox" id="vbox48">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label101">
+ <object class="GtkLabel" id="label101">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -3782,35 +3738,35 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox43">
+ <object class="GtkHBox" id="hbox43">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label102">
+ <object class="GtkLabel" id="label102">
<property name="visible">True</property>
<property name="label" translatable="yes">User</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3818,19 +3774,19 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_user_name">
+ <object class="GtkComboBox" id="combo_user_name">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3838,19 +3794,18 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox28">
+ <object class="GtkHButtonBox" id="hbuttonbox28">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button23">
+ <object class="GtkButton" id="button23">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3858,15 +3813,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button24">
+ <object class="GtkButton" id="button24">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3874,53 +3828,57 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button25">
+ <object class="GtkButton" id="button25">
<property name="label">gtk-add</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_layout_field_properties">
+ <action-widgets>
+ <action-widget response="-11">button23</action-widget>
+ <action-widget response="-6">button24</action-widget>
+ <action-widget response="-5">button25</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_layout_field_properties">
<property name="title" translatable="yes">Field Layout</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox50">
+ <object class="GtkVBox" id="vbox50">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox54">
+ <object class="GtkVBox" id="vbox54">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox53">
+ <object class="GtkHBox" id="hbox53">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label117">
+ <object class="GtkLabel" id="label117">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Field:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3928,30 +3886,30 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_field_name">
+ <object class="GtkLabel" id="label_field_name">
<property name="visible">True</property>
<property name="label" translatable="yes">field name</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_editable">
+ <object class="GtkCheckButton" id="checkbutton_editable">
<property name="label" translatable="yes">Allow Editing</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3959,32 +3917,32 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame36">
+ <object class="GtkFrame" id="frame36">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment79">
+ <object class="GtkAlignment" id="alignment79">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox94">
+ <object class="GtkVBox" id="vbox94">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox102">
+ <object class="GtkHBox" id="hbox102">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_use_title_default">
+ <object class="GtkRadioButton" id="radiobutton_use_title_default">
<property name="label" translatable="yes">Use default field title: </property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -3992,17 +3950,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_title_default">
+ <object class="GtkLabel" id="label_title_default">
<property name="visible">True</property>
<property name="label" translatable="yes">the title</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="fill">False</property>
@@ -4010,11 +3968,11 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox101">
+ <object class="GtkHBox" id="hbox101">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_use_title_custom">
+ <object class="GtkRadioButton" id="radiobutton_use_title_custom">
<property name="label" translatable="yes">Use custom title:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -4022,7 +3980,7 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_use_title_default</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4030,63 +3988,60 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title_custom">
+ <object class="GtkEntry" id="entry_title_custom">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label229">
+ <child type="label">
+ <object class="GtkLabel" id="label229">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title</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">2</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame37">
+ <object class="GtkFrame" id="frame37">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment80">
+ <object class="GtkAlignment" id="alignment80">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox52">
+ <object class="GtkVBox" id="vbox52">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_use_default">
+ <object class="GtkRadioButton" id="radiobutton_use_default">
<property name="label" translatable="yes">Use default formatting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4094,7 +4049,7 @@
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton_use_custom">
+ <object class="GtkRadioButton" id="radiobutton_use_custom">
<property name="label" translatable="yes">Use custom formatting</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -4102,7 +4057,7 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_use_default</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4110,57 +4065,53 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="box_formatting_placeholder">
+ <object class="GtkVBox" id="box_formatting_placeholder">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label230">
+ <child type="label">
+ <object class="GtkLabel" id="label230">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Formatting</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">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox29">
+ <object class="GtkHButtonBox" id="hbuttonbox29">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button26">
+ <object class="GtkButton" id="button26">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4168,53 +4119,56 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button27">
+ <object class="GtkButton" id="button27">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_database_preferences">
+ <action-widgets>
+ <action-widget response="-6">button26</action-widget>
+ <action-widget response="-5">button27</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_database_preferences">
<property name="visible">True</property>
<property name="title" translatable="yes">Database Preferences</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox7">
+ <object class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox61">
+ <object class="GtkVBox" id="vbox61">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox58">
+ <object class="GtkHBox" id="hbox58">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label137">
+ <object class="GtkLabel" id="label137">
<property name="visible">True</property>
<property name="label" translatable="yes">System Name:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4222,39 +4176,39 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook" id="notebook4">
+ <object class="GtkNotebook" id="notebook4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkVBox" id="vbox62">
+ <object class="GtkVBox" id="vbox62">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox59">
+ <object class="GtkHBox" id="hbox59">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label138">
+ <object class="GtkLabel" id="label138">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4262,41 +4216,41 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_name">
+ <object class="GtkEntry" id="entry_org_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame15">
+ <object class="GtkFrame" id="frame15">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment44">
+ <object class="GtkAlignment" id="alignment44">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table10">
+ <object class="GtkTable" id="table10">
<property name="visible">True</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkEntry" id="entry_org_address_country">
+ <object class="GtkEntry" id="entry_org_address_country">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -4306,10 +4260,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_postcode">
+ <object class="GtkEntry" id="entry_org_address_postcode">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -4319,10 +4273,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_county">
+ <object class="GtkEntry" id="entry_org_address_county">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -4332,10 +4286,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_town">
+ <object class="GtkEntry" id="entry_org_address_town">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -4345,10 +4299,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_street2">
+ <object class="GtkEntry" id="entry_org_address_street2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -4358,10 +4312,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_org_address_street">
+ <object class="GtkEntry" id="entry_org_address_street">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -4369,11 +4323,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label144">
+ <object class="GtkLabel" id="label144">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Country:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
@@ -4382,11 +4336,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label143">
+ <object class="GtkLabel" id="label143">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Zip/Postal Code:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
@@ -4395,11 +4349,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label142">
+ <object class="GtkLabel" id="label142">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">State/County:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
@@ -4408,11 +4362,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label141">
+ <object class="GtkLabel" id="label141">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Town:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -4421,11 +4375,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label140">
+ <object class="GtkLabel" id="label140">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Street (Line 2):</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -4434,87 +4388,83 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label139">
+ <object class="GtkLabel" id="label139">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Street:</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label145">
+ <child type="label">
+ <object class="GtkLabel" id="label145">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Address</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">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label146">
+ <child type="tab">
+ <object class="GtkLabel" id="label146">
<property name="visible">True</property>
<property name="label" translatable="yes">Organisation</property>
- </widget>
+ </object>
<packing>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox98">
+ <object class="GtkVBox" id="vbox98">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkEventBox" id="imageglom">
+ <object class="GtkEventBox" id="imageglom">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox113">
+ <object class="GtkHBox" id="hbox113">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_choose_image">
+ <object class="GtkButton" id="button_choose_image">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment88">
+ <object class="GtkAlignment" id="alignment88">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox114">
+ <object class="GtkHBox" id="hbox114">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image49">
+ <object class="GtkImage" id="image49">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4522,22 +4472,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label243">
+ <object class="GtkLabel" id="label243">
<property name="visible">True</property>
<property name="label">Choose Image</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4545,7 +4495,7 @@
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4553,29 +4503,28 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label147">
+ <child type="tab">
+ <object class="GtkLabel" id="label147">
<property name="visible">True</property>
<property name="label" translatable="yes">Logo</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox63">
+ <object class="GtkVBox" id="vbox63">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow14">
+ <object class="GtkScrolledWindow" id="scrolledwindow14">
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -4583,57 +4532,55 @@
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_autoincrements">
+ <object class="GtkTreeView" id="treeview_autoincrements">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="rules_hint">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label242">
+ <child type="tab">
+ <object class="GtkLabel" id="label242">
<property name="visible">True</property>
<property name="label" translatable="yes">Auto-increment values</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area7">
+ <object class="GtkHButtonBox" id="dialog-action_area7">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton5">
+ <object class="GtkButton" id="helpbutton5">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4641,15 +4588,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton6">
+ <object class="GtkButton" id="cancelbutton6">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4657,54 +4603,58 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="okbutton4">
+ <object class="GtkButton" id="okbutton4">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_report_layout">
+ <action-widgets>
+ <action-widget response="-11">helpbutton5</action-widget>
+ <action-widget response="-6">cancelbutton6</action-widget>
+ <action-widget response="-5">okbutton4</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="window_report_layout">
<property name="border_width">12</property>
<property name="title" translatable="yes">Report Layout</property>
<property name="default_width">600</property>
<property name="default_height">500</property>
<child>
- <widget class="GtkVBox" id="vbox67">
+ <object class="GtkVBox" id="vbox67">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox66">
+ <object class="GtkHBox" id="hbox66">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox61">
+ <object class="GtkHBox" id="hbox61">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label158">
+ <object class="GtkLabel" id="label158">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Table:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4712,38 +4662,38 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">table name</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_table_title">
+ <object class="GtkCheckButton" id="checkbutton_table_title">
<property name="label" translatable="yes">Show Table Title</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">When this is checked the table's title will be shown at the top of the report in addition to the report title.</property>
+ <property name="tooltip_text" translatable="yes">When this is checked the table's title will be shown at the top of the report in addition to the report title.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</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="fill">False</property>
@@ -4751,19 +4701,19 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox118">
+ <object class="GtkHBox" id="hbox118">
<property name="visible">True</property>
<property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox67">
+ <object class="GtkHBox" id="hbox67">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label169">
+ <object class="GtkLabel" id="label169">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Report name:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4771,29 +4721,29 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox68">
+ <object class="GtkHBox" id="hbox68">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label160">
+ <object class="GtkLabel" id="label160">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4801,20 +4751,20 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4822,66 +4772,63 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox65">
+ <object class="GtkHBox" id="hbox65">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame17">
+ <object class="GtkFrame" id="frame17">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment49">
+ <object class="GtkAlignment" id="alignment49">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow16">
+ <object class="GtkScrolledWindow" id="scrolledwindow16">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_available_parts">
+ <object class="GtkTreeView" id="treeview_available_parts">
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label168">
+ <child type="label">
+ <object class="GtkLabel" id="label168">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Available Parts</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="vbox69">
+ <object class="GtkVBox" id="vbox69">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
<child>
- <widget class="GtkButton" id="button_add">
+ <object class="GtkButton" id="button_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -4889,130 +4836,127 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame16">
+ <object class="GtkFrame" id="frame16">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment45">
+ <object class="GtkAlignment" id="alignment45">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox68">
+ <object class="GtkVBox" id="vbox68">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkNotebook" id="notebook_parts">
+ <object class="GtkNotebook" id="notebook_parts">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow20">
+ <object class="GtkScrolledWindow" id="scrolledwindow20">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_parts_header">
+ <object class="GtkTreeView" id="treeview_parts_header">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label237">
+ <child type="tab">
+ <object class="GtkLabel" id="label237">
<property name="visible">True</property>
<property name="label" translatable="yes">Header</property>
- </widget>
+ </object>
<packing>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow15">
+ <object class="GtkScrolledWindow" id="scrolledwindow15">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_parts_main">
+ <object class="GtkTreeView" id="treeview_parts_main">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label238">
+ <child type="tab">
+ <object class="GtkLabel" id="label238">
<property name="visible">True</property>
<property name="label" translatable="yes" comments="Translators: The Main part of the report (not the footer or header)">Main</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow21">
+ <object class="GtkScrolledWindow" id="scrolledwindow21">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_parts_footer">
+ <object class="GtkTreeView" id="treeview_parts_footer">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label239">
+ <child type="tab">
+ <object class="GtkLabel" id="label239">
<property name="visible">True</property>
<property name="label" translatable="yes">Footer</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox107">
+ <object class="GtkHBox" id="hbox107">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_up">
+ <object class="GtkButton" id="button_up">
<property name="label">gtk-go-up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5020,14 +4964,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_down">
+ <object class="GtkButton" id="button_down">
<property name="label">gtk-go-down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5035,14 +4979,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_delete">
+ <object class="GtkButton" id="button_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5051,25 +4995,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_formatting">
+ <object class="GtkButton" id="button_formatting">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment83">
+ <object class="GtkAlignment" id="alignment83">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox106">
+ <object class="GtkHBox" id="hbox106">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image44">
+ <object class="GtkImage" id="image44">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5077,22 +5021,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label234">
+ <object class="GtkLabel" id="label234">
<property name="visible">True</property>
<property name="label">Formatting</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5101,14 +5045,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_edit">
+ <object class="GtkButton" id="button_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5116,181 +5060,175 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label164">
+ <child type="label">
+ <object class="GtkLabel" id="label164">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Parts</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">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox32">
+ <object class="GtkHButtonBox" id="hbuttonbox32">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_reports">
+ </object>
+ <object class="GtkWindow" id="window_reports">
<property name="border_width">12</property>
<property name="title" translatable="yes">Reports</property>
<child>
- <widget class="GtkVBox" id="box_reports">
+ <object class="GtkVBox" id="box_reports">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame18">
+ <object class="GtkFrame" id="frame18">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment50">
+ <object class="GtkAlignment" id="alignment50">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox71">
+ <object class="GtkVBox" id="vbox71">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkAlignment" id="alignment_placeholder_adddel">
+ <object class="GtkAlignment" id="alignment_placeholder_adddel">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label170">
+ <child type="label">
+ <object class="GtkLabel" id="label170">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Reports</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="GtkHButtonBox" id="hbuttonbox33">
+ <object class="GtkHButtonBox" id="hbuttonbox33">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_cancel">
+ <object class="GtkButton" id="button_cancel">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_group_by">
+ </object>
+ <object class="GtkDialog" id="dialog_group_by">
<property name="title" translatable="yes">Group By</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox72">
+ <object class="GtkVBox" id="vbox72">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox73">
+ <object class="GtkVBox" id="vbox73">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame19">
+ <object class="GtkFrame" id="frame19">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment52">
+ <object class="GtkAlignment" id="alignment52">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox74">
+ <object class="GtkVBox" id="vbox74">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox70">
+ <object class="GtkHBox" id="hbox70">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label172">
+ <object class="GtkLabel" id="label172">
<property name="visible">True</property>
<property name="label" translatable="yes">Field:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5298,9 +5236,9 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_group_by">
+ <object class="GtkLabel" id="label_group_by">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5308,24 +5246,24 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_select_group_by">
+ <object class="GtkButton" id="button_select_group_by">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment54">
+ <object class="GtkAlignment" id="alignment54">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox75">
+ <object class="GtkHBox" id="hbox75">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image29">
+ <object class="GtkImage" id="image29">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5333,22 +5271,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label183">
+ <object class="GtkLabel" id="label183">
<property name="visible">True</property>
<property name="label" translatable="yes">Select</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5357,24 +5295,24 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_formatting_group_by">
+ <object class="GtkButton" id="button_formatting_group_by">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment84">
+ <object class="GtkAlignment" id="alignment84">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox108">
+ <object class="GtkHBox" id="hbox108">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image45">
+ <object class="GtkImage" id="image45">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5382,22 +5320,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label235">
+ <object class="GtkLabel" id="label235">
<property name="visible">True</property>
<property name="label" translatable="yes">Formatting</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5405,7 +5343,7 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5413,14 +5351,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox71">
+ <object class="GtkHBox" id="hbox71">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label175">
+ <object class="GtkLabel" id="label175">
<property name="visible">True</property>
<property name="label" translatable="yes">Sort Fields:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5428,9 +5366,9 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_sort_by">
+ <object class="GtkLabel" id="label_sort_by">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5438,13 +5376,13 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_select_sort_by">
+ <object class="GtkButton" id="button_select_sort_by">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5452,7 +5390,7 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5460,14 +5398,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox74">
+ <object class="GtkHBox" id="hbox74">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label181">
+ <object class="GtkLabel" id="label181">
<property name="visible">True</property>
<property name="label" translatable="yes">Secondary Fields:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5475,9 +5413,9 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_secondary_fields">
+ <object class="GtkLabel" id="label_secondary_fields">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5485,13 +5423,13 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_secondary_edit">
+ <object class="GtkButton" id="button_secondary_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5499,21 +5437,21 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox105">
+ <object class="GtkHBox" id="hbox105">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_borderwidth">
+ <object class="GtkLabel" id="label_borderwidth">
<property name="visible">True</property>
<property name="label" translatable="yes">Border Width (ems)</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5521,58 +5459,54 @@
</packing>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="comboboxentry_border_width">
+ <object class="GtkComboBoxEntry" id="comboboxentry_border_width">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label173">
+ <child type="label">
+ <object class="GtkLabel" id="label173">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Group By</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>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox34">
+ <object class="GtkHButtonBox" id="hbuttonbox34">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button28">
+ <object class="GtkButton" id="button28">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5580,67 +5514,70 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button29">
+ <object class="GtkButton" id="button29">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_field_summary">
+ <action-widgets>
+ <action-widget response="-6">button28</action-widget>
+ <action-widget response="-5">button29</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_field_summary">
<property name="title" translatable="yes">Field Summary</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox75">
+ <object class="GtkVBox" id="vbox75">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox76">
+ <object class="GtkVBox" id="vbox76">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame20">
+ <object class="GtkFrame" id="frame20">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment53">
+ <object class="GtkAlignment" id="alignment53">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox77">
+ <object class="GtkVBox" id="vbox77">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox72">
+ <object class="GtkHBox" id="hbox72">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label176">
+ <object class="GtkLabel" id="label176">
<property name="visible">True</property>
<property name="label" translatable="yes">Field:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5648,9 +5585,9 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_field">
+ <object class="GtkLabel" id="label_field">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5658,13 +5595,13 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field">
+ <object class="GtkButton" id="button_field">
<property name="label" translatable="yes">Select</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5672,7 +5609,7 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5680,14 +5617,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox73">
+ <object class="GtkHBox" id="hbox73">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label178">
+ <object class="GtkLabel" id="label178">
<property name="visible">True</property>
<property name="label" translatable="yes">Summary Type:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5695,59 +5632,55 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_summarytype">
+ <object class="GtkComboBox" id="combobox_summarytype">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label180">
+ <child type="label">
+ <object class="GtkLabel" id="label180">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Summary Field</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>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox35">
+ <object class="GtkHButtonBox" id="hbuttonbox35">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_cancel">
+ <object class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5755,53 +5688,56 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok">
+ <object class="GtkButton" id="button_ok">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_groupby_secondary_fields">
+ <action-widgets>
+ <action-widget response="-6">button_cancel</action-widget>
+ <action-widget response="-5">button_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_groupby_secondary_fields">
<property name="visible">True</property>
<property name="title" translatable="yes">Group By - Secondary Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox8">
+ <object class="GtkVBox" id="dialog-vbox8">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox78">
+ <object class="GtkVBox" id="vbox78">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox78">
+ <object class="GtkHBox" id="hbox78">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label187">
+ <object class="GtkLabel" id="label187">
<property name="visible">True</property>
<property name="label" translatable="yes">Table: </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5809,69 +5745,69 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame21">
+ <object class="GtkFrame" id="frame21">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment56">
+ <object class="GtkAlignment" id="alignment56">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow17">
+ <object class="GtkScrolledWindow" id="scrolledwindow17">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_fields">
+ <object class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox77">
+ <object class="GtkHBox" id="hbox77">
<property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox36">
+ <object class="GtkHButtonBox" id="hbuttonbox36">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
- <widget class="GtkButton" id="button_field_up">
+ <object class="GtkButton" id="button_field_up">
<property name="label">gtk-go-up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5879,39 +5815,39 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_down">
+ <object class="GtkButton" id="button_down">
<property name="label">gtk-go-down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox37">
+ <object class="GtkHButtonBox" id="hbuttonbox37">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_field_delete">
+ <object class="GtkButton" id="button_field_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5919,14 +5855,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_add">
+ <object class="GtkButton" id="button_field_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5934,25 +5870,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_formatting">
+ <object class="GtkButton" id="button_field_formatting">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment57">
+ <object class="GtkAlignment" id="alignment57">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image31">
+ <object class="GtkImage" id="image31">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5960,22 +5896,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label185">
+ <object class="GtkLabel" id="label185">
<property name="visible">True</property>
<property name="label" translatable="yes">Formatting</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -5983,70 +5919,66 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_edit">
+ <object class="GtkButton" id="button_field_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label186">
+ <child type="label">
+ <object class="GtkLabel" id="label186">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Fields</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">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area8">
+ <object class="GtkHButtonBox" id="dialog-action_area8">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton6">
+ <object class="GtkButton" id="helpbutton6">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6054,15 +5986,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton7">
+ <object class="GtkButton" id="cancelbutton7">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6070,52 +6001,56 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_groupby_sort_fields">
+ <action-widgets>
+ <action-widget response="-11">helpbutton6</action-widget>
+ <action-widget response="-6">cancelbutton7</action-widget>
+ <action-widget response="-5">button_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_groupby_sort_fields">
<property name="visible">True</property>
<property name="title" translatable="yes">Group By - Sort Fields</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox8">
+ <object class="GtkVBox" id="dialog-vbox8">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox78">
+ <object class="GtkVBox" id="vbox78">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox78">
+ <object class="GtkHBox" id="hbox78">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label187">
+ <object class="GtkLabel" id="label187">
<property name="visible">True</property>
<property name="label" translatable="yes">Table: </property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6123,69 +6058,69 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame21">
+ <object class="GtkFrame" id="frame21">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment56">
+ <object class="GtkAlignment" id="alignment56">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow17">
+ <object class="GtkScrolledWindow" id="scrolledwindow17">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_fields">
+ <object class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox77">
+ <object class="GtkHBox" id="hbox77">
<property name="visible">True</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox36">
+ <object class="GtkHButtonBox" id="hbuttonbox36">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
- <widget class="GtkButton" id="button_field_up">
+ <object class="GtkButton" id="button_field_up">
<property name="label">gtk-go-up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6193,39 +6128,39 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_down">
+ <object class="GtkButton" id="button_field_down">
<property name="label">gtk-go-down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox37">
+ <object class="GtkHButtonBox" id="hbuttonbox37">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_field_delete">
+ <object class="GtkButton" id="button_field_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6233,14 +6168,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_add">
+ <object class="GtkButton" id="button_field_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6248,70 +6183,66 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_field_edit">
+ <object class="GtkButton" id="button_field_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label186">
+ <child type="label">
+ <object class="GtkLabel" id="label186">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Sort Fields</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">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area8">
+ <object class="GtkHButtonBox" id="dialog-action_area8">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton6">
+ <object class="GtkButton" id="helpbutton6">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6319,15 +6250,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton7">
+ <object class="GtkButton" id="cancelbutton7">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6335,57 +6265,61 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_formatting">
+ <action-widgets>
+ <action-widget response="-11">helpbutton6</action-widget>
+ <action-widget response="-6">cancelbutton7</action-widget>
+ <action-widget response="-5">button_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="window_formatting">
<property name="visible">True</property>
<property name="title" translatable="yes">window1</property>
<child>
- <widget class="GtkVBox" id="box_formatting">
+ <object class="GtkVBox" id="box_formatting">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkNotebook" id="notebook_formatting">
+ <object class="GtkNotebook" id="notebook_formatting">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkVBox" id="vbox_numeric_format">
+ <object class="GtkVBox" id="vbox_numeric_format">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_format_thousands">
+ <object class="GtkCheckButton" id="checkbutton_format_thousands">
<property name="label" translatable="yes">Use 1000s separator</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">If this is not selected then a thousands separator will not be used, even if your locale would normally use one. If it is selected then a thousands separator will be used only if your locale normally uses one.</property>
+ <property name="tooltip_text" translatable="yes">If this is not selected then a thousands separator will not be used, even if your locale would normally use one. If it is selected then a thousands separator will be used only if your locale normally uses one.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6393,18 +6327,18 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox48">
+ <object class="GtkHBox" id="hbox48">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_format_use_decimal_places">
+ <object class="GtkCheckButton" id="checkbutton_format_use_decimal_places">
<property name="label" translatable="yes">Decimal Places</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6412,17 +6346,17 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_format_decimal_places">
+ <object class="GtkEntry" id="entry_format_decimal_places">
<property name="visible">True</property>
<property name="can_focus">True</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="fill">False</property>
@@ -6430,14 +6364,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox49">
+ <object class="GtkHBox" id="hbox49">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label108">
+ <object class="GtkLabel" id="label108">
<property name="visible">True</property>
<property name="label" translatable="yes">Currency Symbol</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6445,50 +6379,49 @@
</packing>
</child>
<child>
- <widget class="GtkComboBoxEntry" id="entry_currency_symbol">
+ <object class="GtkComboBoxEntry" id="entry_currency_symbol">
<property name="visible">True</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="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label10">
+ <child type="tab">
+ <object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Numeric Formatting</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_text_format">
+ <object class="GtkVBox" id="vbox_text_format">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_format_text_multiline">
+ <object class="GtkCheckButton" id="checkbutton_format_text_multiline">
<property name="label" translatable="yes">Multi-line</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">If this is selected then the field value will be shown in a multi-line box with a scrollbar.</property>
+ <property name="tooltip_text" translatable="yes">If this is selected then the field value will be shown in a multi-line box with a scrollbar.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6496,14 +6429,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1206z">
+ <object class="GtkHBox" id="hbox1206z">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_format_text_multiline">
+ <object class="GtkLabel" id="label_format_text_multiline">
<property name="visible">True</property>
<property name="label" translatable="yes">Height (lines)</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6511,18 +6444,18 @@
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spinbutton_format_text_multiline_height">
+ <object class="GtkSpinButton" id="spinbutton_format_text_multiline_height">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">3 0 100 1 10 10</property>
+ <property name="adjustment">adjustment2</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6530,19 +6463,19 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_font">
+ <object class="GtkHBox" id="hbox_font">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_font">
+ <object class="GtkCheckButton" id="checkbutton_font">
<property name="label" translatable="yes">Font:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Click this check box to use a non-standard font.</property>
+ <property name="tooltip_text" translatable="yes">Click this check box to use a non-standard font.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6550,17 +6483,17 @@
</packing>
</child>
<child>
- <widget class="GtkFontButton" id="fontbutton">
+ <object class="GtkFontButton" id="fontbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- </widget>
+ </object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6568,19 +6501,19 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_color_foreground">
+ <object class="GtkHBox" id="hbox_color_foreground">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_color_foreground">
+ <object class="GtkCheckButton" id="checkbutton_color_foreground">
<property name="label" translatable="yes">Foreground Color:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Click this check box to use a non-standard foreground color.</property>
+ <property name="tooltip_text" translatable="yes">Click this check box to use a non-standard foreground color.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6588,17 +6521,17 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="colorbutton_foreground">
+ <object class="GtkColorButton" id="colorbutton_foreground">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- </widget>
+ </object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6606,19 +6539,19 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_color_background">
+ <object class="GtkHBox" id="hbox_color_background">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="checkbutton_color_background">
+ <object class="GtkCheckButton" id="checkbutton_color_background">
<property name="label" translatable="yes">Background Color:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Click this check box to use a non-standard background color.</property>
+ <property name="tooltip_text" translatable="yes">Click this check box to use a non-standard background color.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6626,65 +6559,64 @@
</packing>
</child>
<child>
- <widget class="GtkColorButton" id="colorbutton_background">
+ <object class="GtkColorButton" id="colorbutton_background">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- </widget>
+ </object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">4</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label5">
+ <child type="tab">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Text Formatting</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox_choices">
+ <object class="GtkVBox" id="vbox_choices">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox56">
+ <object class="GtkVBox" id="vbox56">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame13">
+ <object class="GtkFrame" id="frame13">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment41">
+ <object class="GtkAlignment" id="alignment41">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_choices_no">
+ <child type="label">
+ <object class="GtkRadioButton" id="radiobutton_choices_no">
<property name="label" translatable="yes">No Choices</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6692,12 +6624,9 @@
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">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>
@@ -6705,25 +6634,25 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame12">
+ <object class="GtkFrame" id="frame12">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment40">
+ <object class="GtkAlignment" id="alignment40">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table8">
+ <object class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkComboBox" id="combobox_choices_related_field_second">
+ <object class="GtkComboBox" id="combobox_choices_related_field_second">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -6734,9 +6663,9 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_choices_related_field">
+ <object class="GtkComboBox" id="combobox_choices_related_field">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -6747,24 +6676,24 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label118">
+ <object class="GtkLabel" id="label118">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Relationship:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label119">
+ <object class="GtkLabel" id="label119">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Field:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -6773,12 +6702,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label120">
+ <object class="GtkLabel" id="label120">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Also show:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -6787,21 +6716,21 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_choices_related_relationship">
+ <object class="GtkComboBox" id="combobox_choices_related_relationship">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_choices_related">
+ <child type="label">
+ <object class="GtkRadioButton" id="radiobutton_choices_related">
<property name="label" translatable="yes">Choices From Related Records</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6809,38 +6738,35 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_choices_no</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame11">
+ <object class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment39">
+ <object class="GtkAlignment" id="alignment39">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="adddel_choices">
+ <object class="GtkVBox" id="adddel_choices">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton_choices_custom">
+ <child type="label">
+ <object class="GtkRadioButton" id="radiobutton_choices_custom">
<property name="label" translatable="yes">Custom Choice List</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -6848,62 +6774,58 @@
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_choices_no</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_choices_restrict">
+ <object class="GtkCheckButton" id="checkbutton_choices_restrict">
<property name="label" translatable="yes">Restrict data to these choices</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</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="position">2</property>
</packing>
</child>
- <child>
- <widget class="GtkLabel" id="label9">
+ <child type="tab">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Choices</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
<property name="tab_fill">False</property>
- <property name="type">tab</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_relationships_overview">
+ </object>
+ <object class="GtkDialog" id="dialog_relationships_overview">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Relationships Overview</property>
@@ -6912,12 +6834,12 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox_main">
+ <object class="GtkVBox" id="vbox_main">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox_placeholder_menubar">
+ <object class="GtkVBox" id="vbox_placeholder_menubar">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6925,16 +6847,16 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame33">
+ <object class="GtkFrame" id="frame33">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment70">
+ <object class="GtkAlignment" id="alignment70">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow_canvas">
+ <object class="GtkScrolledWindow" id="scrolledwindow_canvas">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
@@ -6943,39 +6865,35 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label198">
+ <child type="label">
+ <object class="GtkLabel" id="label198">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Relationships</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">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox38">
+ <object class="GtkHButtonBox" id="hbuttonbox38">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button30">
+ <object class="GtkButton" id="button30">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -6983,50 +6901,53 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button31">
+ <object class="GtkButton" id="button31">
<property name="label">gtk-close</property>
- <property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_change_language">
+ <action-widgets>
+ <action-widget response="-11">button30</action-widget>
+ <action-widget response="-7">button31</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_change_language">
<property name="title" translatable="yes">Test Translation</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox86">
+ <object class="GtkVBox" id="vbox86">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox84">
+ <object class="GtkHBox" id="hbox84">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image34">
+ <object class="GtkImage" id="image34">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7034,11 +6955,11 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox87">
+ <object class="GtkVBox" id="vbox87">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label220">
+ <object class="GtkLabel" id="label220">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -7051,7 +6972,7 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7059,14 +6980,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox85">
+ <object class="GtkHBox" id="hbox85">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label211">
+ <object class="GtkLabel" id="label211">
<property name="visible">True</property>
<property name="label" translatable="yes">Locale:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7074,44 +6995,43 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_locale">
+ <object class="GtkComboBox" id="combobox_locale">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</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">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox40">
+ <object class="GtkHButtonBox" id="hbuttonbox40">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button32">
+ <object class="GtkButton" id="button32">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7119,15 +7039,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button33">
+ <object class="GtkButton" id="button33">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7135,26 +7054,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button36">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button36">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment72">
+ <object class="GtkAlignment" id="alignment72">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox86">
+ <object class="GtkHBox" id="hbox86">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image35">
+ <object class="GtkImage" id="image35">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7162,76 +7080,81 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label212">
+ <object class="GtkLabel" id="label212">
<property name="visible">True</property>
<property name="label">Change Language</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_translations">
+ <action-widgets>
+ <action-widget response="-11">button32</action-widget>
+ <action-widget response="-6">button33</action-widget>
+ <action-widget response="-5">button36</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="window_translations">
<property name="title" translatable="yes">Translations</property>
<property name="default_width">500</property>
<property name="default_height">500</property>
<child>
- <widget class="GtkVBox" id="vbox89">
+ <object class="GtkVBox" id="vbox89">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame35">
+ <object class="GtkFrame" id="frame35">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="label_yalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment73">
+ <object class="GtkAlignment" id="alignment73">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox90">
+ <object class="GtkVBox" id="vbox90">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox89">
+ <object class="GtkHBox" id="hbox89">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label215">
+ <object class="GtkLabel" id="label215">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"><b>Source Language:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7239,39 +7162,39 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_source_locale">
+ <object class="GtkLabel" id="label_source_locale">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">English</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_identify">
+ <object class="GtkButton" id="button_identify">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment74">
+ <object class="GtkAlignment" id="alignment74">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox91">
+ <object class="GtkHBox" id="hbox91">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image36">
+ <object class="GtkImage" id="image36">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7279,48 +7202,48 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label219">
+ <object class="GtkLabel" id="label219">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Identify Source</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox90">
+ <object class="GtkHBox" id="hbox90">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label218">
+ <object class="GtkLabel" id="label218">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"><b>Target Language:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7328,14 +7251,14 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_target_locale">
+ <object class="GtkComboBox" id="combobox_target_locale">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7343,46 +7266,46 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow19">
+ <object class="GtkScrolledWindow" id="scrolledwindow19">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview">
+ <object class="GtkTreeView" id="treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox132">
+ <object class="GtkHBox" id="hbox132">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_import">
+ <object class="GtkButton" id="button_import">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment95">
+ <object class="GtkAlignment" id="alignment95">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox134">
+ <object class="GtkHBox" id="hbox134">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image55">
+ <object class="GtkImage" id="image55">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7390,22 +7313,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label263">
+ <object class="GtkLabel" id="label263">
<property name="visible">True</property>
<property name="label" translatable="yes">Import</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7413,24 +7336,24 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_export">
+ <object class="GtkButton" id="button_export">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment94">
+ <object class="GtkAlignment" id="alignment94">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox133">
+ <object class="GtkHBox" id="hbox133">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image54">
+ <object class="GtkImage" id="image54">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7438,22 +7361,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label262">
+ <object class="GtkLabel" id="label262">
<property name="visible">True</property>
<property name="label" translatable="yes">Export</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7461,54 +7384,51 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_copy_translation">
+ <object class="GtkButton" id="button_copy_translation">
<property name="label" translatable="yes">Copy From Existing Translation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Start a translation for this target locale by copying the strings from another target locale.</property>
+ <property name="tooltip_text" translatable="yes">Start a translation for this target locale by copying the strings from another target locale.</property>
<property name="use_underline">True</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="expand">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label217">
+ <child type="label">
+ <object class="GtkLabel" id="label217">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes"><b>Translations</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="GtkHButtonBox" id="hbuttonbox41">
+ <object class="GtkHButtonBox" id="hbuttonbox41">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_cancel">
+ <object class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -7516,7 +7436,7 @@
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7524,48 +7444,48 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok">
+ <object class="GtkButton" id="button_ok">
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_translation_identify_original">
+ </object>
+ <object class="GtkDialog" id="dialog_translation_identify_original">
<property name="title" translatable="yes">Identify Original</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox91">
+ <object class="GtkVBox" id="vbox91">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox93">
+ <object class="GtkHBox" id="hbox93">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image38">
+ <object class="GtkImage" id="image38">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7573,11 +7493,11 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox92">
+ <object class="GtkVBox" id="vbox92">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label222">
+ <object class="GtkLabel" id="label222">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -7588,7 +7508,7 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7596,12 +7516,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_original">
+ <object class="GtkLabel" id="label_original">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes"><b>English</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7609,12 +7529,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label225">
+ <object class="GtkLabel" id="label225">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">If the text is not actually in this language, please choose the correct language.</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7622,14 +7542,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox94">
+ <object class="GtkHBox" id="hbox94">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label223">
+ <object class="GtkLabel" id="label223">
<property name="visible">True</property>
<property name="label" translatable="yes">Language:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7637,43 +7557,42 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_locale">
+ <object class="GtkComboBox" id="combobox_locale">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox42">
+ <object class="GtkHButtonBox" id="hbuttonbox42">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button37">
+ <object class="GtkButton" id="button37">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7681,15 +7600,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button38">
+ <object class="GtkButton" id="button38">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7697,26 +7615,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button39">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button39">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment75">
+ <object class="GtkAlignment" id="alignment75">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox92">
+ <object class="GtkHBox" id="hbox92">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image37">
+ <object class="GtkImage" id="image37">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7724,57 +7641,62 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label221">
+ <object class="GtkLabel" id="label221">
<property name="visible">True</property>
<property name="label">Identify Original</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_translation_copy">
+ <action-widgets>
+ <action-widget response="-11">button37</action-widget>
+ <action-widget response="-6">button38</action-widget>
+ <action-widget response="-5">button39</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_translation_copy">
<property name="title" translatable="yes">Identify Original</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox91">
+ <object class="GtkVBox" id="vbox91">
<property name="visible">True</property>
<child>
- <widget class="GtkHBox" id="hbox93">
+ <object class="GtkHBox" id="hbox93">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image38">
+ <object class="GtkImage" id="image38">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7782,11 +7704,11 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox92">
+ <object class="GtkVBox" id="vbox92">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label222">
+ <object class="GtkLabel" id="label222">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -7797,7 +7719,7 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7805,14 +7727,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox94">
+ <object class="GtkHBox" id="hbox94">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label223">
+ <object class="GtkLabel" id="label223">
<property name="visible">True</property>
<property name="label" translatable="yes">Language:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7820,44 +7742,43 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_locale">
+ <object class="GtkComboBox" id="combobox_locale">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</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">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox42">
+ <object class="GtkHButtonBox" id="hbuttonbox42">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button37">
+ <object class="GtkButton" id="button37">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7865,15 +7786,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button38">
+ <object class="GtkButton" id="button38">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7881,26 +7801,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button39">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button39">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment75">
+ <object class="GtkAlignment" id="alignment75">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox96">
+ <object class="GtkHBox" id="hbox96">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image39">
+ <object class="GtkImage" id="image39">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7908,63 +7827,68 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label225">
+ <object class="GtkLabel" id="label225">
<property name="visible">True</property>
<property name="label">Copy Translation</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_choose_date">
+ <action-widgets>
+ <action-widget response="-11">button37</action-widget>
+ <action-widget response="-6">button38</action-widget>
+ <action-widget response="-5">button39</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_choose_date">
<property name="visible">True</property>
<property name="title" translatable="yes">Choose Date</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox99">
+ <object class="GtkVBox" id="vbox99">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox100">
+ <object class="GtkVBox" id="vbox100">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox119">
+ <object class="GtkHBox" id="hbox119">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image50">
+ <object class="GtkImage" id="image50">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -7972,10 +7896,10 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox101">
+ <object class="GtkVBox" id="vbox101">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label244">
+ <object class="GtkLabel" id="label244">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -7986,54 +7910,53 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkCalendar" id="calendar">
+ <object class="GtkCalendar" id="calendar">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox44">
+ <object class="GtkHButtonBox" id="hbuttonbox44">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button40">
+ <object class="GtkButton" id="button40">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8041,15 +7964,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_cancel">
+ <object class="GtkButton" id="button_cancel">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8057,59 +7979,63 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok">
+ <object class="GtkButton" id="button_ok">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_add_related_table">
+ <action-widgets>
+ <action-widget response="-11">button40</action-widget>
+ <action-widget response="-6">button_cancel</action-widget>
+ <action-widget response="-5">button_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_add_related_table">
<property name="title" translatable="yes">Add Related Table</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="vbox102">
+ <object class="GtkVBox" id="vbox102">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox103">
+ <object class="GtkVBox" id="vbox103">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame41">
+ <object class="GtkFrame" id="frame41">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment90">
+ <object class="GtkAlignment" id="alignment90">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox104">
+ <object class="GtkVBox" id="vbox104">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label259">
+ <object class="GtkLabel" id="label259">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -8117,7 +8043,7 @@
If a suitable related table already exists then you should instead cancel and just add a relationship.</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8125,14 +8051,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox125">
+ <object class="GtkHBox" id="hbox125">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label253">
+ <object class="GtkLabel" id="label253">
<property name="visible">True</property>
<property name="label" translatable="yes" comments="Translators: FROM as in SQL's FROM">From Field:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8140,32 +8066,32 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_from_key">
+ <object class="GtkComboBox" id="combobox_from_key">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_edit_fields">
+ <object class="GtkButton" id="button_edit_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment91">
+ <object class="GtkAlignment" id="alignment91">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox127">
+ <object class="GtkHBox" id="hbox127">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image52">
+ <object class="GtkImage" id="image52">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8173,22 +8099,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label257">
+ <object class="GtkLabel" id="label257">
<property name="visible">True</property>
<property name="label">_Edit Fields</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8196,7 +8122,7 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8204,14 +8130,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox121">
+ <object class="GtkHBox" id="hbox121">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label247">
+ <object class="GtkLabel" id="label247">
<property name="visible">True</property>
<property name="label" translatable="yes">Name of new related table:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8219,16 +8145,16 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_related_table_name">
+ <object class="GtkEntry" id="entry_related_table_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8236,14 +8162,14 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox124">
+ <object class="GtkHBox" id="hbox124">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label251">
+ <object class="GtkLabel" id="label251">
<property name="visible">True</property>
<property name="label" translatable="yes">Name of new relationship:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8251,60 +8177,56 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_relationship_name">
+ <object class="GtkEntry" id="entry_relationship_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label256">
+ <child type="label">
+ <object class="GtkLabel" id="label256">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Add Related Table</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>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox45">
+ <object class="GtkHButtonBox" id="hbuttonbox45">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button41">
+ <object class="GtkButton" id="button41">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8312,27 +8234,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button_ok">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment92">
+ <object class="GtkAlignment" id="alignment92">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox128">
+ <object class="GtkHBox" id="hbox128">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image53">
+ <object class="GtkImage" id="image53">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8340,59 +8261,63 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label258">
+ <object class="GtkLabel" id="label258">
<property name="visible">True</property>
<property name="label">Create Table</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_script_library">
+ <action-widgets>
+ <action-widget response="-6">button41</action-widget>
+ <action-widget response="-5">button_ok</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_script_library">
<property name="title" translatable="yes">Button Script</property>
<property name="default_width">500</property>
<property name="default_height">600</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox32">
+ <object class="GtkVBox" id="dialog-vbox32">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">These modules will be available to your button scripts and field calculations via the python import keyword.</property>
<property name="wrap">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8400,35 +8325,35 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="label" translatable="yes">Module name:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_name">
+ <object class="GtkComboBox" id="combobox_name">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add">
+ <object class="GtkButton" id="button_add">
<property name="label">gtk-add</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8436,20 +8361,20 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_remove">
+ <object class="GtkButton" id="button_remove">
<property name="label">gtk-remove</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="padding">6</property>
@@ -8457,88 +8382,74 @@
</packing>
</child>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="left_padding">20</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
-
<child>
- <widget class="GtkSourceView" id="textview_script">
+ <object class="GtkSourceView" id="textview_script">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">True</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text" translatable="yes"></property>
- </widget>
+ <property name="buffer">textbuffer1</property>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_check">
+ <object class="GtkButton" id="button_check">
<property name="label" translatable="yes" comments="Translators: This is the verb">Check</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</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="fill">False</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area32">
+ <object class="GtkHButtonBox" id="dialog-action_area32">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton1">
+ <object class="GtkButton" id="helpbutton1">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8546,57 +8457,60 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="okbutton5">
+ <object class="GtkButton" id="okbutton5">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_new_library_script">
+ <action-widgets>
+ <action-widget response="-11">helpbutton1</action-widget>
+ <action-widget response="-5">okbutton5</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_new_library_script">
<property name="visible">True</property>
<property name="title" translatable="yes">Create Group</property>
<property name="default_width">311</property>
<property name="default_height">179</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox33">
+ <object class="GtkVBox" id="dialog-vbox33">
<property name="visible">True</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image1">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon-size">6</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8604,10 +8518,10 @@
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
@@ -8618,35 +8532,35 @@
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</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="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox6">
+ <object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="Group Name1">
+ <object class="GtkLabel" id="Group Name1">
<property name="visible">True</property>
<property name="label" translatable="yes">Script name:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8654,21 +8568,21 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_name">
+ <object class="GtkEntry" id="entry_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8676,19 +8590,18 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area33">
+ <object class="GtkHButtonBox" id="dialog-action_area33">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="helpbutton7">
+ <object class="GtkButton" id="helpbutton7">
<property name="label">gtk-help</property>
- <property name="response_id">-11</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8696,15 +8609,14 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="cancelbutton8">
+ <object class="GtkButton" id="cancelbutton8">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8712,27 +8624,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_ok1">
- <property name="response_id">-5</property>
+ <object class="GtkButton" id="button_ok1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox13">
+ <object class="GtkHBox" id="hbox13">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image6">
+ <object class="GtkImage" id="image6">
<property name="visible">True</property>
<property name="stock">gtk-ok</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8740,61 +8651,66 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Create</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </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="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_data_layout">
+ <action-widgets>
+ <action-widget response="-11">helpbutton7</action-widget>
+ <action-widget response="-6">cancelbutton8</action-widget>
+ <action-widget response="-5">button_ok1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkWindow" id="window_data_layout">
<property name="border_width">12</property>
<property name="title" translatable="yes">Layout</property>
<property name="default_width">400</property>
<property name="default_height">500</property>
<child>
- <widget class="GtkVBox" id="vbox7">
+ <object class="GtkVBox" id="vbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox9">
+ <object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox_table_widgets">
+ <object class="GtkHBox" id="hbox_table_widgets">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label264">
+ <object class="GtkLabel" id="label264">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Table:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8802,17 +8718,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_table_name">
+ <object class="GtkLabel" id="label_table_name">
<property name="visible">True</property>
<property name="label" translatable="yes">table name</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="fill">False</property>
@@ -8820,15 +8736,15 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox_related_table_widgets">
+ <object class="GtkHBox" id="hbox_related_table_widgets">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label263">
+ <object class="GtkLabel" id="label263">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Relationship:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8836,9 +8752,9 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combo_relationship_name">
+ <object class="GtkComboBox" id="combo_relationship_name">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8846,14 +8762,14 @@
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="checkbutton_show_child_relationships">
+ <object class="GtkCheckButton" id="checkbutton_show_child_relationships">
<property name="label" translatable="yes">Show child relationships</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8863,7 +8779,7 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8871,11 +8787,11 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_title">
+ <object class="GtkLabel" id="label_title">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Title:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8884,10 +8800,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_table_title">
+ <object class="GtkEntry" id="entry_table_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8895,7 +8811,7 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8903,61 +8819,61 @@
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment7">
+ <object class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkTable" id="table11">
+ <object class="GtkTable" id="table11">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkTreeView" id="treeview_fields">
+ <object class="GtkTreeView" id="treeview_fields">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
<child>
- <widget class="GtkVBox" id="vbox93">
+ <object class="GtkVBox" id="vbox93">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_add_image">
+ <object class="GtkButton" id="button_add_image">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add an image to the layout, such as a logo. The image will be the same for every record viewed. To show an image field from a record, to show different images for each field, use the field layout item.</property>
+ <property name="tooltip_text" translatable="yes">Add an image to the layout, such as a logo. The image will be the same for every record viewed. To show an image field from a record, to show different images for each field, use the field layout item.</property>
<child>
- <widget class="GtkAlignment" id="alignment86">
+ <object class="GtkAlignment" id="alignment86">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox110">
+ <object class="GtkHBox" id="hbox110">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image47">
+ <object class="GtkImage" id="image47">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8965,22 +8881,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label240">
+ <object class="GtkLabel" id="label240">
<property name="visible">True</property>
<property name="label">Add Image</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -8989,26 +8905,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_field">
+ <object class="GtkButton" id="button_add_field">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add a layout item that shows the data from a field in the record, and allows the user to edit that value.</property>
+ <property name="tooltip_text" translatable="yes">Add a layout item that shows the data from a field in the record, and allows the user to edit that value.</property>
<child>
- <widget class="GtkAlignment" id="alignment77">
+ <object class="GtkAlignment" id="alignment77">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox99">
+ <object class="GtkHBox" id="hbox99">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image41">
+ <object class="GtkImage" id="image41">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9016,22 +8932,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label227">
+ <object class="GtkLabel" id="label227">
<property name="visible">True</property>
<property name="label">Add Field</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9040,26 +8956,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_group">
+ <object class="GtkButton" id="button_add_group">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
+ <property name="tooltip_text" translatable="yes">Add a group which can contain other layout items. Use this to group items together, such as fields.</property>
<child>
- <widget class="GtkAlignment" id="alignment17">
+ <object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image8">
+ <object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9067,22 +8983,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label56">
+ <object class="GtkLabel" id="label56">
<property name="visible">True</property>
<property name="label" translatable="yes">Add _Group</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9091,26 +9007,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_related">
+ <object class="GtkButton" id="button_add_related_calendar">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="tooltip_text" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
<child>
- <widget class="GtkAlignment" id="alignment22">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox29">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image19">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9118,22 +9034,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label74">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add Related Records</property>
+ <property name="label" translatable="yes">Add Related Calendar</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9142,26 +9058,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_related_calendar">
+ <object class="GtkButton" id="button_add_related">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add a related records calendar portal. This is a calendar showing records from a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
+ <property name="tooltip_text" translatable="yes">Add a related records portal. This is a list of records in a related table. Remember to edit this layout item to specify the relationship to use, and the fields to show from the related table.</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <object class="GtkAlignment" id="alignment22">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox29">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image1">
+ <object class="GtkImage" id="image19">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9169,22 +9085,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label74">
<property name="visible">True</property>
- <property name="label" translatable="yes">Add Related Calendar</property>
+ <property name="label" translatable="yes">Add Related Records</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9193,25 +9109,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_notebook">
+ <object class="GtkButton" id="button_add_notebook">
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add a tabbed notebook. Each page of the notebook may contain several other layout items, but only one page will be visible at one time.</property>
+ <property name="tooltip_text" translatable="yes">Add a tabbed notebook. Each page of the notebook may contain several other layout items, but only one page will be visible at one time.</property>
<child>
- <widget class="GtkAlignment" id="alignment85">
+ <object class="GtkAlignment" id="alignment85">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox109">
+ <object class="GtkHBox" id="hbox109">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image46">
+ <object class="GtkImage" id="image46">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9219,22 +9135,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label236">
+ <object class="GtkLabel" id="label236">
<property name="visible">True</property>
<property name="label" translatable="yes">Add Notebook</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9243,26 +9159,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_button">
+ <object class="GtkButton" id="button_add_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add a button. Edit the button to define the script that will be run when the button is clicked.</property>
+ <property name="tooltip_text" translatable="yes">Add a button. Edit the button to define the script that will be run when the button is clicked.</property>
<child>
- <widget class="GtkAlignment" id="alignment78">
+ <object class="GtkAlignment" id="alignment78">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox100">
+ <object class="GtkHBox" id="hbox100">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image42">
+ <object class="GtkImage" id="image42">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9270,22 +9186,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label228">
+ <object class="GtkLabel" id="label228">
<property name="visible">True</property>
<property name="label" translatable="yes">Add Button</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9294,26 +9210,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_add_text">
+ <object class="GtkButton" id="button_add_text">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Add text to a layout, such as an explanation or a warning. The text will be the same for every record viewed.</property>
+ <property name="tooltip_text" translatable="yes">Add text to a layout, such as an explanation or a warning. The text will be the same for every record viewed.</property>
<child>
- <widget class="GtkAlignment" id="alignment81">
+ <object class="GtkAlignment" id="alignment81">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox103">
+ <object class="GtkHBox" id="hbox103">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image43">
+ <object class="GtkImage" id="image43">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9321,22 +9237,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label231">
+ <object class="GtkLabel" id="label231">
<property name="visible">True</property>
<property name="label" translatable="yes">Add Text</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9344,7 +9260,7 @@
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -9352,23 +9268,23 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox9">
+ <object class="GtkHButtonBox" id="hbuttonbox9">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
- <widget class="GtkButton" id="button_up">
+ <object class="GtkButton" id="button_up">
<property name="label">gtk-go-up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9376,40 +9292,40 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_down">
+ <object class="GtkButton" id="button_down">
<property name="label">gtk-go-down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox5">
+ <object class="GtkHButtonBox" id="hbuttonbox5">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_field_delete">
+ <object class="GtkButton" id="button_field_delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Remove the item from the layout. If you remove a field layout item, it will not remove the field from the table itself. It just will not be seen on the layout.</property>
+ <property name="tooltip_text" translatable="yes">Remove the item from the layout. If you remove a field layout item, it will not remove the field from the table itself. It just will not be seen on the layout.</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9417,25 +9333,25 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_formatting">
+ <object class="GtkButton" id="button_formatting">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<child>
- <widget class="GtkAlignment" id="alignment42">
+ <object class="GtkAlignment" id="alignment42">
<property name="visible">True</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
- <widget class="GtkHBox" id="hbox54">
+ <object class="GtkHBox" id="hbox54">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image28">
+ <object class="GtkImage" id="image28">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9443,22 +9359,22 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label121">
+ <object class="GtkLabel" id="label121">
<property name="visible">True</property>
<property name="label" translatable="yes">Formatting</property>
<property name="use_underline">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9466,26 +9382,26 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_edit">
+ <object class="GtkButton" id="button_edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -9496,44 +9412,41 @@
<child>
<placeholder/>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label28">
+ <child type="label">
+ <object class="GtkLabel" id="label28">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Fields</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">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame_related_table_navigation">
+ <object class="GtkFrame" id="frame_related_table_navigation">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment93">
+ <object class="GtkAlignment" id="alignment93">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox105">
+ <object class="GtkVBox" id="vbox105">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label261">
+ <object class="GtkLabel" id="label261">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Clicking the row button takes the user to the table specified by this relationship:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9541,18 +9454,18 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox130">
+ <object class="GtkHBox" id="hbox130">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_navigation_automatic">
+ <object class="GtkRadioButton" id="radiobutton_navigation_automatic">
<property name="label" translatable="yes">Automatic:</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9560,17 +9473,17 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label_navigation_automatic">
+ <object class="GtkLabel" id="label_navigation_automatic">
<property name="visible">True</property>
<property name="label">the relationship name</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="fill">False</property>
@@ -9578,17 +9491,17 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox131">
+ <object class="GtkHBox" id="hbox131">
<property name="visible">True</property>
<child>
- <widget class="GtkRadioButton" id="radiobutton_navigation_specify">
+ <object class="GtkRadioButton" id="radiobutton_navigation_specify">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton_navigation_automatic</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9596,57 +9509,54 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_navigation_specify">
+ <object class="GtkComboBox" id="combobox_navigation_specify">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="frame_navigation">
+ <child type="label">
+ <object class="GtkLabel" id="frame_navigation">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Navigation</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="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame_calendar">
+ <object class="GtkFrame" id="frame_calendar">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <widget class="GtkAlignment" id="alignment25">
+ <object class="GtkAlignment" id="alignment25">
<property name="visible">True</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkHBox" id="hbox44">
+ <object class="GtkHBox" id="hbox44">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label26">
+ <object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="label" translatable="yes">Date Field:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9654,91 +9564,88 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="combobox_date_field">
+ <object class="GtkComboBox" id="combobox_date_field">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">This field will be used to decide which records to show in the calendar.</property>
- </widget>
+ <property name="tooltip_text" translatable="yes">This field will be used to decide which records to show in the calendar.</property>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="frame_navigation1">
+ <child type="label">
+ <object class="GtkLabel" id="frame_navigation1">
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Dates</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="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox7">
+ <object class="GtkHButtonBox" id="hbuttonbox7">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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">end</property>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkWindow" id="window_text_format">
+ </object>
+ <object class="GtkWindow" id="window_text_format">
<property name="title" translatable="yes">Text Format</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
<child>
- <widget class="GtkVBox" id="vbox6">
+ <object class="GtkVBox" id="vbox6">
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="box_formatting_placeholder">
+ <object class="GtkVBox" id="box_formatting_placeholder">
<property name="visible">True</property>
<child>
<placeholder/>
</child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox3">
+ <object class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
<property name="spacing">6</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -9746,23 +9653,23 @@
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</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="position">1</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_layoutitem_properties">
+ </object>
+ <object class="GtkDialog" id="dialog_layoutitem_properties">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Properties</property>
@@ -9770,55 +9677,54 @@
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox29">
+ <object class="GtkVBox" id="dialog-vbox29">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkLabel" id="label6">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes"><b>Label:</b></property>
<property name="use_markup">True</property>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_label">
+ <object class="GtkEntry" id="entry_label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- </widget>
+ </object>
<packing>
<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_area29">
+ <object class="GtkHButtonBox" id="dialog-action_area29">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button3">
+ <object class="GtkButton" id="button3">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9826,55 +9732,58 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button2">
+ <object class="GtkButton" id="button2">
<property name="label">gtk-apply</property>
- <property name="response_id">-10</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- <widget class="GtkDialog" id="dialog_flowtable">
+ <action-widgets>
+ <action-widget response="-6">button3</action-widget>
+ <action-widget response="-10">button2</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_flowtable">
<property name="border_width">5</property>
<property name="title" translatable="yes">Group Properties</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox30">
+ <object class="GtkVBox" id="dialog-vbox30">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkTable" id="table2">
+ <object class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
- <widget class="GtkSpinButton" id="spin_columns">
+ <object class="GtkSpinButton" id="spin_columns">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0 0 10 1 2 10</property>
+ <property name="adjustment">adjustment1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -9884,10 +9793,10 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="label" translatable="yes">Columns:</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -9896,10 +9805,10 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="entry_title">
+ <object class="GtkEntry" id="entry_title">
<property name="visible">True</property>
<property name="can_focus">True</property>
- </widget>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -9907,33 +9816,32 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label" translatable="yes">Title:</property>
- </widget>
+ </object>
<packing>
<property name="x_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area30">
+ <object class="GtkHButtonBox" id="dialog-action_area30">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="button_close">
+ <object class="GtkButton" id="button_close">
<property name="label">gtk-cancel</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -9941,284 +9849,256 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="button5">
+ <object class="GtkButton" id="button5">
<property name="label">gtk-ok</property>
- <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</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">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-
-<widget class="GtkDialog" id="dialog_notebook">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Notebook Tabs</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <property name="focus_on_map">True</property>
- <property name="urgency_hint">False</property>
- <property name="has_separator">True</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox8">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area8">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="helpbutton6">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-11</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="cancelbutton7">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_close">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkFrame" id="frame21">
- <property name="border_width">4</property>
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
-
- <child>
- <widget class="GtkAlignment" id="alignment56">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">12</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox78">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow17">
- <property name="visible">True</property>
- <property name="can_focus">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="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- <property name="hover_selection">False</property>
- <property name="hover_expand">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox77">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox36">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="button_up">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-up</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_down">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-down</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox37">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="button_delete">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-delete</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button_add">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label186">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Notebook Tabs</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
-</glade-interface>
+ <action-widgets>
+ <action-widget response="-6">button_close</action-widget>
+ <action-widget response="-5">button5</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="dialog_notebook">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Notebook Tabs</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox8">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkFrame" id="frame21">
+ <property name="visible">True</property>
+ <property name="border_width">4</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment56">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox78">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow17">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox77">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox36">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="button_up">
+ <property name="label">gtk-go-up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_down">
+ <property name="label">gtk-go-down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHButtonBox" id="hbuttonbox37">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_delete">
+ <property name="label">gtk-delete</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_add">
+ <property name="label">gtk-add</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label186">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Notebook Tabs</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area8">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton6">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancelbutton7">
+ <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="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_close">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">helpbutton6</action-widget>
+ <action-widget response="-6">cancelbutton7</action-widget>
+ <action-widget response="-5">button_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">10</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">2</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="value">3</property>
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkTextBuffer" id="textbuffer1"/>
+ <object class="GtkTextBuffer" id="textbuffer2"/>
+ <object class="GtkTextBuffer" id="textbuffer3"/>
+</interface>
Modified: trunk/glom/layout_item_dialogs/box_formatting.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/box_formatting.cc (original)
+++ trunk/glom/layout_item_dialogs/box_formatting.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-Box_Formatting::Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Box_Formatting::Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::VBox(cobject),
m_vbox_numeric_format(0),
m_vbox_text_format(0),
@@ -50,44 +50,44 @@
m_for_print_layout(false)
{
//Numeric formatting:
- refGlade->get_widget("vbox_numeric_format", m_vbox_numeric_format);
- refGlade->get_widget("checkbutton_format_thousands", m_checkbox_format_use_thousands);
- refGlade->get_widget("checkbutton_format_use_decimal_places", m_checkbox_format_use_decimal_places);
- refGlade->get_widget("entry_format_decimal_places", m_entry_format_decimal_places);
- refGlade->get_widget_derived("entry_currency_symbol", m_entry_currency_symbol);
+ builder->get_widget("vbox_numeric_format", m_vbox_numeric_format);
+ builder->get_widget("checkbutton_format_thousands", m_checkbox_format_use_thousands);
+ builder->get_widget("checkbutton_format_use_decimal_places", m_checkbox_format_use_decimal_places);
+ builder->get_widget("entry_format_decimal_places", m_entry_format_decimal_places);
+ builder->get_widget_derived("entry_currency_symbol", m_entry_currency_symbol);
//Text formatting:
- refGlade->get_widget("vbox_text_format", m_vbox_text_format);
- refGlade->get_widget("checkbutton_format_text_multiline", m_checkbox_format_text_multiline);
- refGlade->get_widget("label_format_text_multiline", m_label_format_text_multiline_height);
- refGlade->get_widget("spinbutton_format_text_multiline_height", m_spinbutton_format_text_multiline_height);
- refGlade->get_widget("hbox_font", m_hbox_font);
- refGlade->get_widget("checkbutton_font", m_checkbox_format_text_font);
- refGlade->get_widget("fontbutton", m_fontbutton);
- refGlade->get_widget("hbox_color_foreground", m_hbox_color_foreground);
- refGlade->get_widget("colorbutton_foreground", m_colorbutton_foreground);
- refGlade->get_widget("checkbutton_color_foreground", m_checkbox_format_text_color_foreground);
- refGlade->get_widget("hbox_color_background", m_hbox_color_background);
- refGlade->get_widget("colorbutton_background", m_colorbutton_background);
- refGlade->get_widget("checkbutton_color_background", m_checkbox_format_text_color_background);
+ builder->get_widget("vbox_text_format", m_vbox_text_format);
+ builder->get_widget("checkbutton_format_text_multiline", m_checkbox_format_text_multiline);
+ builder->get_widget("label_format_text_multiline", m_label_format_text_multiline_height);
+ builder->get_widget("spinbutton_format_text_multiline_height", m_spinbutton_format_text_multiline_height);
+ builder->get_widget("hbox_font", m_hbox_font);
+ builder->get_widget("checkbutton_font", m_checkbox_format_text_font);
+ builder->get_widget("fontbutton", m_fontbutton);
+ builder->get_widget("hbox_color_foreground", m_hbox_color_foreground);
+ builder->get_widget("colorbutton_foreground", m_colorbutton_foreground);
+ builder->get_widget("checkbutton_color_foreground", m_checkbox_format_text_color_foreground);
+ builder->get_widget("hbox_color_background", m_hbox_color_background);
+ builder->get_widget("colorbutton_background", m_colorbutton_background);
+ builder->get_widget("checkbutton_color_background", m_checkbox_format_text_color_background);
//Choices:
- refGlade->get_widget("vbox_choices", m_vbox_choices);
- refGlade->get_widget_derived("adddel_choices", m_adddel_choices_custom);
+ builder->get_widget("vbox_choices", m_vbox_choices);
+ builder->get_widget_derived("adddel_choices", m_adddel_choices_custom);
m_col_index_custom_choices = m_adddel_choices_custom->add_column("Choices");
m_adddel_choices_custom->set_allow_add();
m_adddel_choices_custom->set_allow_delete();
m_adddel_choices_custom->set_auto_add();
- refGlade->get_widget("checkbutton_choices_restrict", m_checkbutton_choices_restricted);
+ builder->get_widget("checkbutton_choices_restrict", m_checkbutton_choices_restricted);
- refGlade->get_widget_derived("combobox_choices_related_relationship", m_combo_choices_relationship);
- refGlade->get_widget_derived("combobox_choices_related_field", m_combo_choices_field);
- refGlade->get_widget_derived("combobox_choices_related_field_second", m_combo_choices_field_second);
- refGlade->get_widget("radiobutton_choices_custom", m_radiobutton_choices_custom);
- refGlade->get_widget("radiobutton_choices_related", m_radiobutton_choices_related);
+ builder->get_widget_derived("combobox_choices_related_relationship", m_combo_choices_relationship);
+ builder->get_widget_derived("combobox_choices_related_field", m_combo_choices_field);
+ builder->get_widget_derived("combobox_choices_related_field_second", m_combo_choices_field_second);
+ builder->get_widget("radiobutton_choices_custom", m_radiobutton_choices_custom);
+ builder->get_widget("radiobutton_choices_related", m_radiobutton_choices_related);
m_combo_choices_relationship->signal_changed().connect(sigc::mem_fun(*this, &Box_Formatting::on_combo_choices_relationship_changed));
Modified: trunk/glom/layout_item_dialogs/box_formatting.h
==============================================================================
--- trunk/glom/layout_item_dialogs/box_formatting.h (original)
+++ trunk/glom/layout_item_dialogs/box_formatting.h Tue Mar 17 14:42:09 2009
@@ -37,7 +37,7 @@
public Base_DB
{
public:
- Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_Formatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_Formatting();
/**
Modified: trunk/glom/layout_item_dialogs/combo_summarytype.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/combo_summarytype.cc (original)
+++ trunk/glom/layout_item_dialogs/combo_summarytype.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-Combo_SummaryType::Combo_SummaryType(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+Combo_SummaryType::Combo_SummaryType(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBox(cobject)
{
m_model = Gtk::ListStore::create(m_model_columns);
Modified: trunk/glom/layout_item_dialogs/combo_summarytype.h
==============================================================================
--- trunk/glom/layout_item_dialogs/combo_summarytype.h (original)
+++ trunk/glom/layout_item_dialogs/combo_summarytype.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include <libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.h>
#include <gtkmm/combobox.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/liststore.h>
@@ -33,7 +33,7 @@
class Combo_SummaryType : public Gtk::ComboBox
{
public:
- Combo_SummaryType(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Combo_SummaryType(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Combo_SummaryType();
virtual void set_summary_type(LayoutItem_FieldSummary::summaryType summary_type);
Modified: trunk/glom/layout_item_dialogs/comboentry_borderwidth.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/comboentry_borderwidth.cc (original)
+++ trunk/glom/layout_item_dialogs/comboentry_borderwidth.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-ComboEntry_BorderWidth::ComboEntry_BorderWidth(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboEntry_BorderWidth::ComboEntry_BorderWidth(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBoxEntry(cobject)
{
m_model = Gtk::ListStore::create(m_model_columns);
Modified: trunk/glom/layout_item_dialogs/comboentry_borderwidth.h
==============================================================================
--- trunk/glom/layout_item_dialogs/comboentry_borderwidth.h (original)
+++ trunk/glom/layout_item_dialogs/comboentry_borderwidth.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DESIGN_COMBOENTRY_BORDERWIDTH_HH
#include <gtkmm/comboboxentry.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/liststore.h>
@@ -32,7 +32,7 @@
class ComboEntry_BorderWidth : public Gtk::ComboBoxEntry
{
public:
- ComboEntry_BorderWidth(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ ComboEntry_BorderWidth(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~ComboEntry_BorderWidth();
private:
Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.cc Tue Mar 17 14:42:09 2009
@@ -31,12 +31,12 @@
namespace Glom
{
-Dialog_ButtonScript::Dialog_ButtonScript(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ButtonScript::Dialog_ButtonScript(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject)
{
- refGlade->get_widget("textview_calculation", m_text_view);
- refGlade->get_widget("button_test", m_button_test);
- refGlade->get_widget("entry_title", m_entry_title);
+ builder->get_widget("textview_calculation", m_text_view);
+ builder->get_widget("button_test", m_button_test);
+ builder->get_widget("entry_title", m_entry_title);
m_button_test->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_ButtonScript::on_button_test) );
Modified: trunk/glom/layout_item_dialogs/dialog_buttonscript.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_buttonscript.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_buttonscript.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#ifndef GLOM_ENABLE_CLIENT_ONLY
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/layout/layoutitem_button.h>
#include "../base_db.h"
@@ -39,7 +39,7 @@
{
public:
- Dialog_ButtonScript(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ButtonScript(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ButtonScript();
void set_script(const sharedptr<const LayoutItem_Button>& script, const Glib::ustring& table_name);
Modified: trunk/glom/layout_item_dialogs/dialog_field_layout.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_layout.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_layout.cc Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
namespace Glom
{
-Dialog_FieldLayout::Dialog_FieldLayout(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_FieldLayout::Dialog_FieldLayout(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_field_name(0),
m_checkbutton_editable(0),
@@ -38,26 +38,26 @@
m_radiobutton_custom_formatting(0),
m_box_formatting(0)
{
- refGlade->get_widget("label_field_name", m_label_field_name);
- refGlade->get_widget("checkbutton_editable", m_checkbutton_editable);
+ builder->get_widget("label_field_name", m_label_field_name);
+ builder->get_widget("checkbutton_editable", m_checkbutton_editable);
- refGlade->get_widget("radiobutton_use_title_default", m_radiobutton_title_default);
- refGlade->get_widget("label_title_default", m_label_title_default);
- refGlade->get_widget("radiobutton_use_title_custom", m_radiobutton_title_custom);
- refGlade->get_widget("entry_title_custom", m_entry_title_custom);
+ builder->get_widget("radiobutton_use_title_default", m_radiobutton_title_default);
+ builder->get_widget("label_title_default", m_label_title_default);
+ builder->get_widget("radiobutton_use_title_custom", m_radiobutton_title_custom);
+ builder->get_widget("entry_title_custom", m_entry_title_custom);
//Get the place to put the Formatting stuff:
- refGlade->get_widget("radiobutton_use_custom", m_radiobutton_custom_formatting);
- refGlade->get_widget("box_formatting_placeholder", m_box_formatting_placeholder);
+ builder->get_widget("radiobutton_use_custom", m_radiobutton_custom_formatting);
+ builder->get_widget("box_formatting_placeholder", m_box_formatting_placeholder);
//Get the formatting stuff:
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXmlFormatting = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "box_formatting");
+ Glib::RefPtr<Gtk::Builder> refXmlFormatting = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "box_formatting");
refXmlFormatting->get_widget_derived("box_formatting", m_box_formatting);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/layout_item_dialogs/dialog_field_layout.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_layout.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_layout.h Tue Mar 17 14:42:09 2009
@@ -37,7 +37,7 @@
public View_Composite_Glom //Give it access to the document.
{
public:
- Dialog_FieldLayout(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_FieldLayout(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_FieldLayout();
/**
Modified: trunk/glom/layout_item_dialogs/dialog_field_summary.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_summary.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_summary.cc Tue Mar 17 14:42:09 2009
@@ -25,16 +25,16 @@
namespace Glom
{
-Dialog_FieldSummary::Dialog_FieldSummary(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_FieldSummary::Dialog_FieldSummary(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_field(0),
m_combo_summarytype(0),
m_button_field(0)
{
- refGlade->get_widget("label_field", m_label_field);
- refGlade->get_widget_derived("combobox_summarytype", m_combo_summarytype);
+ builder->get_widget("label_field", m_label_field);
+ builder->get_widget_derived("combobox_summarytype", m_combo_summarytype);
- refGlade->get_widget("button_field", m_button_field);
+ builder->get_widget("button_field", m_button_field);
//Connect signals:
m_button_field->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_FieldSummary::on_button_field));
Modified: trunk/glom/layout_item_dialogs/dialog_field_summary.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_field_summary.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_field_summary.h Tue Mar 17 14:42:09 2009
@@ -37,7 +37,7 @@
public Base_DB
{
public:
- Dialog_FieldSummary(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_FieldSummary(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_FieldSummary();
/**
Modified: trunk/glom/layout_item_dialogs/dialog_group_by.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.cc Tue Mar 17 14:42:09 2009
@@ -27,7 +27,7 @@
namespace Glom
{
-Dialog_GroupBy::Dialog_GroupBy(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_GroupBy::Dialog_GroupBy(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_group_by(0),
m_label_sort_by(0),
@@ -40,16 +40,16 @@
m_dialog_choose_secondary_fields(0),
m_dialog_choose_sort_fields(0)
{
- refGlade->get_widget("label_group_by", m_label_group_by);
- refGlade->get_widget("label_sort_by", m_label_sort_by);
- refGlade->get_widget("label_secondary_fields", m_label_secondary_fields);
-
- refGlade->get_widget("button_select_group_by", m_button_field_group_by);
- refGlade->get_widget("button_formatting_group_by", m_button_formatting_group_by);
- refGlade->get_widget("button_select_sort_by", m_button_field_sort_by);
- refGlade->get_widget("button_secondary_edit", m_button_secondary_fields);
+ builder->get_widget("label_group_by", m_label_group_by);
+ builder->get_widget("label_sort_by", m_label_sort_by);
+ builder->get_widget("label_secondary_fields", m_label_secondary_fields);
+
+ builder->get_widget("button_select_group_by", m_button_field_group_by);
+ builder->get_widget("button_formatting_group_by", m_button_formatting_group_by);
+ builder->get_widget("button_select_sort_by", m_button_field_sort_by);
+ builder->get_widget("button_secondary_edit", m_button_secondary_fields);
- refGlade->get_widget_derived("comboboxentry_border_width", m_comboboxentry_border_width);
+ builder->get_widget_derived("comboboxentry_border_width", m_comboboxentry_border_width);
//Connect signals:
m_button_field_group_by->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_GroupBy::on_button_field_group_by));
@@ -129,7 +129,7 @@
{
if(!m_dialog_choose_sort_fields)
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_groupby_sort_fields");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_groupby_sort_fields");
if(refXml)
{
refXml->get_widget_derived("dialog_groupby_sort_fields", m_dialog_choose_sort_fields);
@@ -159,7 +159,7 @@
{
if(!m_dialog_choose_secondary_fields)
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_groupby_secondary_fields");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_groupby_secondary_fields");
if(refXml)
{
refXml->get_widget_derived("dialog_groupby_secondary_fields", m_dialog_choose_secondary_fields);
Modified: trunk/glom/layout_item_dialogs/dialog_group_by.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_group_by.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_group_by.h Tue Mar 17 14:42:09 2009
@@ -39,7 +39,7 @@
public Base_DB
{
public:
- Dialog_GroupBy(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_GroupBy(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_GroupBy();
/**
Modified: trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc Tue Mar 17 14:42:09 2009
@@ -27,8 +27,8 @@
namespace Glom
{
-Dialog_GroupBy_SecondaryFields::Dialog_GroupBy_SecondaryFields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout(cobject, refGlade, false /* means no table title */),
+Dialog_GroupBy_SecondaryFields::Dialog_GroupBy_SecondaryFields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout(cobject, builder, false /* means no table title */),
m_treeview_fields(0),
m_button_field_up(0),
m_button_field_down(0),
@@ -38,9 +38,9 @@
m_button_field_formatting(0),
m_label_table_name(0)
{
- refGlade->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("treeview_fields", m_treeview_fields);
+ builder->get_widget("treeview_fields", m_treeview_fields);
if(m_treeview_fields)
{
m_model_fields = Gtk::ListStore::create(m_ColumnsFields);
@@ -70,22 +70,22 @@
}
- refGlade->get_widget("button_field_up", m_button_field_up);
+ builder->get_widget("button_field_up", m_button_field_up);
m_button_field_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SecondaryFields::on_button_field_up) );
- refGlade->get_widget("button_field_down", m_button_field_down);
+ builder->get_widget("button_field_down", m_button_field_down);
m_button_field_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SecondaryFields::on_button_field_down) );
- refGlade->get_widget("button_field_delete", m_button_field_delete);
+ builder->get_widget("button_field_delete", m_button_field_delete);
m_button_field_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SecondaryFields::on_button_delete) );
- refGlade->get_widget("button_field_add", m_button_field_add);
+ builder->get_widget("button_field_add", m_button_field_add);
m_button_field_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SecondaryFields::on_button_add_field) );
- refGlade->get_widget("button_field_edit", m_button_field_edit);
+ builder->get_widget("button_field_edit", m_button_field_edit);
m_button_field_edit->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SecondaryFields::on_button_edit_field) );
- refGlade->get_widget("button_field_formatting", m_button_field_formatting);
+ builder->get_widget("button_field_formatting", m_button_field_formatting);
m_button_field_formatting->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SecondaryFields::on_button_field_formatting) );
show_all_children();
Modified: trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_groupby_secondaryfields.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include "../base_db.h"
#include "../mode_data/dialog_layout.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -32,7 +32,7 @@
: public Dialog_Layout //It has some useful stuff
{
public:
- Dialog_GroupBy_SecondaryFields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_GroupBy_SecondaryFields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_GroupBy_SecondaryFields();
Modified: trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.cc Tue Mar 17 14:42:09 2009
@@ -27,8 +27,8 @@
namespace Glom
{
-Dialog_GroupBy_SortFields::Dialog_GroupBy_SortFields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout(cobject, refGlade, false /* means no table title */),
+Dialog_GroupBy_SortFields::Dialog_GroupBy_SortFields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout(cobject, builder, false /* means no table title */),
m_treeview_fields(0),
m_button_field_up(0),
m_button_field_down(0),
@@ -37,9 +37,9 @@
m_button_field_edit(0),
m_label_table_name(0)
{
- refGlade->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("treeview_fields", m_treeview_fields);
+ builder->get_widget("treeview_fields", m_treeview_fields);
if(m_treeview_fields)
{
m_model_fields = Gtk::ListStore::create(m_ColumnsFields);
@@ -70,19 +70,19 @@
}
- refGlade->get_widget("button_field_up", m_button_field_up);
+ builder->get_widget("button_field_up", m_button_field_up);
m_button_field_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SortFields::on_button_field_up) );
- refGlade->get_widget("button_field_down", m_button_field_down);
+ builder->get_widget("button_field_down", m_button_field_down);
m_button_field_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SortFields::on_button_field_down) );
- refGlade->get_widget("button_field_delete", m_button_field_delete);
+ builder->get_widget("button_field_delete", m_button_field_delete);
m_button_field_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SortFields::on_button_delete) );
- refGlade->get_widget("button_field_add", m_button_field_add);
+ builder->get_widget("button_field_add", m_button_field_add);
m_button_field_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SortFields::on_button_add_field) );
- refGlade->get_widget("button_field_edit", m_button_field_edit);
+ builder->get_widget("button_field_edit", m_button_field_edit);
m_button_field_edit->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupBy_SortFields::on_button_edit_field) );
show_all_children();
Modified: trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_groupby_sortfields.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include "../base_db.h"
#include "../mode_data/dialog_layout.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -32,7 +32,7 @@
: public Dialog_Layout //It has some useful stuff
{
public:
- Dialog_GroupBy_SortFields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_GroupBy_SortFields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_GroupBy_SortFields();
Modified: trunk/glom/layout_item_dialogs/dialog_imageobject.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_imageobject.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_imageobject.cc Tue Mar 17 14:42:09 2009
@@ -29,17 +29,17 @@
namespace Glom
{
-Dialog_ImageObject::Dialog_ImageObject(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ImageObject::Dialog_ImageObject(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_box_title(0),
m_entry_title(0),
m_image(0)
{
- refGlade->get_widget("hbox_title", m_box_title);
- refGlade->get_widget("entry_title", m_entry_title);
- refGlade->get_widget_derived("imageglom", m_image);
+ builder->get_widget("hbox_title", m_box_title);
+ builder->get_widget("entry_title", m_entry_title);
+ builder->get_widget_derived("imageglom", m_image);
- refGlade->get_widget("button_choose_image", m_button_choose_image);
+ builder->get_widget("button_choose_image", m_button_choose_image);
m_button_choose_image->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_ImageObject::on_button_choose));
//on_foreach_connect(*this);
Modified: trunk/glom/layout_item_dialogs/dialog_imageobject.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_imageobject.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_imageobject.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define DIALOG_IMAGEOBJECT_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/layout/layoutitem_image.h>
#include "../base_db.h"
#include "../utility_widgets/imageglom.h"
@@ -36,7 +36,7 @@
{
public:
- Dialog_ImageObject(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ImageObject(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ImageObject();
void set_imageobject(const sharedptr<const LayoutItem_Image>& imageobject, const Glib::ustring& table_name, bool show_title = true);
Modified: trunk/glom/layout_item_dialogs/dialog_notebook.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_notebook.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_notebook.cc Tue Mar 17 14:42:09 2009
@@ -27,15 +27,15 @@
namespace Glom
{
-Dialog_Notebook::Dialog_Notebook(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout(cobject, refGlade, false /* means no table title */),
+Dialog_Notebook::Dialog_Notebook(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout(cobject, builder, false /* means no table title */),
m_treeview(0),
m_button_up(0),
m_button_down(0),
m_button_add(0),
m_button_delete(0)
{
- refGlade->get_widget("treeview", m_treeview);
+ builder->get_widget("treeview", m_treeview);
if(m_treeview)
{
m_model = Gtk::ListStore::create(m_ColumnsTabs);
@@ -61,16 +61,16 @@
}
- refGlade->get_widget("button_up", m_button_up);
+ builder->get_widget("button_up", m_button_up);
m_button_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Notebook::on_button_up) );
- refGlade->get_widget("button_down", m_button_down);
+ builder->get_widget("button_down", m_button_down);
m_button_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Notebook::on_button_down) );
- refGlade->get_widget("button_delete", m_button_delete);
+ builder->get_widget("button_delete", m_button_delete);
m_button_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Notebook::on_button_delete) );
- refGlade->get_widget("button_add", m_button_add);
+ builder->get_widget("button_add", m_button_add);
m_button_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Notebook::on_button_add) );
show_all_children();
Modified: trunk/glom/layout_item_dialogs/dialog_notebook.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_notebook.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_notebook.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include "../base_db.h"
#include "../mode_data/dialog_layout.h"
#include <libglom/data_structure/layout/layoutitem_notebook.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -33,7 +33,7 @@
: public Dialog_Layout //It has some useful stuff
{
public:
- Dialog_Notebook(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Notebook(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Notebook();
Modified: trunk/glom/layout_item_dialogs/dialog_textobject.cc
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_textobject.cc (original)
+++ trunk/glom/layout_item_dialogs/dialog_textobject.cc Tue Mar 17 14:42:09 2009
@@ -29,15 +29,15 @@
namespace Glom
{
-Dialog_TextObject::Dialog_TextObject(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_TextObject::Dialog_TextObject(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_box_title(0),
m_entry_title(0),
m_text_view(0)
{
- refGlade->get_widget("hbox_title", m_box_title);
- refGlade->get_widget("entry_title", m_entry_title);
- refGlade->get_widget("textview_text", m_text_view);
+ builder->get_widget("hbox_title", m_box_title);
+ builder->get_widget("entry_title", m_entry_title);
+ builder->get_widget("textview_text", m_text_view);
//on_foreach_connect(*this);
Modified: trunk/glom/layout_item_dialogs/dialog_textobject.h
==============================================================================
--- trunk/glom/layout_item_dialogs/dialog_textobject.h (original)
+++ trunk/glom/layout_item_dialogs/dialog_textobject.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define DIALOG_TEXTOBJECT_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/layout/layoutitem_text.h>
#include "../base_db.h"
@@ -35,7 +35,7 @@
{
public:
- Dialog_TextObject(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_TextObject(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_TextObject();
void set_textobject(const sharedptr<const LayoutItem_Text>& textobject, const Glib::ustring& table_name, bool show_title = true);
Modified: trunk/glom/libglom/data_structure/glomconversions.cc
==============================================================================
--- trunk/glom/libglom/data_structure/glomconversions.cc (original)
+++ trunk/glom/libglom/data_structure/glomconversions.cc Tue Mar 17 14:42:09 2009
@@ -1021,7 +1021,6 @@
try
{
refPixbufLoader = Gdk::PixbufLoader::create(GLOM_IMAGE_FORMAT);
- g_warning("debug a1");
}
catch(const Gdk::PixbufError& ex)
{
Modified: trunk/glom/libglom/dialog_progress_creating.cc
==============================================================================
--- trunk/glom/libglom/dialog_progress_creating.cc (original)
+++ trunk/glom/libglom/dialog_progress_creating.cc Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
namespace Glom
{
-Dialog_ProgressCreating::Dialog_ProgressCreating(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ProgressCreating::Dialog_ProgressCreating(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
m_progress(0),
m_label_message(0),
@@ -34,8 +34,8 @@
m_running(false)
{
//set_modal();
- refGlade->get_widget("progressbar", m_progress);
- refGlade->get_widget("label_message", m_label_message);
+ builder->get_widget("progressbar", m_progress);
+ builder->get_widget("label_message", m_label_message);
//m_progress->show();
}
Modified: trunk/glom/libglom/dialog_progress_creating.h
==============================================================================
--- trunk/glom/libglom/dialog_progress_creating.h (original)
+++ trunk/glom/libglom/dialog_progress_creating.h Tue Mar 17 14:42:09 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_DIALOG_PROGRESS_CREATING_H
#define GLOM_DIALOG_PROGRESS_CREATING_H
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/window.h>
#include <gtkmm/label.h>
#include <gtkmm/progressbar.h>
@@ -36,7 +36,7 @@
: public Gtk::Window
{
public:
- Dialog_ProgressCreating(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ProgressCreating(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ProgressCreating();
void set_message(const Glib::ustring& title, const Glib::ustring& secondary_text);
Modified: trunk/glom/libglom/glade_utils.h
==============================================================================
--- trunk/glom/libglom/glade_utils.h (original)
+++ trunk/glom/libglom/glade_utils.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,8 @@
#define GLOM_GLADE_UTILS_H
#include <iostream> // For std::cerr
-#include <libglademm.h>
+#include <gtkmm/builder.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -34,7 +35,7 @@
{
#ifdef G_OS_WIN32
gchar* directory = g_win32_get_package_installation_directory_of_module(NULL);
- std::string result = Glib::build_filename(directory, Glib::build_filename("share/glom/glade", filename));
+ const std::string result = Glib::build_filename(directory, Glib::build_filename("share/glom/glade", filename));
g_free(directory);
return result;
#else
@@ -45,21 +46,22 @@
template<class T_Widget>
void get_glade_widget_derived_with_warning(const Glib::ustring& id, T_Widget*& widget)
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), id);
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), id);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Glib::Error& ex)
{
std::cerr << ex.what() << std::endl;
}
#else
- error.reset(NULL);
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), id, "", error);
- if(error.get()) std::cerr << error->what() << std::endl;
+ error.reset(0);
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), id, "", error);
+ if(error.get())
+ std::cerr << error->what() << std::endl;
#endif
if(refXml)
@@ -71,20 +73,20 @@
template<class T_Widget>
void get_glade_developer_widget_derived_with_warning(const Glib::ustring& id, T_Widget*& widget)
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), id);
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), id);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
#else
error.reset(NULL);
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), id, "", error);
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), id, "", error);
if(error.get()) std::cerr << error->what() << std::endl;
#endif
@@ -97,21 +99,22 @@
template<class T_Widget>
void get_glade_widget_with_warning(const Glib::ustring& id, T_Widget*& widget)
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), id);
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), id);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Glib::Error& ex)
{
std::cerr << ex.what() << std::endl;
}
#else
- error.reset(NULL);
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), id, "", error);
- if(error.get()) std::cerr << error->what() << std::endl;
+ error.reset(0);
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), id, "", error);
+ if(error.get())
+ std::cerr << error->what() << std::endl;
#endif
if(refXml)
Modified: trunk/glom/libglom/spawn_with_feedback.cc
==============================================================================
--- trunk/glom/libglom/spawn_with_feedback.cc (original)
+++ trunk/glom/libglom/spawn_with_feedback.cc Tue Mar 17 14:42:09 2009
@@ -350,11 +350,12 @@
std::cerr << "debug: Glom: get_and_show_pulse_dialog(): parent_window is NULL" << std::endl;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "window_progress");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "window_progress");
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "window_progress", "", error);
- if(error.get()) return NULL;
+ std::auto_ptr<Glib::Error> error;
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "window_progress", "", error);
+ if(error.get())
+ return 0;
#endif
if(refXml)
Modified: trunk/glom/main.cc
==============================================================================
--- trunk/glom/main.cc (original)
+++ trunk/glom/main.cc Tue Mar 17 14:42:09 2009
@@ -289,10 +289,10 @@
#ifdef GLIBMM_EXCEPTIONS_ENABLED
// Main app
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Glom::Utils::get_glade_file_path("glom.glade"), "window_main");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Glom::Utils::get_glade_file_path("glom.glade"), "window_main");
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Glom::Utils::get_glade_file_path("glom.glade"), "window_main", "", error);
+ std::auto_ptr<Glib::Error> error;
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Glom::Utils::get_glade_file_path("glom.glade"), "window_main", "", error);
if(error.get())
{
std::cerr << "Glom: exception: \n " << error->what() << std::endl;
Modified: trunk/glom/mode_data/box_data_calendar_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_calendar_related.cc (original)
+++ trunk/glom/mode_data/box_data_calendar_related.cc Tue Mar 17 14:42:09 2009
@@ -343,7 +343,7 @@
#ifndef GLOM_ENABLE_CLIENT_ONLY
Dialog_Layout* Box_Data_Calendar_Related::create_layout_dialog() const
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(GLOM_GLADEDIR "glom_developer.glade", "window_data_layout");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(GLOM_GLADEDIR "glom_developer.glade", "window_data_layout");
if(refXml)
{
Dialog_Layout_Calendar_Related* dialog = 0;
Modified: trunk/glom/mode_data/box_data_details.cc
==============================================================================
--- trunk/glom/mode_data/box_data_details.cc (original)
+++ trunk/glom/mode_data/box_data_details.cc Tue Mar 17 14:42:09 2009
@@ -999,7 +999,7 @@
#ifndef GLOM_ENABLE_CLIENT_ONLY
Dialog_Layout* Box_Data_Details::create_layout_dialog() const
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout"); //TODO: Use a generic layout dialog?
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout"); //TODO: Use a generic layout dialog?
if(refXml)
{
Dialog_Layout_Details* dialog = 0;
Modified: trunk/glom/mode_data/box_data_list.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list.cc (original)
+++ trunk/glom/mode_data/box_data_list.cc Tue Mar 17 14:42:09 2009
@@ -610,7 +610,7 @@
Dialog_Layout* Box_Data_List::create_layout_dialog() const
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout"); //TODO: Use a generic layout dialog?
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout"); //TODO: Use a generic layout dialog?
if(refXml)
{
Dialog_Layout_List* dialog = 0;
Modified: trunk/glom/mode_data/box_data_list_related.cc
==============================================================================
--- trunk/glom/mode_data/box_data_list_related.cc (original)
+++ trunk/glom/mode_data/box_data_list_related.cc Tue Mar 17 14:42:09 2009
@@ -332,7 +332,7 @@
#ifndef GLOM_ENABLE_CLIENT_ONLY
Dialog_Layout* Box_Data_List_Related::create_layout_dialog() const
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout");
if(refXml)
{
Dialog_Layout_List_Related* dialog = 0;
Modified: trunk/glom/mode_data/dialog_choose_field.cc
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.cc (original)
+++ trunk/glom/mode_data/dialog_choose_field.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-Dialog_ChooseField::Dialog_ChooseField(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ChooseField::Dialog_ChooseField(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_combo_relationship(0),
m_button_select(0),
@@ -33,15 +33,15 @@
m_treeview(0),
m_document(0)
{
- refGlade->get_widget("checkbutton_show_related_relationships", m_checkbutton_show_related_relationships);
+ builder->get_widget("checkbutton_show_related_relationships", m_checkbutton_show_related_relationships);
m_checkbutton_show_related_relationships->set_active(false); //Start with the simpler list, to avoid confusing people.
m_checkbutton_show_related_relationships->signal_toggled().connect(sigc::mem_fun(*this, &Dialog_ChooseField::on_checkbutton_related_relationships_toggled));
- refGlade->get_widget("button_select", m_button_select);
- refGlade->get_widget_derived("combobox_relationship", m_combo_relationship);
+ builder->get_widget("button_select", m_button_select);
+ builder->get_widget_derived("combobox_relationship", m_combo_relationship);
m_combo_relationship->signal_changed().connect(sigc::mem_fun(*this, &Dialog_ChooseField::on_combo_relationship_changed));
- refGlade->get_widget("treeview_fields", m_treeview);
+ builder->get_widget("treeview_fields", m_treeview);
if(m_treeview)
{
Modified: trunk/glom/mode_data/dialog_choose_field.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.h (original)
+++ trunk/glom/mode_data/dialog_choose_field.h Tue Mar 17 14:42:09 2009
@@ -35,7 +35,7 @@
class Dialog_ChooseField : public Gtk::Dialog
{
public:
- Dialog_ChooseField(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ChooseField(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ChooseField();
/**
Modified: trunk/glom/mode_data/dialog_choose_relationship.cc
==============================================================================
--- trunk/glom/mode_data/dialog_choose_relationship.cc (original)
+++ trunk/glom/mode_data/dialog_choose_relationship.cc Tue Mar 17 14:42:09 2009
@@ -33,16 +33,16 @@
{
}
-Dialog_ChooseRelationship::Dialog_ChooseRelationship(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ChooseRelationship::Dialog_ChooseRelationship(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_table_name(0),
m_button_select(0),
m_treeview(0),
m_document(0)
{
- refGlade->get_widget("button_select", m_button_select);
- refGlade->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("treeview_relationships", m_treeview);
+ builder->get_widget("button_select", m_button_select);
+ builder->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("treeview_relationships", m_treeview);
if(m_treeview)
{
Modified: trunk/glom/mode_data/dialog_choose_relationship.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_relationship.h (original)
+++ trunk/glom/mode_data/dialog_choose_relationship.h Tue Mar 17 14:42:09 2009
@@ -33,7 +33,7 @@
{
public:
Dialog_ChooseRelationship();
- Dialog_ChooseRelationship(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ChooseRelationship(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ChooseRelationship();
/**
Modified: trunk/glom/mode_data/dialog_layout.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout.cc (original)
+++ trunk/glom/mode_data/dialog_layout.cc Tue Mar 17 14:42:09 2009
@@ -25,22 +25,22 @@
namespace Glom
{
-Dialog_Layout::Dialog_Layout(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade, bool with_table_title)
+Dialog_Layout::Dialog_Layout(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder, bool with_table_title)
: Gtk::Dialog(cobject),
m_entry_table_title(0),
m_label_table_title(0),
m_modified(false)
{
Gtk::Button* button = 0;
- refGlade->get_widget("button_close", button);
+ builder->get_widget("button_close", button);
button->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout::on_button_close) );
if(with_table_title)
{
- refGlade->get_widget("entry_table_title", m_entry_table_title);
+ builder->get_widget("entry_table_title", m_entry_table_title);
m_entry_table_title->signal_changed().connect( sigc::mem_fun(*this, &Dialog_Layout::on_entry_table_title_changed) );
- refGlade->get_widget("label_title", m_label_table_title);
+ builder->get_widget("label_title", m_label_table_title);
}
show_all_children();
Modified: trunk/glom/mode_data/dialog_layout.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout.h (original)
+++ trunk/glom/mode_data/dialog_layout.h Tue Mar 17 14:42:09 2009
@@ -34,7 +34,7 @@
public Base_DB //Give it access to the document, and to the database utilities
{
public:
- Dialog_Layout(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade, bool with_table_title = true);
+ Dialog_Layout(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder, bool with_table_title = true);
virtual ~Dialog_Layout();
/**
Modified: trunk/glom/mode_data/dialog_layout_calendar_related.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_calendar_related.cc (original)
+++ trunk/glom/mode_data/dialog_layout_calendar_related.cc Tue Mar 17 14:42:09 2009
@@ -30,8 +30,8 @@
namespace Glom
{
-Dialog_Layout_Calendar_Related::Dialog_Layout_Calendar_Related(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout_List(cobject, refGlade),
+Dialog_Layout_Calendar_Related::Dialog_Layout_Calendar_Related(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout_List(cobject, builder),
m_combo_relationship(0),
m_checkbutton_show_child_relationships(0),
m_radio_navigation_automatic(0),
@@ -45,24 +45,24 @@
m_box_related_table_widgets->show();
m_box_related_navigation->show();
- refGlade->get_widget_derived("combo_relationship_name", m_combo_relationship);
+ builder->get_widget_derived("combo_relationship_name", m_combo_relationship);
m_combo_relationship->signal_changed().connect(sigc::mem_fun(*this, &Dialog_Layout_Calendar_Related::on_combo_relationship_changed));
- refGlade->get_widget("checkbutton_show_child_relationships", m_checkbutton_show_child_relationships);
+ builder->get_widget("checkbutton_show_child_relationships", m_checkbutton_show_child_relationships);
m_checkbutton_show_child_relationships->signal_toggled().connect(sigc::mem_fun(*this, &Dialog_Layout_Calendar_Related::on_checkbutton_show_child_relationships));
- refGlade->get_widget("radiobutton_navigation_automatic", m_radio_navigation_automatic);
- refGlade->get_widget("label_navigation_automatic", m_label_navigation_automatic);
+ builder->get_widget("radiobutton_navigation_automatic", m_radio_navigation_automatic);
+ builder->get_widget("label_navigation_automatic", m_label_navigation_automatic);
make_sensitivity_depend_on_toggle_button(*m_radio_navigation_automatic, *m_label_navigation_automatic);
- refGlade->get_widget("radiobutton_navigation_specify", m_radio_navigation_specify);
- refGlade->get_widget_derived("combobox_navigation_specify", m_combo_navigation_specify);
+ builder->get_widget("radiobutton_navigation_specify", m_radio_navigation_specify);
+ builder->get_widget_derived("combobox_navigation_specify", m_combo_navigation_specify);
make_sensitivity_depend_on_toggle_button(*m_radio_navigation_specify, *m_combo_navigation_specify);
m_combo_navigation_specify->signal_changed().connect(sigc::mem_fun(*this, &Dialog_Layout_Calendar_Related::on_combo_navigation_specific_changed));
- refGlade->get_widget_derived("combobox_date_field", m_combobox_date_field);
+ builder->get_widget_derived("combobox_date_field", m_combobox_date_field);
m_combobox_date_field->signal_changed().connect(sigc::mem_fun(*this, &Dialog_Layout_Calendar_Related::on_combo_date_field_changed));
@@ -73,7 +73,7 @@
//The base class hid this, but we do want it here:
//(We share one glade definition for several dialogs.)
Gtk::Frame* box_calendar = 0;
- refGlade->get_widget("frame_calendar", box_calendar);
+ builder->get_widget("frame_calendar", box_calendar);
box_calendar->show();
//This entry must be in the Glade file, because it's used by the base class,
Modified: trunk/glom/mode_data/dialog_layout_calendar_related.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_calendar_related.h (original)
+++ trunk/glom/mode_data/dialog_layout_calendar_related.h Tue Mar 17 14:42:09 2009
@@ -33,7 +33,7 @@
class Dialog_Layout_Calendar_Related : public Dialog_Layout_List
{
public:
- Dialog_Layout_Calendar_Related(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Layout_Calendar_Related(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Layout_Calendar_Related();
/**
Modified: trunk/glom/mode_data/dialog_layout_details.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.cc (original)
+++ trunk/glom/mode_data/dialog_layout_details.cc Tue Mar 17 14:42:09 2009
@@ -32,8 +32,8 @@
namespace Glom
{
-Dialog_Layout_Details::Dialog_Layout_Details(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout(cobject, refGlade),
+Dialog_Layout_Details::Dialog_Layout_Details(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout(cobject, builder),
m_treeview_fields(0),
m_treeview_column_title(0),
m_treeview_column_group_columns(0),
@@ -58,20 +58,20 @@
{
// Get the alternate sets of widgets, only one of which should be shown:
// Derived classes will hide one and show the other:
- refGlade->get_widget("hbox_table_widgets", m_box_table_widgets);
+ builder->get_widget("hbox_table_widgets", m_box_table_widgets);
m_box_table_widgets->show();
- refGlade->get_widget("hbox_related_table_widgets", m_box_related_table_widgets);
+ builder->get_widget("hbox_related_table_widgets", m_box_related_table_widgets);
m_box_related_table_widgets->hide();
- refGlade->get_widget("frame_related_table_navigation", m_box_related_navigation);
+ builder->get_widget("frame_related_table_navigation", m_box_related_navigation);
m_box_related_navigation->hide();
Gtk::Frame* box_calendar = 0;
- refGlade->get_widget("frame_calendar", box_calendar);
+ builder->get_widget("frame_calendar", box_calendar);
box_calendar->hide();
- refGlade->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("treeview_fields", m_treeview_fields);
+ builder->get_widget("treeview_fields", m_treeview_fields);
if(m_treeview_fields)
{
m_treeview_fields->set_reorderable();
@@ -149,43 +149,43 @@
m_model_items->signal_row_changed().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_treemodel_row_changed) );
}
- refGlade->get_widget("button_up", m_button_up);
+ builder->get_widget("button_up", m_button_up);
m_button_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_up) );
- refGlade->get_widget("button_down", m_button_down);
+ builder->get_widget("button_down", m_button_down);
m_button_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_down) );
- refGlade->get_widget("button_field_delete", m_button_field_delete);
+ builder->get_widget("button_field_delete", m_button_field_delete);
m_button_field_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_delete) );
- refGlade->get_widget("button_formatting", m_button_field_formatting);
+ builder->get_widget("button_formatting", m_button_field_formatting);
m_button_field_formatting->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_field_formatting) );
- refGlade->get_widget("button_add_field", m_button_add_field);
+ builder->get_widget("button_add_field", m_button_add_field);
m_button_add_field->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_field) );
- refGlade->get_widget("button_add_group", m_button_add_group);
+ builder->get_widget("button_add_group", m_button_add_group);
m_button_add_group->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_group) );
- refGlade->get_widget("button_add_notebook", m_button_add_notebook);
+ builder->get_widget("button_add_notebook", m_button_add_notebook);
m_button_add_notebook->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_notebook) );
- refGlade->get_widget("button_add_related", m_button_add_related);
+ builder->get_widget("button_add_related", m_button_add_related);
m_button_add_related->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_related) );
- refGlade->get_widget("button_add_related_calendar", m_button_add_related_calendar);
+ builder->get_widget("button_add_related_calendar", m_button_add_related_calendar);
m_button_add_related_calendar->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_related_calendar) );
- refGlade->get_widget("button_add_button", m_button_add_button);
+ builder->get_widget("button_add_button", m_button_add_button);
m_button_add_button->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_button) );
- refGlade->get_widget("button_add_text", m_button_add_text);
+ builder->get_widget("button_add_text", m_button_add_text);
m_button_add_text->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_text) );
- refGlade->get_widget("button_add_image", m_button_add_image);
+ builder->get_widget("button_add_image", m_button_add_image);
m_button_add_image->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_add_image) );
- refGlade->get_widget("button_edit", m_button_edit);
+ builder->get_widget("button_edit", m_button_edit);
m_button_edit->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Details::on_button_edit) );
//show_all_children();
@@ -546,7 +546,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_button_script");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_button_script");
Dialog_ButtonScript* dialog = 0;
refXml->get_widget_derived("window_button_script", dialog);
@@ -566,7 +566,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -581,7 +581,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
Dialog_TextObject* dialog = 0;
refXml->get_widget_derived("window_textobject", dialog);
@@ -601,7 +601,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -621,7 +621,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_relationship");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_relationship");
Dialog_ChooseRelationship* dialog = 0;
refXml->get_widget_derived("dialog_choose_relationship", dialog);
@@ -642,7 +642,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_data/dialog_layout_details.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.h (original)
+++ trunk/glom/mode_data/dialog_layout_details.h Tue Mar 17 14:42:09 2009
@@ -30,7 +30,7 @@
class Dialog_Layout_Details : public Dialog_Layout
{
public:
- Dialog_Layout_Details(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Layout_Details(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Layout_Details();
/**
Modified: trunk/glom/mode_data/dialog_layout_export.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_export.cc (original)
+++ trunk/glom/mode_data/dialog_layout_export.cc Tue Mar 17 14:42:09 2009
@@ -29,8 +29,8 @@
namespace Glom
{
-Dialog_Layout_Export::Dialog_Layout_Export(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout(cobject, refGlade, false /* no table title */),
+Dialog_Layout_Export::Dialog_Layout_Export(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout(cobject, builder, false /* no table title */),
m_treeview_fields(0),
m_button_field_up(0),
m_button_field_down(0),
@@ -39,10 +39,10 @@
m_button_field_edit(0),
m_label_table_name(0)
{
- refGlade->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("label_table_name", m_label_table_name);
m_entry_table_title = 0; //Not in this glade file.
- refGlade->get_widget("treeview_fields", m_treeview_fields);
+ builder->get_widget("treeview_fields", m_treeview_fields);
if(m_treeview_fields)
{
m_model_fields = Gtk::ListStore::create(m_ColumnsFields);
@@ -72,19 +72,19 @@
}
- refGlade->get_widget("button_field_up", m_button_field_up);
+ builder->get_widget("button_field_up", m_button_field_up);
m_button_field_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_up) );
- refGlade->get_widget("button_field_down", m_button_field_down);
+ builder->get_widget("button_field_down", m_button_field_down);
m_button_field_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_down) );
- refGlade->get_widget("button_field_delete", m_button_field_delete);
+ builder->get_widget("button_field_delete", m_button_field_delete);
m_button_field_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_delete) );
- refGlade->get_widget("button_field_add", m_button_field_add);
+ builder->get_widget("button_field_add", m_button_field_add);
m_button_field_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_add_field) );
- refGlade->get_widget("button_field_edit", m_button_field_edit);
+ builder->get_widget("button_field_edit", m_button_field_edit);
m_button_field_edit->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Export::on_button_edit_field) );
show_all_children();
Modified: trunk/glom/mode_data/dialog_layout_export.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_export.h (original)
+++ trunk/glom/mode_data/dialog_layout_export.h Tue Mar 17 14:42:09 2009
@@ -29,7 +29,7 @@
class Dialog_Layout_Export : public Dialog_Layout
{
public:
- Dialog_Layout_Export(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Layout_Export(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Layout_Export();
/**
Modified: trunk/glom/mode_data/dialog_layout_list.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_list.cc (original)
+++ trunk/glom/mode_data/dialog_layout_list.cc Tue Mar 17 14:42:09 2009
@@ -30,8 +30,8 @@
namespace Glom
{
-Dialog_Layout_List::Dialog_Layout_List(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout_Details(cobject, refGlade)
+Dialog_Layout_List::Dialog_Layout_List(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout_Details(cobject, builder)
{
//These do not make sense in a list:
m_button_add_notebook->hide();
@@ -42,7 +42,7 @@
//We don't want this part of the dialog:
//(We share one glade definition for several dialogs.)
Gtk::Frame* box_calendar = 0;
- refGlade->get_widget("frame_calendar", box_calendar);
+ builder->get_widget("frame_calendar", box_calendar);
box_calendar->hide();
//We don't use this column:
Modified: trunk/glom/mode_data/dialog_layout_list.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_list.h (original)
+++ trunk/glom/mode_data/dialog_layout_list.h Tue Mar 17 14:42:09 2009
@@ -29,7 +29,7 @@
class Dialog_Layout_List : public Dialog_Layout_Details
{
public:
- Dialog_Layout_List(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Layout_List(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Layout_List();
};
Modified: trunk/glom/mode_data/dialog_layout_list_related.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_list_related.cc (original)
+++ trunk/glom/mode_data/dialog_layout_list_related.cc Tue Mar 17 14:42:09 2009
@@ -30,8 +30,8 @@
namespace Glom
{
-Dialog_Layout_List_Related::Dialog_Layout_List_Related(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout_List(cobject, refGlade),
+Dialog_Layout_List_Related::Dialog_Layout_List_Related(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout_List(cobject, builder),
m_combo_relationship(0),
m_checkbutton_show_child_relationships(0),
m_radio_navigation_automatic(0),
@@ -44,20 +44,20 @@
m_box_related_table_widgets->show();
m_box_related_navigation->show();
- refGlade->get_widget_derived("combo_relationship_name", m_combo_relationship);
+ builder->get_widget_derived("combo_relationship_name", m_combo_relationship);
m_combo_relationship->signal_changed().connect(sigc::mem_fun(*this, &Dialog_Layout_List_Related::on_combo_relationship_changed));
- refGlade->get_widget("checkbutton_show_child_relationships", m_checkbutton_show_child_relationships);
+ builder->get_widget("checkbutton_show_child_relationships", m_checkbutton_show_child_relationships);
m_checkbutton_show_child_relationships->signal_toggled().connect(sigc::mem_fun(*this, &Dialog_Layout_List_Related::on_checkbutton_show_child_relationships));
- refGlade->get_widget("radiobutton_navigation_automatic", m_radio_navigation_automatic);
- refGlade->get_widget("label_navigation_automatic", m_label_navigation_automatic);
+ builder->get_widget("radiobutton_navigation_automatic", m_radio_navigation_automatic);
+ builder->get_widget("label_navigation_automatic", m_label_navigation_automatic);
make_sensitivity_depend_on_toggle_button(*m_radio_navigation_automatic, *m_label_navigation_automatic);
- refGlade->get_widget("radiobutton_navigation_specify", m_radio_navigation_specify);
- refGlade->get_widget_derived("combobox_navigation_specify", m_combo_navigation_specify);
+ builder->get_widget("radiobutton_navigation_specify", m_radio_navigation_specify);
+ builder->get_widget_derived("combobox_navigation_specify", m_combo_navigation_specify);
make_sensitivity_depend_on_toggle_button(*m_radio_navigation_specify, *m_combo_navigation_specify);
m_combo_navigation_specify->signal_changed().connect(sigc::mem_fun(*this, &Dialog_Layout_List_Related::on_combo_navigation_specific_changed));
Modified: trunk/glom/mode_data/dialog_layout_list_related.h
==============================================================================
--- trunk/glom/mode_data/dialog_layout_list_related.h (original)
+++ trunk/glom/mode_data/dialog_layout_list_related.h Tue Mar 17 14:42:09 2009
@@ -31,7 +31,7 @@
class Dialog_Layout_List_Related : public Dialog_Layout_List
{
public:
- Dialog_Layout_List_Related(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Layout_List_Related(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Layout_List_Related();
/**
Modified: trunk/glom/mode_data/flowtablewithfields.cc
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.cc (original)
+++ trunk/glom/mode_data/flowtablewithfields.cc Tue Mar 17 14:42:09 2009
@@ -1369,51 +1369,11 @@
return true;
}
-#endif // !GLOM_ENABLE_CLIENT_ONLY
-
-sharedptr<LayoutItem_Portal> FlowTableWithFields::get_layout_item_from_relation()
-{
- sharedptr<LayoutItem_Portal> layout_item(0);
- try
- {
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_choose_relationship");
-
- Dialog_ChooseRelationship* dialog = 0;
- refXml->get_widget_derived("dialog_choose_relationship", dialog);
-
- if(dialog)
- {
- Document_Glom* pDocument = static_cast<Document_Glom*>(get_document());
- dialog->set_document(pDocument, m_table_name);
- //TODO: dialog->set_transient_for(*get_app_window());
- const int response = dialog->run();
- dialog->hide();
- if(response == Gtk::RESPONSE_OK)
- {
- //Get the chosen relationship:
- sharedptr<Relationship> relationship = dialog->get_relationship_chosen();
- if(relationship)
- {
- layout_item = sharedptr<LayoutItem_Portal>::create();
- layout_item->set_relationship(relationship);
- }
- }
- delete dialog;
- }
- }
- catch(const Gnome::Glade::XmlError& ex)
- {
- std::cerr << ex.what() << std::endl;
- }
- return layout_item;
-}
-
-#ifndef GLOM_ENABLE_CLIENT_ONLY
void FlowTableWithFields::on_menu_properties_activate()
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_flowtable");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_flowtable");
Dialog_FlowTable* dialog = 0;
refXml->get_widget_derived("dialog_flowtable", dialog);
@@ -1433,7 +1393,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -1487,7 +1447,7 @@
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_relationship");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_relationship");
Dialog_ChooseRelationship* dialog = 0;
refXml->get_widget_derived("dialog_choose_relationship", dialog);
@@ -1514,7 +1474,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_data/flowtablewithfields.h
==============================================================================
--- trunk/glom/mode_data/flowtablewithfields.h (original)
+++ trunk/glom/mode_data/flowtablewithfields.h Tue Mar 17 14:42:09 2009
@@ -228,8 +228,6 @@
bool ignore_error = false);
#endif // !GLOM_ENABLE_CLIENT_ONLY
-
- sharedptr<LayoutItem_Portal> get_layout_item_from_relation();
Box_Data_List_Related* create_related(const sharedptr<LayoutItem_Portal>& portal, bool show_title = true);
Box_Data_Calendar_Related* create_related_calendar(const sharedptr<LayoutItem_CalendarPortal>& portal, bool show_title = true);
Modified: trunk/glom/mode_design/box_db_table_relationships.cc
==============================================================================
--- trunk/glom/mode_design/box_db_table_relationships.cc (original)
+++ trunk/glom/mode_design/box_db_table_relationships.cc Tue Mar 17 14:42:09 2009
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include "box_db_table_relationships.h"
#include <algorithm>
#include <glibmm/i18n.h>
@@ -31,8 +31,8 @@
init();
}
-Box_DB_Table_Relationships::Box_DB_Table_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Box_DB_Table(cobject, refGlade)
+Box_DB_Table_Relationships::Box_DB_Table_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Box_DB_Table(cobject, builder)
{
init();
}
Modified: trunk/glom/mode_design/box_db_table_relationships.h
==============================================================================
--- trunk/glom/mode_design/box_db_table_relationships.h (original)
+++ trunk/glom/mode_design/box_db_table_relationships.h Tue Mar 17 14:42:09 2009
@@ -31,7 +31,7 @@
{
public:
Box_DB_Table_Relationships();
- Box_DB_Table_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_DB_Table_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_DB_Table_Relationships();
void init(); //avoid duplication in constructors.
Modified: trunk/glom/mode_design/dialog_add_related_table.cc
==============================================================================
--- trunk/glom/mode_design/dialog_add_related_table.cc (original)
+++ trunk/glom/mode_design/dialog_add_related_table.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-Dialog_AddRelatedTable::Dialog_AddRelatedTable(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_AddRelatedTable::Dialog_AddRelatedTable(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
Base_DB(),
m_entry_table_name(0),
@@ -34,17 +34,17 @@
m_button_edit_fields(0),
m_button_ok(0)
{
- refGlade->get_widget("entry_related_table_name", m_entry_table_name);
- refGlade->get_widget("entry_relationship_name", m_entry_relationship_name);
- refGlade->get_widget_derived("combobox_from_key", m_combo_from_field);
+ builder->get_widget("entry_related_table_name", m_entry_table_name);
+ builder->get_widget("entry_relationship_name", m_entry_relationship_name);
+ builder->get_widget_derived("combobox_from_key", m_combo_from_field);
//Connect signals:
m_combo_from_field->signal_changed().connect( sigc::mem_fun(*this, &Dialog_AddRelatedTable::on_combo_field_name) );
m_entry_table_name->signal_changed().connect( sigc::mem_fun(*this, &Dialog_AddRelatedTable::on_entry_table_name) );
- refGlade->get_widget("button_edit_fields", m_button_edit_fields);
- refGlade->get_widget("button_ok", m_button_ok);
+ builder->get_widget("button_edit_fields", m_button_edit_fields);
+ builder->get_widget("button_ok", m_button_ok);
m_button_edit_fields->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_AddRelatedTable::on_button_edit_fields) );
Modified: trunk/glom/mode_design/dialog_add_related_table.h
==============================================================================
--- trunk/glom/mode_design/dialog_add_related_table.h (original)
+++ trunk/glom/mode_design/dialog_add_related_table.h Tue Mar 17 14:42:09 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_DIALOG_ADDRELATEDTABLE_H
#define GLOM_DIALOG_ADDRELATEDTABLE_H
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include <glom/utility_widgets/combo_textglade.h>
@@ -35,7 +35,7 @@
public Base_DB
{
public:
- Dialog_AddRelatedTable(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_AddRelatedTable(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_AddRelatedTable();
void set_fields(const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/dialog_design.cc
==============================================================================
--- trunk/glom/mode_design/dialog_design.cc (original)
+++ trunk/glom/mode_design/dialog_design.cc Tue Mar 17 14:42:09 2009
@@ -26,17 +26,17 @@
namespace Glom
{
-Dialog_Design::Dialog_Design(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_Design::Dialog_Design(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
m_label_table(0),
m_label_frame(0)
{
Gtk::Button* button_close = 0;
- refGlade->get_widget("button_close", button_close);
+ builder->get_widget("button_close", button_close);
button_close->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Design::on_button_close) );
- refGlade->get_widget("label_table_name", m_label_table);
- refGlade->get_widget("label_frame_title", m_label_frame);
+ builder->get_widget("label_table_name", m_label_table);
+ builder->get_widget("label_frame_title", m_label_frame);
set_modal(); //We don't want people to edit the main window while we are changing structure.
Modified: trunk/glom/mode_design/dialog_design.h
==============================================================================
--- trunk/glom/mode_design/dialog_design.h (original)
+++ trunk/glom/mode_design/dialog_design.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_DIALOG_DESIGN_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/document/view.h>
namespace Glom
@@ -35,7 +35,7 @@
public View_Composite_Glom
{
public:
- Dialog_Design(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Design(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Design();
virtual bool init_db_details(const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/dialog_fields.cc
==============================================================================
--- trunk/glom/mode_design/dialog_fields.cc (original)
+++ trunk/glom/mode_design/dialog_fields.cc Tue Mar 17 14:42:09 2009
@@ -27,11 +27,11 @@
namespace Glom
{
-Dialog_Fields::Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Design(cobject, refGlade),
+Dialog_Fields::Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Design(cobject, builder),
m_box(0)
{
- refGlade->get_widget_derived("vbox_placeholder", m_box);
+ builder->get_widget_derived("vbox_placeholder", m_box);
m_label_frame->set_markup( Utils::bold_message(_("Field Definitions")) );
Modified: trunk/glom/mode_design/dialog_fields.h
==============================================================================
--- trunk/glom/mode_design/dialog_fields.h (original)
+++ trunk/glom/mode_design/dialog_fields.h Tue Mar 17 14:42:09 2009
@@ -30,7 +30,7 @@
class Dialog_Fields : public Dialog_Design
{
public:
- Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Fields(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Fields();
virtual bool init_db_details(const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/dialog_relationships.cc
==============================================================================
--- trunk/glom/mode_design/dialog_relationships.cc (original)
+++ trunk/glom/mode_design/dialog_relationships.cc Tue Mar 17 14:42:09 2009
@@ -27,11 +27,11 @@
namespace Glom
{
-Dialog_Relationships::Dialog_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Design(cobject, refGlade),
+Dialog_Relationships::Dialog_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Design(cobject, builder),
m_box(0)
{
- refGlade->get_widget_derived("vbox_placeholder", m_box);
+ builder->get_widget_derived("vbox_placeholder", m_box);
m_label_frame->set_markup( Utils::bold_message(_("Relationships")) );
Modified: trunk/glom/mode_design/dialog_relationships.h
==============================================================================
--- trunk/glom/mode_design/dialog_relationships.h (original)
+++ trunk/glom/mode_design/dialog_relationships.h Tue Mar 17 14:42:09 2009
@@ -30,7 +30,7 @@
class Dialog_Relationships : public Dialog_Design
{
public:
- Dialog_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Relationships(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Relationships();
virtual bool init_db_details(const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/fields/box_db_table_definition.cc
==============================================================================
--- trunk/glom/mode_design/fields/box_db_table_definition.cc (original)
+++ trunk/glom/mode_design/fields/box_db_table_definition.cc Tue Mar 17 14:42:09 2009
@@ -33,8 +33,8 @@
init();
}
-Box_DB_Table_Definition::Box_DB_Table_Definition(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Box_DB_Table(cobject, refGlade)
+Box_DB_Table_Definition::Box_DB_Table_Definition(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Box_DB_Table(cobject, builder)
{
init();
}
@@ -43,7 +43,7 @@
{
//m_strHint = _("Click [Edit] to edit the field definition in more detail.\nUse the Mode menu to see Data or perform a Find.");
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_field_definition_edit");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_field_definition_edit");
if(refXml)
refXml->get_widget_derived("window_field_definition_edit", m_pDialog);
Modified: trunk/glom/mode_design/fields/box_db_table_definition.h
==============================================================================
--- trunk/glom/mode_design/fields/box_db_table_definition.h (original)
+++ trunk/glom/mode_design/fields/box_db_table_definition.h Tue Mar 17 14:42:09 2009
@@ -31,7 +31,7 @@
{
public:
Box_DB_Table_Definition();
- Box_DB_Table_Definition(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_DB_Table_Definition(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_DB_Table_Definition();
private:
Modified: trunk/glom/mode_design/fields/combo_fieldtype.cc
==============================================================================
--- trunk/glom/mode_design/fields/combo_fieldtype.cc (original)
+++ trunk/glom/mode_design/fields/combo_fieldtype.cc Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
namespace Glom
{
-Combo_FieldType::Combo_FieldType(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+Combo_FieldType::Combo_FieldType(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBox(cobject)
{
init();
Modified: trunk/glom/mode_design/fields/combo_fieldtype.h
==============================================================================
--- trunk/glom/mode_design/fields/combo_fieldtype.h (original)
+++ trunk/glom/mode_design/fields/combo_fieldtype.h Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
#include <gtkmm/liststore.h>
#include <libgdamm.h>
#include <algorithm> //For std::find_if
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -62,7 +62,7 @@
{
public:
Combo_FieldType();
- Combo_FieldType(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Combo_FieldType(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Combo_FieldType();
//set/get the text in terms of enumerated type:
Modified: trunk/glom/mode_design/fields/dialog_fieldcalculation.cc
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fieldcalculation.cc (original)
+++ trunk/glom/mode_design/fields/dialog_fieldcalculation.cc Tue Mar 17 14:42:09 2009
@@ -32,12 +32,12 @@
namespace Glom
{
-Dialog_FieldCalculation::Dialog_FieldCalculation(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_FieldCalculation::Dialog_FieldCalculation(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject)
{
- refGlade->get_widget("textview_calculation", m_text_view);
- refGlade->get_widget("button_test", m_button_test);
- refGlade->get_widget("label_triggered_by", m_label_triggered_by);
+ builder->get_widget("textview_calculation", m_text_view);
+ builder->get_widget("button_test", m_button_test);
+ builder->get_widget("label_triggered_by", m_label_triggered_by);
m_button_test->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_FieldCalculation::on_button_test) );
//on_foreach_connect(*this);
Modified: trunk/glom/mode_design/fields/dialog_fieldcalculation.h
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fieldcalculation.h (original)
+++ trunk/glom/mode_design/fields/dialog_fieldcalculation.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define DIALOG_FIELDCALCULATION_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/field.h>
#include "../../base_db.h"
#include <gtksourceviewmm/sourceview.h>
@@ -36,7 +36,7 @@
{
public:
- Dialog_FieldCalculation(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_FieldCalculation(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_FieldCalculation();
void set_field(const sharedptr<const Field>& field, const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/fields/dialog_fielddefinition.cc
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fielddefinition.cc (original)
+++ trunk/glom/mode_design/fields/dialog_fielddefinition.cc Tue Mar 17 14:42:09 2009
@@ -28,37 +28,37 @@
namespace Glom
{
-Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Properties(cobject, refGlade),
+Dialog_FieldDefinition::Dialog_FieldDefinition(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Properties(cobject, builder),
m_pDataWidget_DefaultValueSimple(0),
m_box_formatting_placeholder(0),
m_box_formatting(0)
{
- refGlade->get_widget_derived("combobox_type", m_pCombo_Type);
+ builder->get_widget_derived("combobox_type", m_pCombo_Type);
- refGlade->get_widget("entry_name", m_pEntry_Name);
- refGlade->get_widget("entry_title", m_pEntry_Title);
+ builder->get_widget("entry_name", m_pEntry_Name);
+ builder->get_widget("entry_title", m_pEntry_Title);
- refGlade->get_widget("checkbutton_unique", m_pCheck_Unique);
- refGlade->get_widget("checkbutton_primarykey", m_pCheck_PrimaryKey);
- refGlade->get_widget("checkbutton_autoincrement", m_pCheck_AutoIncrement);
+ builder->get_widget("checkbutton_unique", m_pCheck_Unique);
+ builder->get_widget("checkbutton_primarykey", m_pCheck_PrimaryKey);
+ builder->get_widget("checkbutton_autoincrement", m_pCheck_AutoIncrement);
- refGlade->get_widget("hbox_default_value_simple", m_pBox_DefaultValueSimple);
+ builder->get_widget("hbox_default_value_simple", m_pBox_DefaultValueSimple);
- refGlade->get_widget("box_default_value", m_pBox_ValueTab);
+ builder->get_widget("box_default_value", m_pBox_ValueTab);
- refGlade->get_widget("radiobutton_userentry", m_pRadio_UserEntry);
- refGlade->get_widget("alignment_userentry", m_pAlignment_UserEntry);
+ builder->get_widget("radiobutton_userentry", m_pRadio_UserEntry);
+ builder->get_widget("alignment_userentry", m_pAlignment_UserEntry);
- refGlade->get_widget("checkbutton_lookup", m_pCheck_Lookup);
- refGlade->get_widget("table_lookup", m_pTable_Lookup);
- refGlade->get_widget_derived("combobox_lookup_relationship", m_pCombo_LookupRelationship);
- refGlade->get_widget_derived("combobox_lookup_field", m_pCombo_LookupField);
+ builder->get_widget("checkbutton_lookup", m_pCheck_Lookup);
+ builder->get_widget("table_lookup", m_pTable_Lookup);
+ builder->get_widget_derived("combobox_lookup_relationship", m_pCombo_LookupRelationship);
+ builder->get_widget_derived("combobox_lookup_field", m_pCombo_LookupField);
- refGlade->get_widget("radiobutton_calculate", m_pRadio_Calculate);
- refGlade->get_widget("alignment_calculate", m_pAlignment_Calculate);
- refGlade->get_widget("textview_calculate", m_pTextView_Calculation);
- refGlade->get_widget("button_edit_calculation", m_pButton_EditCalculation);
+ builder->get_widget("radiobutton_calculate", m_pRadio_Calculate);
+ builder->get_widget("alignment_calculate", m_pAlignment_Calculate);
+ builder->get_widget("textview_calculate", m_pTextView_Calculation);
+ builder->get_widget("button_edit_calculation", m_pButton_EditCalculation);
//Connect signals:
m_pCombo_Type->signal_changed().connect( sigc::mem_fun(*this, &Dialog_FieldDefinition::on_combo_type_changed) );
@@ -80,15 +80,15 @@
//Formatting:
//Get the place to put the Formatting stuff:
- refGlade->get_widget("box_formatting_placeholder", m_box_formatting_placeholder);
+ builder->get_widget("box_formatting_placeholder", m_box_formatting_placeholder);
//Get the formatting stuff:
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXmlFormatting = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "box_formatting");
+ Glib::RefPtr<Gtk::Builder> refXmlFormatting = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "box_formatting");
refXmlFormatting->get_widget_derived("box_formatting", m_box_formatting);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -372,7 +372,7 @@
void Dialog_FieldDefinition::on_button_edit_calculation()
{
//TODO: Share a global instance, to make this quicker?
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(GLOM_GLADEDIR "glom_developer.glade", "window_field_calculation");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(GLOM_GLADEDIR "glom_developer.glade", "window_field_calculation");
if(refXml)
{
Dialog_FieldCalculation* dialog = 0;
Modified: trunk/glom/mode_design/fields/dialog_fielddefinition.h
==============================================================================
--- trunk/glom/mode_design/fields/dialog_fielddefinition.h (original)
+++ trunk/glom/mode_design/fields/dialog_fielddefinition.h Tue Mar 17 14:42:09 2009
@@ -42,7 +42,7 @@
public Base_DB //Give this class access to the current document, and to some utility methods.
{
public:
- Dialog_FieldDefinition(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_FieldDefinition(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_FieldDefinition();
virtual void set_field(const sharedptr<const Field>& field, const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/print_layouts/box_print_layouts.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/box_print_layouts.cc (original)
+++ trunk/glom/mode_design/print_layouts/box_print_layouts.cc Tue Mar 17 14:42:09 2009
@@ -25,22 +25,22 @@
namespace Glom
{
-Box_Print_Layouts::Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Box_DB_Table(cobject, refGlade),
+Box_Print_Layouts::Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Box_DB_Table(cobject, builder),
m_pLabelFrameTitle(0),
m_colName(0),
m_colTitle(0)
{
//Get the Glade-instantiated widgets, and connect signal handlers:
Gtk::Button* pButtonCancel = 0;
- refGlade->get_widget("button_cancel", pButtonCancel);
+ builder->get_widget("button_cancel", pButtonCancel);
set_button_cancel(*pButtonCancel);
Gtk::Alignment* pAligmentPlaceholder = 0;
- refGlade->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
+ builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
pAligmentPlaceholder->add(m_AddDel);
- //refGlade->get_widget("label_frame_title", m_pLabelFrameTitle);
+ //builder->get_widget("label_frame_title", m_pLabelFrameTitle);
m_AddDel.signal_user_added().connect(sigc::mem_fun(*this, &Box_Print_Layouts::on_adddel_user_added));
m_AddDel.signal_user_requested_delete().connect(sigc::mem_fun(*this, &Box_Print_Layouts::on_adddel_user_requested_delete));
Modified: trunk/glom/mode_design/print_layouts/box_print_layouts.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/box_print_layouts.h (original)
+++ trunk/glom/mode_design/print_layouts/box_print_layouts.h Tue Mar 17 14:42:09 2009
@@ -31,7 +31,7 @@
class Box_Print_Layouts : public Box_DB_Table
{
public:
- Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_Print_Layouts(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_Print_Layouts();
private:
Modified: trunk/glom/mode_design/print_layouts/canvas_print_layout.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/canvas_print_layout.cc (original)
+++ trunk/glom/mode_design/print_layouts/canvas_print_layout.cc Tue Mar 17 14:42:09 2009
@@ -297,7 +297,7 @@
Dialog_Layout_List_Related* dialog = 0;
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout");
if(refXml)
refXml->get_widget_derived("window_data_layout", dialog);
@@ -393,13 +393,13 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXmlFormatting = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_text_format");
+ Glib::RefPtr<Gtk::Builder> refXmlFormatting = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_text_format");
refXmlFormatting->get_widget_derived("window_text_format", m_dialog_format);
add_view(m_dialog_format);
m_dialog_format->signal_hide().connect( sigc::mem_fun(*this, &Canvas_PrintLayout::on_dialog_format_hide) );
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc (original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.cc Tue Mar 17 14:42:09 2009
@@ -26,26 +26,26 @@
namespace Glom
{
-Dialog_TextFormatting::Dialog_TextFormatting(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_TextFormatting::Dialog_TextFormatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
m_box_formatting_placeholder(0),
m_box_formatting(0)
{
Gtk::Button* button_close = 0;
- refGlade->get_widget("button_close", button_close);
+ builder->get_widget("button_close", button_close);
button_close->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_TextFormatting::on_button_close) );
//Formatting:
//Get the place to put the Formatting stuff:
- refGlade->get_widget("box_formatting_placeholder", m_box_formatting_placeholder);
+ builder->get_widget("box_formatting_placeholder", m_box_formatting_placeholder);
//Get the formatting stuff:
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXmlFormatting = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "box_formatting");
+ Glib::RefPtr<Gtk::Builder> refXmlFormatting = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "box_formatting");
refXmlFormatting->get_widget_derived("box_formatting", m_box_formatting);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_design/print_layouts/dialog_text_formatting.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/dialog_text_formatting.h (original)
+++ trunk/glom/mode_design/print_layouts/dialog_text_formatting.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_DIALOG_TEXT_FORMATTING_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/document/document_glom.h>
#include <glom/layout_item_dialogs/box_formatting.h>
@@ -36,7 +36,7 @@
public View_Composite_Glom
{
public:
- Dialog_TextFormatting(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_TextFormatting(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_TextFormatting();
//Allow direct access, for convenience:
Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc (original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.cc Tue Mar 17 14:42:09 2009
@@ -32,7 +32,7 @@
namespace Glom
{
-Window_PrintLayout_Edit::Window_PrintLayout_Edit(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Window_PrintLayout_Edit::Window_PrintLayout_Edit(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
m_entry_name(0),
m_entry_title(0),
@@ -49,26 +49,26 @@
add_view(&m_canvas);
- refGlade->get_widget("vbox_menu", m_box_menu);
- refGlade->get_widget("vbox_canvas", m_box_canvas);
- refGlade->get_widget("vbox_inner", m_box);
-
- //refGlade->get_widget("label_name", m_label_name);
- refGlade->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("entry_name", m_entry_name);
- refGlade->get_widget("entry_title", m_entry_title);
+ builder->get_widget("vbox_menu", m_box_menu);
+ builder->get_widget("vbox_canvas", m_box_canvas);
+ builder->get_widget("vbox_inner", m_box);
+
+ //builder->get_widget("label_name", m_label_name);
+ builder->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("entry_name", m_entry_name);
+ builder->get_widget("entry_title", m_entry_title);
- refGlade->get_widget("vruler", m_vruler);
- refGlade->get_widget("hruler", m_hruler);
+ builder->get_widget("vruler", m_vruler);
+ builder->get_widget("hruler", m_hruler);
//I'm not sure what set_metric() does, but using Gtk::CENTIMETERS leads to our max being ignored/used-weirdly. murrayc.
m_hruler->set_metric(Gtk::PIXELS);
m_vruler->set_metric(Gtk::PIXELS);
- refGlade->get_widget("handle_box", m_palette_handle_box);
+ builder->get_widget("handle_box", m_palette_handle_box);
- refGlade->get_widget("button_close", m_button_close);
+ builder->get_widget("button_close", m_button_close);
m_button_close->signal_clicked().connect( sigc::mem_fun(*this, &Window_PrintLayout_Edit::on_button_close) );
m_scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
Modified: trunk/glom/mode_design/print_layouts/window_print_layout_edit.h
==============================================================================
--- trunk/glom/mode_design/print_layouts/window_print_layout_edit.h (original)
+++ trunk/glom/mode_design/print_layouts/window_print_layout_edit.h Tue Mar 17 14:42:09 2009
@@ -33,7 +33,7 @@
#include <gtkmm/uimanager.h>
//#include <gtkmm/toggleaction.h>
#include <gtkmm/ruler.h>
-#include <libglademm/xml.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -43,7 +43,7 @@
public View_Composite_Glom
{
public:
- Window_PrintLayout_Edit(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Window_PrintLayout_Edit(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Window_PrintLayout_Edit();
virtual bool init_db_details(const Glib::ustring& table_name);
Modified: trunk/glom/mode_design/script_library/dialog_new_script.cc
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_new_script.cc (original)
+++ trunk/glom/mode_design/script_library/dialog_new_script.cc Tue Mar 17 14:42:09 2009
@@ -23,11 +23,11 @@
namespace Glom
{
-Dialog_NewScript::Dialog_NewScript(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_NewScript::Dialog_NewScript(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_entry_name(0)
{
- refGlade->get_widget("entry_name", m_entry_name);
+ builder->get_widget("entry_name", m_entry_name);
//m_entry_name->signal_changed().connect( sigc::mem_fun(*this, &Dialog_NewScript::on_entry_name_changed) );
}
Modified: trunk/glom/mode_design/script_library/dialog_new_script.h
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_new_script.h (original)
+++ trunk/glom/mode_design/script_library/dialog_new_script.h Tue Mar 17 14:42:09 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DESIGN_USERS_DIALOG_NEWSCRIPT_H
#define GLOM_MODE_DESIGN_USERS_DIALOG_NEWSCRIPT_H
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
@@ -31,7 +31,7 @@
class Dialog_NewScript : public Gtk::Dialog
{
public:
- Dialog_NewScript(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_NewScript(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_NewScript();
Gtk::Entry* m_entry_name;
Modified: trunk/glom/mode_design/script_library/dialog_script_library.cc
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_script_library.cc (original)
+++ trunk/glom/mode_design/script_library/dialog_script_library.cc Tue Mar 17 14:42:09 2009
@@ -34,15 +34,15 @@
namespace Glom
{
-Dialog_ScriptLibrary::Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ScriptLibrary::Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject)
{
//Get child widgets:
- refGlade->get_widget_derived("combobox_name", m_combobox_name);
- refGlade->get_widget("textview_script", m_text_view);
- refGlade->get_widget("button_check", m_button_check);
- refGlade->get_widget("button_add", m_button_add);
- refGlade->get_widget("button_remove", m_button_remove);
+ builder->get_widget_derived("combobox_name", m_combobox_name);
+ builder->get_widget("textview_script", m_text_view);
+ builder->get_widget("button_check", m_button_check);
+ builder->get_widget("button_add", m_button_add);
+ builder->get_widget("button_remove", m_button_remove);
//Connect signals:
m_button_check->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_ScriptLibrary::on_button_check) );
@@ -91,11 +91,11 @@
Dialog_NewScript* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_library_script");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_library_script");
refXml->get_widget_derived("dialog_new_library_script", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_design/script_library/dialog_script_library.h
==============================================================================
--- trunk/glom/mode_design/script_library/dialog_script_library.h (original)
+++ trunk/glom/mode_design/script_library/dialog_script_library.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define DIALOG_SCRIPTLIBRARY_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <libglom/data_structure/layout/layoutitem_button.h>
#include <glom/base_db.h>
#include <gtksourceviewmm/sourceview.h>
@@ -37,7 +37,7 @@
{
public:
- Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ScriptLibrary(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ScriptLibrary();
virtual void load_from_document();
Modified: trunk/glom/mode_design/users/dialog_choose_user.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_choose_user.cc (original)
+++ trunk/glom/mode_design/users/dialog_choose_user.cc Tue Mar 17 14:42:09 2009
@@ -23,11 +23,11 @@
namespace Glom
{
-Dialog_ChooseUser::Dialog_ChooseUser(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ChooseUser::Dialog_ChooseUser(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_combo_name(0)
{
- refGlade->get_widget_derived("combo_user_name", m_combo_name);
+ builder->get_widget_derived("combo_user_name", m_combo_name);
}
Dialog_ChooseUser::~Dialog_ChooseUser()
Modified: trunk/glom/mode_design/users/dialog_choose_user.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_choose_user.h (original)
+++ trunk/glom/mode_design/users/dialog_choose_user.h Tue Mar 17 14:42:09 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DESIGN_USERS_DIALOG_NEWGROUP_H
#define GLOM_MODE_DESIGN_USERS_DIALOG_NEWGROUP_H
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
#include "../../utility_widgets/combo_textglade.h"
@@ -32,7 +32,7 @@
class Dialog_ChooseUser : public Gtk::Dialog
{
public:
- Dialog_ChooseUser(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ChooseUser(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ChooseUser();
typedef std::vector<Glib::ustring> type_vecStrings;
Modified: trunk/glom/mode_design/users/dialog_groups_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.cc (original)
+++ trunk/glom/mode_design/users/dialog_groups_list.cc Tue Mar 17 14:42:09 2009
@@ -32,7 +32,7 @@
namespace Glom
{
-Dialog_GroupsList::Dialog_GroupsList(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_GroupsList::Dialog_GroupsList(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_treeview_groups(0),
m_button_group_new(0),
@@ -41,8 +41,8 @@
{
//set_default_size(600, -1);
- refGlade->get_widget("treeview_groups", m_treeview_groups);
- refGlade->get_widget("treeview_tables", m_treeview_tables);
+ builder->get_widget("treeview_groups", m_treeview_groups);
+ builder->get_widget("treeview_tables", m_treeview_tables);
m_model_groups = Gtk::ListStore::create(m_model_columns_groups);
m_model_tables = Gtk::ListStore::create(m_model_columns_tables);
@@ -92,13 +92,13 @@
refSelection->signal_changed().connect( sigc::mem_fun(*this, &Dialog_GroupsList::on_treeview_tables_selection_changed) );
}
- refGlade->get_widget("button_group_new", m_button_group_new);
+ builder->get_widget("button_group_new", m_button_group_new);
m_button_group_new->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupsList::on_button_group_new) );
- refGlade->get_widget("button_group_delete", m_button_group_delete);
+ builder->get_widget("button_group_delete", m_button_group_delete);
m_button_group_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupsList::on_button_group_delete) );
- refGlade->get_widget("button_group_users", m_button_group_users);
+ builder->get_widget("button_group_users", m_button_group_users);
m_button_group_users->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_GroupsList::on_button_group_users) );
enable_buttons();
@@ -237,11 +237,11 @@
Dialog_NewGroup* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_group");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_new_group");
refXml->get_widget_derived("dialog_new_group", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -298,11 +298,11 @@
Dialog_UsersList* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_users");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_users");
refXml->get_widget_derived("window_users", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_design/users/dialog_groups_list.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.h (original)
+++ trunk/glom/mode_design/users/dialog_groups_list.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DESIGN_DIALOG_GROUPS_LIST_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include "../../base_db.h"
namespace Glom
@@ -33,7 +33,7 @@
public Base_DB
{
public:
- Dialog_GroupsList(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_GroupsList(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_GroupsList();
//Refresh the UI when we get the document, from add_view:
Modified: trunk/glom/mode_design/users/dialog_new_group.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_new_group.cc (original)
+++ trunk/glom/mode_design/users/dialog_new_group.cc Tue Mar 17 14:42:09 2009
@@ -23,11 +23,11 @@
namespace Glom
{
-Dialog_NewGroup::Dialog_NewGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_NewGroup::Dialog_NewGroup(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_entry_name(0)
{
- refGlade->get_widget("entry_group_name", m_entry_name);
+ builder->get_widget("entry_group_name", m_entry_name);
//m_entry_name->signal_changed().connect( sigc::mem_fun(*this, &Dialog_NewGroup::on_entry_name_changed) );
}
Modified: trunk/glom/mode_design/users/dialog_new_group.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_new_group.h (original)
+++ trunk/glom/mode_design/users/dialog_new_group.h Tue Mar 17 14:42:09 2009
@@ -21,7 +21,7 @@
#ifndef GLOM_MODE_DESIGN_USERS_DIALOG_NEWGROUP_H
#define GLOM_MODE_DESIGN_USERS_DIALOG_NEWGROUP_H
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
#include <gtkmm/entry.h>
@@ -31,7 +31,7 @@
class Dialog_NewGroup : public Gtk::Dialog
{
public:
- Dialog_NewGroup(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_NewGroup(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_NewGroup();
Gtk::Entry* m_entry_name;
Modified: trunk/glom/mode_design/users/dialog_user.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_user.cc (original)
+++ trunk/glom/mode_design/users/dialog_user.cc Tue Mar 17 14:42:09 2009
@@ -26,15 +26,15 @@
namespace Glom
{
-Dialog_User::Dialog_User(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_User::Dialog_User(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject)
{
- //refGlade->get_widget("label_table_name", m_label_table_name);
+ //builder->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("entry_user", m_entry_user);
- refGlade->get_widget_derived("combobox_group", m_combo_group);
- refGlade->get_widget("entry_password", m_entry_password);
- refGlade->get_widget("entry_password_confirm", m_entry_password_confirm);
+ builder->get_widget("entry_user", m_entry_user);
+ builder->get_widget_derived("combobox_group", m_combo_group);
+ builder->get_widget("entry_password", m_entry_password);
+ builder->get_widget("entry_password_confirm", m_entry_password_confirm);
show_all_children();
}
Modified: trunk/glom/mode_design/users/dialog_user.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_user.h (original)
+++ trunk/glom/mode_design/users/dialog_user.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DESIGN_DIALOG_USER_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include "../../utility_widgets/combo_textglade.h"
namespace Glom
@@ -31,7 +31,7 @@
class Dialog_User : public Gtk::Dialog
{
public:
- Dialog_User(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_User(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_User();
bool check_password();
Modified: trunk/glom/mode_design/users/dialog_users_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_users_list.cc (original)
+++ trunk/glom/mode_design/users/dialog_users_list.cc Tue Mar 17 14:42:09 2009
@@ -30,7 +30,7 @@
namespace Glom
{
-Dialog_UsersList::Dialog_UsersList(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_UsersList::Dialog_UsersList(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_treeview_users(0),
m_combo_group(0),
@@ -40,11 +40,11 @@
m_button_user_delete(0),
m_button_user_edit(0)
{
- refGlade->get_widget_derived("combobox_group", m_combo_group);
+ builder->get_widget_derived("combobox_group", m_combo_group);
m_combo_group->signal_changed().connect(sigc::mem_fun(*this, &Dialog_UsersList::on_combo_group_changed));
- refGlade->get_widget("treeview_users", m_treeview_users);
+ builder->get_widget("treeview_users", m_treeview_users);
if(m_treeview_users)
{
Glib::RefPtr<Gtk::TreeView::Selection> refSelection = m_treeview_users->get_selection();
@@ -65,19 +65,19 @@
}
- refGlade->get_widget("button_delete", m_button_user_delete);
+ builder->get_widget("button_delete", m_button_user_delete);
m_button_user_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_UsersList::on_button_user_delete) );
- refGlade->get_widget("button_add", m_button_user_add);
+ builder->get_widget("button_add", m_button_user_add);
m_button_user_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_UsersList::on_button_user_add) );
- refGlade->get_widget("button_remove", m_button_user_remove);
+ builder->get_widget("button_remove", m_button_user_remove);
m_button_user_remove->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_UsersList::on_button_user_remove) );
- refGlade->get_widget("button_new", m_button_user_new);
+ builder->get_widget("button_new", m_button_user_new);
m_button_user_new->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_UsersList::on_button_user_new) );
- refGlade->get_widget("button_edit", m_button_user_edit);
+ builder->get_widget("button_edit", m_button_user_edit);
m_button_user_edit->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_UsersList::on_button_user_edit) );
enable_buttons();
@@ -188,11 +188,11 @@
Dialog_ChooseUser* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_user");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_user");
refXml->get_widget_derived("dialog_choose_user", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -239,11 +239,11 @@
Dialog_User* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_user");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_user");
refXml->get_widget_derived("dialog_user", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -309,11 +309,11 @@
Dialog_User* dialog = 0;
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_user");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_user");
refXml->get_widget_derived("dialog_user", dialog);
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/mode_design/users/dialog_users_list.h
==============================================================================
--- trunk/glom/mode_design/users/dialog_users_list.h (original)
+++ trunk/glom/mode_design/users/dialog_users_list.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DESIGN_DIALOG_USERS_LIST_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include "../../base_db.h"
#include "../../utility_widgets/combo_textglade.h"
@@ -34,7 +34,7 @@
public Base_DB
{
public:
- Dialog_UsersList(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_UsersList(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_UsersList();
virtual void set_group(const Glib::ustring& group_name);
Modified: trunk/glom/navigation/box_tables.cc
==============================================================================
--- trunk/glom/navigation/box_tables.cc (original)
+++ trunk/glom/navigation/box_tables.cc Tue Mar 17 14:42:09 2009
@@ -26,8 +26,8 @@
namespace Glom
{
-Box_Tables::Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Box_WithButtons(cobject, refGlade),
+Box_Tables::Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Box_WithButtons(cobject, builder),
m_pLabelFrameTitle(0),
m_pCheckButtonShowHidden(0),
m_colTableName(0),
@@ -37,16 +37,16 @@
{
//Get the Glade-instantiated widgets, and connect signal handlers:
Gtk::Button* pButtonCancel = 0;
- refGlade->get_widget("button_cancel", pButtonCancel);
+ builder->get_widget("button_cancel", pButtonCancel);
set_button_cancel(*pButtonCancel);
Gtk::Alignment* pAligmentPlaceholder = 0;
- refGlade->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
+ builder->get_widget("alignment_placeholder_adddel", pAligmentPlaceholder);
pAligmentPlaceholder->add(m_AddDel);
- refGlade->get_widget("label_frame_title", m_pLabelFrameTitle);
+ builder->get_widget("label_frame_title", m_pLabelFrameTitle);
- refGlade->get_widget("checkbutton_show_hidden", m_pCheckButtonShowHidden);
+ builder->get_widget("checkbutton_show_hidden", m_pCheckButtonShowHidden);
m_pCheckButtonShowHidden->signal_toggled().connect(sigc::mem_fun(*this, &Box_Tables::on_show_hidden_toggled));
#ifndef GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/navigation/box_tables.h
==============================================================================
--- trunk/glom/navigation/box_tables.h (original)
+++ trunk/glom/navigation/box_tables.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include <glom/box_withbuttons.h>
#include <glom/base_db.h>
#include <glom/utility_widgets/adddel/adddel_withbuttons.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -38,7 +38,7 @@
public Base_DB
{
public:
- Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Box_Tables(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Box_Tables();
private:
Modified: trunk/glom/relationships_overview/dialog_relationships_overview.cc
==============================================================================
--- trunk/glom/relationships_overview/dialog_relationships_overview.cc (original)
+++ trunk/glom/relationships_overview/dialog_relationships_overview.cc Tue Mar 17 14:42:09 2009
@@ -36,7 +36,7 @@
int Dialog_RelationshipsOverview::m_last_size_y = 0;
-Dialog_RelationshipsOverview::Dialog_RelationshipsOverview(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_RelationshipsOverview::Dialog_RelationshipsOverview(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_menu(0),
m_modified(false),
@@ -47,7 +47,7 @@
//Add a menu:
Gtk::VBox* vbox = 0;
- refGlade->get_widget("vbox_placeholder_menubar", vbox);
+ builder->get_widget("vbox_placeholder_menubar", vbox);
m_refActionGroup = Gtk::ActionGroup::create();
@@ -118,7 +118,7 @@
//Get the scolled window and add the canvas to it:
m_scrolledwindow_canvas = 0;
- refGlade->get_widget("scrolledwindow_canvas", m_scrolledwindow_canvas);
+ builder->get_widget("scrolledwindow_canvas", m_scrolledwindow_canvas);
m_scrolledwindow_canvas->add(m_canvas);
m_canvas.show();
Modified: trunk/glom/relationships_overview/dialog_relationships_overview.h
==============================================================================
--- trunk/glom/relationships_overview/dialog_relationships_overview.h (original)
+++ trunk/glom/relationships_overview/dialog_relationships_overview.h Tue Mar 17 14:42:09 2009
@@ -31,7 +31,7 @@
#include <gtkmm/printoperation.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/toggleaction.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <goocanvasmm/canvas.h>
#include <map>
#include <vector>
@@ -46,7 +46,7 @@
public View_Composite_Glom
{
public:
- Dialog_RelationshipsOverview(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_RelationshipsOverview(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_RelationshipsOverview();
virtual void load_from_document(); //overridden.
Modified: trunk/glom/reports/dialog_layout_report.cc
==============================================================================
--- trunk/glom/reports/dialog_layout_report.cc (original)
+++ trunk/glom/reports/dialog_layout_report.cc Tue Mar 17 14:42:09 2009
@@ -42,8 +42,8 @@
namespace Glom
{
-Dialog_Layout_Report::Dialog_Layout_Report(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: Dialog_Layout(cobject, refGlade, false /* No table title */),
+Dialog_Layout_Report::Dialog_Layout_Report(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: Dialog_Layout(cobject, builder, false /* No table title */),
m_notebook_parts(0),
m_treeview_parts_header(0),
m_treeview_parts_footer(0),
@@ -60,34 +60,34 @@
m_entry_title(0),
m_checkbutton_table_title(0)
{
- refGlade->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("entry_name", m_entry_name);
- refGlade->get_widget("entry_title", m_entry_title);
- refGlade->get_widget("checkbutton_table_title", m_checkbutton_table_title);
+ builder->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("entry_name", m_entry_name);
+ builder->get_widget("entry_title", m_entry_title);
+ builder->get_widget("checkbutton_table_title", m_checkbutton_table_title);
- refGlade->get_widget("button_up", m_button_up);
+ builder->get_widget("button_up", m_button_up);
m_button_up->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Report::on_button_up) );
- refGlade->get_widget("button_down", m_button_down);
+ builder->get_widget("button_down", m_button_down);
m_button_down->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Report::on_button_down) );
- refGlade->get_widget("button_delete", m_button_delete);
+ builder->get_widget("button_delete", m_button_delete);
m_button_delete->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Report::on_button_delete) );
- refGlade->get_widget("button_add", m_button_add);
+ builder->get_widget("button_add", m_button_add);
m_button_add->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Report::on_button_add) );
- refGlade->get_widget("button_edit", m_button_edit);
+ builder->get_widget("button_edit", m_button_edit);
m_button_edit->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Report::on_button_edit) );
- refGlade->get_widget("button_formatting", m_button_formatting);
+ builder->get_widget("button_formatting", m_button_formatting);
m_button_formatting->signal_clicked().connect( sigc::mem_fun(*this, &Dialog_Layout_Report::on_button_formatting) );
- refGlade->get_widget("notebook_parts", m_notebook_parts);
+ builder->get_widget("notebook_parts", m_notebook_parts);
m_notebook_parts->set_current_page(1); //The main part, because it is used most often.
//Available parts:
- refGlade->get_widget("treeview_available_parts", m_treeview_available_parts);
+ builder->get_widget("treeview_available_parts", m_treeview_available_parts);
if(m_treeview_available_parts)
{
//Add list of available parts:
@@ -165,11 +165,11 @@
}
}
- refGlade->get_widget("treeview_parts_header", m_treeview_parts_header);
+ builder->get_widget("treeview_parts_header", m_treeview_parts_header);
setup_model(*m_treeview_parts_header, m_model_parts_header);
- refGlade->get_widget("treeview_parts_footer", m_treeview_parts_footer);
+ builder->get_widget("treeview_parts_footer", m_treeview_parts_footer);
setup_model(*m_treeview_parts_footer, m_model_parts_footer);
- refGlade->get_widget("treeview_parts_main", m_treeview_parts_main);
+ builder->get_widget("treeview_parts_main", m_treeview_parts_main);
setup_model(*m_treeview_parts_main, m_model_parts_main);
@@ -691,7 +691,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_relationship");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_relationship");
Dialog_ChooseRelationship* dialog = 0;
refXml->get_widget_derived("dialog_choose_relationship", dialog);
@@ -711,7 +711,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -828,7 +828,7 @@
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_field_summary");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_field_summary");
Dialog_FieldSummary* dialog = 0;
refXml->get_widget_derived("dialog_field_summary", dialog);
@@ -859,7 +859,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -910,7 +910,7 @@
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_group_by");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_group_by");
Dialog_GroupBy* dialog = 0;
refXml->get_widget_derived("dialog_group_by", dialog);
@@ -940,7 +940,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/reports/dialog_layout_report.h
==============================================================================
--- trunk/glom/reports/dialog_layout_report.h (original)
+++ trunk/glom/reports/dialog_layout_report.h Tue Mar 17 14:42:09 2009
@@ -33,7 +33,7 @@
class Dialog_Layout_Report : public Dialog_Layout
{
public:
- Dialog_Layout_Report(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Layout_Report(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Layout_Report();
void set_report(const Glib::ustring& table_name, const sharedptr<const Report>& report);
Modified: trunk/glom/translation/combobox_locale.cc
==============================================================================
--- trunk/glom/translation/combobox_locale.cc (original)
+++ trunk/glom/translation/combobox_locale.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-ComboBox_Locale::ComboBox_Locale(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboBox_Locale::ComboBox_Locale(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBox(cobject)
{
m_model = Gtk::ListStore::create(m_model_columns);
Modified: trunk/glom/translation/combobox_locale.h
==============================================================================
--- trunk/glom/translation/combobox_locale.h (original)
+++ trunk/glom/translation/combobox_locale.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include <libglom/data_structure/iso_codes.h>
#include <gtkmm/combobox.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/liststore.h>
@@ -34,7 +34,7 @@
class ComboBox_Locale : public Gtk::ComboBox
{
public:
- ComboBox_Locale(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ ComboBox_Locale(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~ComboBox_Locale();
void set_selected_locale(const Glib::ustring& locale);
Modified: trunk/glom/translation/dialog_change_language.cc
==============================================================================
--- trunk/glom/translation/dialog_change_language.cc (original)
+++ trunk/glom/translation/dialog_change_language.cc Tue Mar 17 14:42:09 2009
@@ -24,11 +24,11 @@
namespace Glom
{
-Dialog_ChangeLanguage::Dialog_ChangeLanguage(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ChangeLanguage::Dialog_ChangeLanguage(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_combo_locale(0)
{
- refGlade->get_widget_derived("combobox_locale", m_combo_locale);
+ builder->get_widget_derived("combobox_locale", m_combo_locale);
m_combo_locale->set_selected_locale(TranslatableItem::get_current_locale());
}
Modified: trunk/glom/translation/dialog_change_language.h
==============================================================================
--- trunk/glom/translation/dialog_change_language.h (original)
+++ trunk/glom/translation/dialog_change_language.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_TRANSLATIONS_DIALOG_CHANGE_LANGUAGE_H
#include "combobox_locale.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
namespace Glom
@@ -34,7 +34,7 @@
: public Gtk::Dialog
{
public:
- Dialog_ChangeLanguage(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ChangeLanguage(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ChangeLanguage();
Glib::ustring get_locale() const;
Modified: trunk/glom/translation/dialog_copy_translation.cc
==============================================================================
--- trunk/glom/translation/dialog_copy_translation.cc (original)
+++ trunk/glom/translation/dialog_copy_translation.cc Tue Mar 17 14:42:09 2009
@@ -25,11 +25,11 @@
namespace Glom
{
-Dialog_CopyTranslation::Dialog_CopyTranslation(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_CopyTranslation::Dialog_CopyTranslation(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_combo_locale(0)
{
- refGlade->get_widget_derived("combobox_locale", m_combo_locale);
+ builder->get_widget_derived("combobox_locale", m_combo_locale);
m_combo_locale->set_selected_locale(TranslatableItem::get_current_locale());
}
Modified: trunk/glom/translation/dialog_copy_translation.h
==============================================================================
--- trunk/glom/translation/dialog_copy_translation.h (original)
+++ trunk/glom/translation/dialog_copy_translation.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include "combobox_locale.h"
#include <libglom/document/document_glom.h> // For View_Composite_Glom
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
namespace Glom
@@ -35,7 +35,7 @@
: public Gtk::Dialog
{
public:
- Dialog_CopyTranslation(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_CopyTranslation(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_CopyTranslation();
Glib::ustring get_locale() const;
Modified: trunk/glom/translation/dialog_identify_original.cc
==============================================================================
--- trunk/glom/translation/dialog_identify_original.cc (original)
+++ trunk/glom/translation/dialog_identify_original.cc Tue Mar 17 14:42:09 2009
@@ -26,13 +26,13 @@
namespace Glom
{
-Dialog_IdentifyOriginal::Dialog_IdentifyOriginal(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_IdentifyOriginal::Dialog_IdentifyOriginal(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_original(0),
m_combo_locale(0)
{
- refGlade->get_widget("label_original", m_label_original);
- refGlade->get_widget_derived("combobox_locale", m_combo_locale);
+ builder->get_widget("label_original", m_label_original);
+ builder->get_widget_derived("combobox_locale", m_combo_locale);
m_combo_locale->set_selected_locale(TranslatableItem::get_current_locale());
}
Modified: trunk/glom/translation/dialog_identify_original.h
==============================================================================
--- trunk/glom/translation/dialog_identify_original.h (original)
+++ trunk/glom/translation/dialog_identify_original.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include "combobox_locale.h"
#include <libglom/document/view.h> // For View_Glom
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/dialog.h>
namespace Glom
@@ -36,7 +36,7 @@
public View_Glom
{
public:
- Dialog_IdentifyOriginal(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_IdentifyOriginal(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_IdentifyOriginal();
Glib::ustring get_locale() const;
Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc (original)
+++ trunk/glom/translation/window_translations.cc Tue Mar 17 14:42:09 2009
@@ -42,7 +42,7 @@
namespace Glom
{
-Window_Translations::Window_Translations(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Window_Translations::Window_Translations(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
m_treeview(0),
m_button_identify(0),
@@ -54,9 +54,9 @@
m_button_export(0),
m_treeview_modified(false)
{
- refGlade->get_widget("label_source_locale", m_label_source_locale);
+ builder->get_widget("label_source_locale", m_label_source_locale);
- refGlade->get_widget("treeview", m_treeview);
+ builder->get_widget("treeview", m_treeview);
if(m_treeview)
{
m_model = Gtk::ListStore::create(m_columns);
@@ -85,25 +85,25 @@
renderer->signal_edited().connect(sigc::mem_fun(*this, &Window_Translations::on_treeview_edited));
}
- refGlade->get_widget("button_identify", m_button_identify);
+ builder->get_widget("button_identify", m_button_identify);
m_button_identify->signal_clicked().connect( sigc::mem_fun(*this, &Window_Translations::on_button_identify) );
- refGlade->get_widget_derived("combobox_target_locale", m_combo_target_locale);
+ builder->get_widget_derived("combobox_target_locale", m_combo_target_locale);
m_combo_target_locale->signal_changed().connect(sigc::mem_fun(*this, &Window_Translations::on_combo_target_locale_changed));
- refGlade->get_widget("button_ok", m_button_ok);
+ builder->get_widget("button_ok", m_button_ok);
m_button_ok->signal_clicked().connect( sigc::mem_fun(*this, &Window_Translations::on_button_ok) );
- refGlade->get_widget("button_cancel", m_button_cancel);
+ builder->get_widget("button_cancel", m_button_cancel);
m_button_cancel->signal_clicked().connect( sigc::mem_fun(*this, &Window_Translations::on_button_cancel) );
- refGlade->get_widget("button_copy_translation", m_button_copy_translation);
+ builder->get_widget("button_copy_translation", m_button_copy_translation);
m_button_copy_translation->signal_clicked().connect( sigc::mem_fun(*this, &Window_Translations::on_button_copy_translation) );
- refGlade->get_widget("button_import", m_button_import);
+ builder->get_widget("button_import", m_button_import);
m_button_import->signal_clicked().connect( sigc::mem_fun(*this, &Window_Translations::on_button_import) );
- refGlade->get_widget("button_export", m_button_export);
+ builder->get_widget("button_export", m_button_export);
m_button_export->signal_clicked().connect( sigc::mem_fun(*this, &Window_Translations::on_button_export) );
show_all_children();
@@ -129,7 +129,7 @@
void Window_Translations::on_button_identify()
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_translation_identify_original");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_translation_identify_original");
if(refXml)
{
Dialog_IdentifyOriginal* dialog = 0;
@@ -359,7 +359,7 @@
void Window_Translations::on_button_copy_translation()
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_translation_copy");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_translation_copy");
if(refXml)
{
Dialog_CopyTranslation* dialog = 0;
Modified: trunk/glom/translation/window_translations.h
==============================================================================
--- trunk/glom/translation/window_translations.h (original)
+++ trunk/glom/translation/window_translations.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include <libglom/document/view.h>
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gettext-po.h>
@@ -37,7 +37,7 @@
public View_Composite_Glom //So it can use the document.
{
public:
- Window_Translations(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Window_Translations(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Window_Translations();
virtual void load_from_document(); //override
Modified: trunk/glom/utility_widgets/adddel/adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.cc (original)
+++ trunk/glom/utility_widgets/adddel/adddel.cc Tue Mar 17 14:42:09 2009
@@ -86,7 +86,7 @@
}
-AddDel::AddDel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+AddDel::AddDel(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::VBox(cobject),
m_col_key(0),
m_pMenuPopup(0),
Modified: trunk/glom/utility_widgets/adddel/adddel.h
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.h (original)
+++ trunk/glom/utility_widgets/adddel/adddel.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include <libgdamm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <vector>
#include <map>
@@ -69,7 +69,7 @@
friend class InnerIgnore; //declared below.
AddDel();
- AddDel(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ AddDel(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~AddDel();
void set_allow_user_actions(bool bVal = true);
Modified: trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc (original)
+++ trunk/glom/utility_widgets/adddel/adddel_withbuttons.cc Tue Mar 17 14:42:09 2009
@@ -34,8 +34,8 @@
init();
}
-AddDel_WithButtons::AddDel_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
-: AddDel(cobject, refGlade),
+AddDel_WithButtons::AddDel_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
+: AddDel(cobject, builder),
m_HBox(false, Utils::DEFAULT_SPACING_SMALL),
m_Button_Add(Gtk::Stock::ADD),
m_Button_Del(Gtk::Stock::DELETE),
Modified: trunk/glom/utility_widgets/adddel/adddel_withbuttons.h
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel_withbuttons.h (original)
+++ trunk/glom/utility_widgets/adddel/adddel_withbuttons.h Tue Mar 17 14:42:09 2009
@@ -30,7 +30,7 @@
{
public:
AddDel_WithButtons();
- AddDel_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ AddDel_WithButtons(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~AddDel_WithButtons();
virtual void set_allow_add(bool val = true); //override
Modified: trunk/glom/utility_widgets/buttonglom.cc
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.cc (original)
+++ trunk/glom/utility_widgets/buttonglom.cc Tue Mar 17 14:42:09 2009
@@ -32,7 +32,7 @@
namespace Glom
{
-ButtonGlom::ButtonGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ButtonGlom::ButtonGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::Button(cobject)
{
init();
@@ -65,7 +65,7 @@
{
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_button_script");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_button_script");
Dialog_ButtonScript* dialog = 0;
refXml->get_widget_derived("window_button_script", dialog);
@@ -86,7 +86,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/utility_widgets/buttonglom.h
==============================================================================
--- trunk/glom/utility_widgets/buttonglom.h (original)
+++ trunk/glom/utility_widgets/buttonglom.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include <gtkmm.h>
#include "layoutwidgetutils.h"
#include <libglom/data_structure/layout/layoutitem_button.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -36,7 +36,7 @@
public LayoutWidgetUtils
{
public:
- explicit ButtonGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit ButtonGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
explicit ButtonGlom();
virtual ~ButtonGlom();
Modified: trunk/glom/utility_widgets/checkglom.h
==============================================================================
--- trunk/glom/utility_widgets/checkglom.h (original)
+++ trunk/glom/utility_widgets/checkglom.h Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
Modified: trunk/glom/utility_widgets/combo_textglade.cc
==============================================================================
--- trunk/glom/utility_widgets/combo_textglade.cc (original)
+++ trunk/glom/utility_widgets/combo_textglade.cc Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
namespace Glom
{
-Combo_TextGlade::Combo_TextGlade(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+Combo_TextGlade::Combo_TextGlade(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBoxText(cobject)
{
}
Modified: trunk/glom/utility_widgets/combo_textglade.h
==============================================================================
--- trunk/glom/utility_widgets/combo_textglade.h (original)
+++ trunk/glom/utility_widgets/combo_textglade.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define GLOM_MODE_DESIGN_COMBO_TEXTGLADE_HH
#include <gtkmm/comboboxtext.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/liststore.h>
@@ -34,7 +34,7 @@
class Combo_TextGlade : public Gtk::ComboBoxText
{
public:
- Combo_TextGlade(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Combo_TextGlade(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
///This ensures that something is selected,
void set_first_active();
Modified: trunk/glom/utility_widgets/comboentry_currency.cc
==============================================================================
--- trunk/glom/utility_widgets/comboentry_currency.cc (original)
+++ trunk/glom/utility_widgets/comboentry_currency.cc Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
namespace Glom
{
-ComboEntry_Currency::ComboEntry_Currency(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboEntry_Currency::ComboEntry_Currency(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBoxEntry(cobject)
{
m_model = Gtk::ListStore::create(m_model_columns);
Modified: trunk/glom/utility_widgets/comboentry_currency.h
==============================================================================
--- trunk/glom/utility_widgets/comboentry_currency.h (original)
+++ trunk/glom/utility_widgets/comboentry_currency.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include <libglom/data_structure/iso_codes.h>
#include <gtkmm/comboboxentry.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include <gtkmm/liststore.h>
@@ -34,7 +34,7 @@
class ComboEntry_Currency : public Gtk::ComboBoxEntry
{
public:
- ComboEntry_Currency(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ ComboEntry_Currency(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~ComboEntry_Currency();
private:
Modified: trunk/glom/utility_widgets/comboentryglom.cc
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.cc (original)
+++ trunk/glom/utility_widgets/comboentryglom.cc Tue Mar 17 14:42:09 2009
@@ -34,7 +34,7 @@
namespace Glom
{
-ComboEntryGlom::ComboEntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboEntryGlom::ComboEntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBoxEntry(cobject)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/utility_widgets/comboentryglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboentryglom.h (original)
+++ trunk/glom/utility_widgets/comboentryglom.h Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include "comboglomchoicesbase.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -38,7 +38,7 @@
public ComboGlomChoicesBase
{
public:
- explicit ComboEntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit ComboEntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
///You must call set_layout_item() to specify the field type and formatting of the main column.
explicit ComboEntryGlom();
Modified: trunk/glom/utility_widgets/comboglom.cc
==============================================================================
--- trunk/glom/utility_widgets/comboglom.cc (original)
+++ trunk/glom/utility_widgets/comboglom.cc Tue Mar 17 14:42:09 2009
@@ -34,7 +34,7 @@
namespace Glom
{
-ComboGlom::ComboGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ComboGlom::ComboGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ComboBox(cobject)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/utility_widgets/comboglom.h
==============================================================================
--- trunk/glom/utility_widgets/comboglom.h (original)
+++ trunk/glom/utility_widgets/comboglom.h Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include "comboglomchoicesbase.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -38,7 +38,7 @@
public ComboGlomChoicesBase
{
public:
- explicit ComboGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit ComboGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
///You must call set_layout_item() to specify the field type and formatting of the main column.
explicit ComboGlom();
Modified: trunk/glom/utility_widgets/datawidget.cc
==============================================================================
--- trunk/glom/utility_widgets/datawidget.cc (original)
+++ trunk/glom/utility_widgets/datawidget.cc Tue Mar 17 14:42:09 2009
@@ -588,21 +588,21 @@
{
sharedptr<LayoutItem_Field> result;
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field");
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field");
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
return result;
}
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field", "", error);
+ std::auto_ptr<Gtk::BuilderError> error;
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_field", "", error);
if(error.get())
{
std::cerr << error->what() << std::endl;
@@ -638,7 +638,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_layout_field_properties");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_layout_field_properties");
Dialog_FieldLayout* dialog = 0;
refXml->get_widget_derived("dialog_layout_field_properties", dialog);
@@ -660,7 +660,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
@@ -771,20 +771,20 @@
void DataWidget::on_button_choose_date()
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_date");
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_date");
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
return;
}
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_date", "", error);
+ std::auto_ptr<Gtk::BuilderError> error;
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "dialog_choose_date", "", error);
if(error.get())
{
std::cerr << error->what() << std::endl;
@@ -828,20 +828,20 @@
//Initialize output variable:
chosen_id = Gnome::Gda::Value();
- Glib::RefPtr<Gnome::Glade::Xml> refXml;
+ Glib::RefPtr<Gtk::Builder> refXml;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_find_id");
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_find_id");
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Glib::Error& ex)
{
std::cerr << ex.what() << std::endl;
return result;
}
#else
- std::auto_ptr<Gnome::Glade::XmlError> error;
- refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom.glade"), "dialog_find_id", "", error);
+ std::auto_ptr<Glib::Error> error;
+ refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom.glade"), "dialog_find_id", "", error);
if(error.get())
{
std::cerr << error->what() << std::endl;
Modified: trunk/glom/utility_widgets/datawidget.h
==============================================================================
--- trunk/glom/utility_widgets/datawidget.h (original)
+++ trunk/glom/utility_widgets/datawidget.h Tue Mar 17 14:42:09 2009
@@ -42,7 +42,7 @@
public View_Composite_Glom
{
public:
- //explicit DataWidget(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ //explicit DataWidget(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
explicit DataWidget(const sharedptr<LayoutItem_Field>& field, const Glib::ustring& table_name, const Document_Glom* document);
virtual ~DataWidget();
Modified: trunk/glom/utility_widgets/dialog_choose_date.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_date.cc (original)
+++ trunk/glom/utility_widgets/dialog_choose_date.cc Tue Mar 17 14:42:09 2009
@@ -31,11 +31,11 @@
{
}
-Dialog_ChooseDate::Dialog_ChooseDate(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ChooseDate::Dialog_ChooseDate(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_calendar(0)
{
- refGlade->get_widget("calendar", m_calendar);
+ builder->get_widget("calendar", m_calendar);
m_calendar->signal_day_selected_double_click().connect(sigc::mem_fun(*this, &Dialog_ChooseDate::on_day_selected_double_click));
}
Modified: trunk/glom/utility_widgets/dialog_choose_date.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_date.h (original)
+++ trunk/glom/utility_widgets/dialog_choose_date.h Tue Mar 17 14:42:09 2009
@@ -35,7 +35,7 @@
{
public:
Dialog_ChooseDate();
- Dialog_ChooseDate(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ChooseDate(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ChooseDate();
void set_date_chosen(const Gnome::Gda::Value& value);
Modified: trunk/glom/utility_widgets/dialog_choose_id.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_id.cc (original)
+++ trunk/glom/utility_widgets/dialog_choose_id.cc Tue Mar 17 14:42:09 2009
@@ -44,7 +44,7 @@
{
}
-Dialog_ChooseID::Dialog_ChooseID(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_ChooseID::Dialog_ChooseID(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_label_table_name(0),
m_pBox_QuickFind(0),
@@ -54,15 +54,15 @@
m_document(0),
m_stage(STAGE_INVALID)
{
- refGlade->get_widget("label_table_name", m_label_table_name);
- refGlade->get_widget("alignment_parent", m_alignment_parent);
+ builder->get_widget("label_table_name", m_label_table_name);
+ builder->get_widget("alignment_parent", m_alignment_parent);
- refGlade->get_widget("hbox_quickfind", m_pBox_QuickFind);
- refGlade->get_widget("entry_quickfind", m_pEntry_QuickFind);
+ builder->get_widget("hbox_quickfind", m_pBox_QuickFind);
+ builder->get_widget("entry_quickfind", m_pEntry_QuickFind);
m_pEntry_QuickFind->signal_activate().connect(
sigc::mem_fun(*this, &Dialog_ChooseID::on_button_quickfind) ); //Pressing Enter here is like pressing Find.
- refGlade->get_widget("button_quickfind", m_pButton_QuickFind);
+ builder->get_widget("button_quickfind", m_pButton_QuickFind);
m_pButton_QuickFind->signal_clicked().connect(
sigc::mem_fun(*this, &Dialog_ChooseID::on_button_quickfind) );
Modified: trunk/glom/utility_widgets/dialog_choose_id.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_choose_id.h (original)
+++ trunk/glom/utility_widgets/dialog_choose_id.h Tue Mar 17 14:42:09 2009
@@ -36,7 +36,7 @@
{
public:
Dialog_ChooseID();
- Dialog_ChooseID(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_ChooseID(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_ChooseID();
virtual bool init_db_details(const Glib::ustring& table_name, const Glib::ustring& layout_platform);
Modified: trunk/glom/utility_widgets/dialog_flowtable.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_flowtable.cc (original)
+++ trunk/glom/utility_widgets/dialog_flowtable.cc Tue Mar 17 14:42:09 2009
@@ -25,14 +25,14 @@
namespace Glom
{
-Dialog_FlowTable::Dialog_FlowTable(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_FlowTable::Dialog_FlowTable(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject),
m_entry_title(0),
m_spin_columns(0),
m_flowtable(0)
{
- refGlade->get_widget("entry_title", m_entry_title);
- refGlade->get_widget("spin_columns", m_spin_columns);
+ builder->get_widget("entry_title", m_entry_title);
+ builder->get_widget("spin_columns", m_spin_columns);
show_all_children();
}
Modified: trunk/glom/utility_widgets/dialog_flowtable.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_flowtable.h (original)
+++ trunk/glom/utility_widgets/dialog_flowtable.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define DIALOG_FLOWTABLE_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
#include "../mode_data/flowtablewithfields.h"
#include "../base_db.h"
@@ -35,7 +35,7 @@
{
public:
- Dialog_FlowTable(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_FlowTable(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_FlowTable();
void set_flowtable(FlowTableWithFields* flowtable);
Modified: trunk/glom/utility_widgets/dialog_layoutitem_properties.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_layoutitem_properties.cc (original)
+++ trunk/glom/utility_widgets/dialog_layoutitem_properties.cc Tue Mar 17 14:42:09 2009
@@ -23,10 +23,10 @@
namespace Glom
{
-Dialog_LayoutItem_Properties::Dialog_LayoutItem_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_LayoutItem_Properties::Dialog_LayoutItem_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Dialog(cobject)
{
- refGlade->get_widget("entry_label", m_pEntryLabel);
+ builder->get_widget("entry_label", m_pEntryLabel);
show_all_children ();
}
Modified: trunk/glom/utility_widgets/dialog_layoutitem_properties.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_layoutitem_properties.h (original)
+++ trunk/glom/utility_widgets/dialog_layoutitem_properties.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,7 @@
#define DIALOG_LAYOUTITEM_PROPERTIES_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -30,7 +30,7 @@
class Dialog_LayoutItem_Properties : public Gtk::Dialog
{
public:
- Dialog_LayoutItem_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_LayoutItem_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
//virtual ~Dialog_LayoutItem_Properties();
Glib::ustring get_label() const;
Modified: trunk/glom/utility_widgets/dialog_properties.cc
==============================================================================
--- trunk/glom/utility_widgets/dialog_properties.cc (original)
+++ trunk/glom/utility_widgets/dialog_properties.cc Tue Mar 17 14:42:09 2009
@@ -24,13 +24,13 @@
namespace Glom
{
-Dialog_Properties::Dialog_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade)
+Dialog_Properties::Dialog_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder)
: Gtk::Window(cobject),
m_block(false),
m_modified(false)
{
- refGlade->get_widget("button_cancel", m_pButton_Cancel);
- refGlade->get_widget("button_save", m_pButton_Save);
+ builder->get_widget("button_cancel", m_pButton_Cancel);
+ builder->get_widget("button_save", m_pButton_Save);
//In general, we don't want to allow changes to windows underneath while editing properties.
//Also, if we don't set this then seconday windows (from a modal dialog) will be on top but unusable.
Modified: trunk/glom/utility_widgets/dialog_properties.h
==============================================================================
--- trunk/glom/utility_widgets/dialog_properties.h (original)
+++ trunk/glom/utility_widgets/dialog_properties.h Tue Mar 17 14:42:09 2009
@@ -22,7 +22,9 @@
#define GLOM_DIALOG_PROPERTIES_H
#include <gtkmm/window.h>
-#include "placeholder.h"
+#include <gtkmm/treemodel.h>
+#include <gtkmm/button.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -30,7 +32,7 @@
class Dialog_Properties : public Gtk::Window
{
public:
- Dialog_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ Dialog_Properties(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~Dialog_Properties();
//Add a widget (probably a container) to the top half of the dialog:
Modified: trunk/glom/utility_widgets/entryglom.cc
==============================================================================
--- trunk/glom/utility_widgets/entryglom.cc (original)
+++ trunk/glom/utility_widgets/entryglom.cc Tue Mar 17 14:42:09 2009
@@ -34,7 +34,7 @@
namespace Glom
{
-EntryGlom::EntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+EntryGlom::EntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::Entry(cobject),
m_glom_type(Field::TYPE_TEXT)
{
Modified: trunk/glom/utility_widgets/entryglom.h
==============================================================================
--- trunk/glom/utility_widgets/entryglom.h (original)
+++ trunk/glom/utility_widgets/entryglom.h Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -38,7 +38,7 @@
public LayoutWidgetField
{
public:
- explicit EntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit EntryGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
explicit EntryGlom(Field::glom_field_type glom_type = Field::TYPE_TEXT);
virtual ~EntryGlom();
Modified: trunk/glom/utility_widgets/imageglom.cc
==============================================================================
--- trunk/glom/utility_widgets/imageglom.cc (original)
+++ trunk/glom/utility_widgets/imageglom.cc Tue Mar 17 14:42:09 2009
@@ -36,7 +36,7 @@
init();
}
-ImageGlom::ImageGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+ImageGlom::ImageGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::EventBox(cobject),
m_image(Gtk::Stock::MISSING_IMAGE, Gtk::ICON_SIZE_DIALOG), //The widget is invisible if we don't specify an image.
m_pMenuPopup_UserMode(0)
Modified: trunk/glom/utility_widgets/imageglom.h
==============================================================================
--- trunk/glom/utility_widgets/imageglom.h (original)
+++ trunk/glom/utility_widgets/imageglom.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -37,7 +37,7 @@
{
public:
ImageGlom();
- explicit ImageGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit ImageGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~ImageGlom();
Modified: trunk/glom/utility_widgets/labelglom.cc
==============================================================================
--- trunk/glom/utility_widgets/labelglom.cc (original)
+++ trunk/glom/utility_widgets/labelglom.cc Tue Mar 17 14:42:09 2009
@@ -70,7 +70,7 @@
try
{
- Glib::RefPtr<Gnome::Glade::Xml> refXml = Gnome::Glade::Xml::create(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
+ Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_textobject");
Dialog_TextObject* dialog = 0;
refXml->get_widget_derived("window_textobject", dialog);
@@ -90,7 +90,7 @@
delete dialog;
}
}
- catch(const Gnome::Glade::XmlError& ex)
+ catch(const Gtk::BuilderError& ex)
{
std::cerr << ex.what() << std::endl;
}
Modified: trunk/glom/utility_widgets/labelglom.h
==============================================================================
--- trunk/glom/utility_widgets/labelglom.h (original)
+++ trunk/glom/utility_widgets/labelglom.h Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
#include "layoutwidgetbase.h"
#include "layoutwidgetutils.h"
#include <libglom/data_structure/layout/layoutitem_button.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
Modified: trunk/glom/utility_widgets/notebookglom.cc
==============================================================================
--- trunk/glom/utility_widgets/notebookglom.cc (original)
+++ trunk/glom/utility_widgets/notebookglom.cc Tue Mar 17 14:42:09 2009
@@ -27,7 +27,7 @@
namespace Glom
{
-NotebookGlom::NotebookGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+NotebookGlom::NotebookGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::Notebook(cobject)
{
#ifndef GLOM_ENABLE_CLIENT_ONLY
Modified: trunk/glom/utility_widgets/notebookglom.h
==============================================================================
--- trunk/glom/utility_widgets/notebookglom.h (original)
+++ trunk/glom/utility_widgets/notebookglom.h Tue Mar 17 14:42:09 2009
@@ -24,7 +24,7 @@
#include <gtkmm.h>
#include "layoutwidgetmenu.h"
#include <libglom/data_structure/layout/layoutitem_notebook.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -36,7 +36,7 @@
public LayoutWidgetMenu
{
public:
- explicit NotebookGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit NotebookGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
explicit NotebookGlom();
virtual ~NotebookGlom();
Modified: trunk/glom/utility_widgets/notebooklabelglom.h
==============================================================================
--- trunk/glom/utility_widgets/notebooklabelglom.h (original)
+++ trunk/glom/utility_widgets/notebooklabelglom.h Tue Mar 17 14:42:09 2009
@@ -23,7 +23,7 @@
#include <gtkmm.h>
#include "notebookglom.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
Modified: trunk/glom/utility_widgets/placeholder-glom.h
==============================================================================
--- trunk/glom/utility_widgets/placeholder-glom.h (original)
+++ trunk/glom/utility_widgets/placeholder-glom.h Tue Mar 17 14:42:09 2009
@@ -25,7 +25,7 @@
#include <gtkmm.h>
#include "layoutwidgetbase.h"
//#include <libglom/data_structure/layout/layoutitem_button.h>
-//#include <libglademm.h>
+//#include <gtkmm/builder.h>
#ifndef GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
#define GLOM_UTILITY_WIDGETS_PLACEHOLDER_GLOM_H_
@@ -38,7 +38,7 @@
public LayoutWidgetBase
{
public:
- //explicit PlaceholderGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ //explicit PlaceholderGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
explicit PlaceholderGlom();
virtual ~PlaceholderGlom();
Modified: trunk/glom/utility_widgets/placeholder.cc
==============================================================================
--- trunk/glom/utility_widgets/placeholder.cc (original)
+++ trunk/glom/utility_widgets/placeholder.cc Tue Mar 17 14:42:09 2009
@@ -28,7 +28,7 @@
{
}
-PlaceHolder::PlaceHolder(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /*refGlade*/)
+PlaceHolder::PlaceHolder(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /*builder*/)
: Gtk::VBox(cobject),
m_pChild(0)
{
Modified: trunk/glom/utility_widgets/placeholder.h
==============================================================================
--- trunk/glom/utility_widgets/placeholder.h (original)
+++ trunk/glom/utility_widgets/placeholder.h Tue Mar 17 14:42:09 2009
@@ -22,16 +22,17 @@
#define GLOM_UTILITY_WIDGETS_PLACEHOLDER_H
#include <gtkmm.h>
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
+//TODO: Remove this, using the vbox directly?
class PlaceHolder : public Gtk::VBox
{
public:
PlaceHolder();
- PlaceHolder(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ PlaceHolder(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
virtual ~PlaceHolder();
virtual void add(Gtk::Widget& child);
Modified: trunk/glom/utility_widgets/textviewglom.cc
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.cc (original)
+++ trunk/glom/utility_widgets/textviewglom.cc Tue Mar 17 14:42:09 2009
@@ -34,7 +34,7 @@
namespace Glom
{
-TextViewGlom::TextViewGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& /* refGlade */)
+TextViewGlom::TextViewGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& /* builder */)
: Gtk::ScrolledWindow(cobject),
m_glom_type(Field::TYPE_TEXT)
{
Modified: trunk/glom/utility_widgets/textviewglom.h
==============================================================================
--- trunk/glom/utility_widgets/textviewglom.h (original)
+++ trunk/glom/utility_widgets/textviewglom.h Tue Mar 17 14:42:09 2009
@@ -26,7 +26,7 @@
#include <gtkmm.h>
#include <libglom/data_structure/field.h>
#include "layoutwidgetfield.h"
-#include <libglademm.h>
+#include <gtkmm/builder.h>
namespace Glom
{
@@ -38,7 +38,7 @@
public LayoutWidgetField
{
public:
- explicit TextViewGlom(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
+ explicit TextViewGlom(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& builder);
explicit TextViewGlom(Field::glom_field_type glom_type = Field::TYPE_TEXT);
virtual ~TextViewGlom();
Added: trunk/glom/variablesmap.cc
==============================================================================
--- (empty file)
+++ trunk/glom/variablesmap.cc Tue Mar 17 14:42:09 2009
@@ -0,0 +1,203 @@
+/* variablesmap.cc
+ *
+ * Copyright (C) 2002 The libglademm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glom/variablesmap.h>
+#include <gtkmm/togglebutton.h>
+#include <gtkmm/entry.h>
+#include <gtkmm/calendar.h>
+#include <gtkmm/scale.h>
+#include <gtkmm/comboboxentry.h>
+
+namespace Glom
+{
+
+VariablesMap::VariablesMap(const Glib::RefPtr<Gtk::Builder>& builder)
+: m_builder(builder)
+{
+}
+
+VariablesMap::~VariablesMap()
+{
+}
+
+
+void VariablesMap::connect_widget(const Glib::ustring& widget_name, bool& variable)
+{
+ Gtk::ToggleButton* pToggleButton = 0;
+ m_builder->get_widget(widget_name, pToggleButton); //Glade::Xml will complain if it is not a ToggleButton.
+ if(pToggleButton)
+ {
+ m_mapWidgetsToVariables[pToggleButton] = (void*)(&variable);
+ }
+}
+
+void VariablesMap::connect_widget(const Glib::ustring& widget_name, Glib::ustring& variable)
+{
+ Gtk::Widget* pWidget = 0;
+ m_builder->get_widget(widget_name, pWidget);
+
+ Gtk::Entry* pEntry = dynamic_cast<Gtk::Entry*>(pWidget); //it mange both Gtk::entry and Gtk::SpinButton
+ Gtk::ComboBoxEntry* pComboBoxEntry = dynamic_cast<Gtk::ComboBoxEntry*>(pWidget);
+ if(pEntry)
+ {
+ m_mapWidgetsToVariables[pEntry] = (void*)(&variable);
+ }
+ if(pComboBoxEntry)
+ {
+ m_mapWidgetsToVariables[pComboBoxEntry] = (void*)(&variable);
+ }
+}
+
+void VariablesMap::connect_widget(const Glib::ustring& widget_name, double& variable)
+{
+ Gtk::Widget* pWidget = 0;
+ m_builder->get_widget(widget_name, pWidget);
+
+ Gtk::Scale* pScale = dynamic_cast<Gtk::Scale*>(pWidget);
+ if(pScale)
+ {
+ m_mapWidgetsToVariables[pScale] = (void*)(&variable);
+ }
+}
+
+void VariablesMap::connect_widget(const Glib::ustring& widget_name, Glib::Date& variable)
+{
+ Gtk::Widget* pWidget = 0;
+ m_builder->get_widget(widget_name, pWidget);
+
+ Gtk::Calendar* pCalendar = dynamic_cast<Gtk::Calendar*>(pWidget);
+ if(pCalendar)
+ {
+ m_mapWidgetsToVariables[pCalendar] = (void*)(&variable);
+ }
+}
+
+void VariablesMap::transfer_widgets_to_variables()
+{
+ if(validate_widgets()) //If the widgets' data is correct. Useful to override.
+ {
+ for(type_mapWidgetsToVariables::iterator iter = m_mapWidgetsToVariables.begin(); iter != m_mapWidgetsToVariables.end(); ++iter)
+ {
+ transfer_one_widget(iter->first, true); //true = to_variable.
+ }
+ }
+}
+
+void VariablesMap::transfer_variables_to_widgets()
+{
+ for(type_mapWidgetsToVariables::iterator iter = m_mapWidgetsToVariables.begin(); iter != m_mapWidgetsToVariables.end(); ++iter)
+ {
+ transfer_one_widget(iter->first, false); //false = to_widget.
+ }
+}
+
+
+void VariablesMap::transfer_one_widget(Gtk::Widget* pWidget, bool to_variable)
+{
+ //Find the widget in the map:
+ type_mapWidgetsToVariables::iterator iterFind = m_mapWidgetsToVariables.find(pWidget);
+ if(iterFind != m_mapWidgetsToVariables.end())
+ {
+ //Get the variable for the widget:
+ void* pVariable = iterFind->second;
+ if(pVariable)
+ {
+ //Cast the variable appropriately and set it appropriately:
+ Gtk::Entry* pEntry = dynamic_cast<Gtk::Entry*>(pWidget);
+ Gtk::ComboBoxEntry* pComboBoxEntry = dynamic_cast<Gtk::ComboBoxEntry*>(pWidget);
+
+ Gtk::ToggleButton* pToggleButton = dynamic_cast<Gtk::ToggleButton*>(pWidget); //CheckButtons and RadioButtons.
+ Gtk::Scale* pScale = dynamic_cast<Gtk::Scale*>(pWidget);
+ Gtk::Calendar* pCalendar = dynamic_cast<Gtk::Calendar*>(pWidget);
+
+ if(pEntry)
+ {
+ Glib::ustring* pVar = (Glib::ustring*)(pVariable);
+
+ if(to_variable)
+ (*pVar) = pEntry->get_text();
+ else
+ pEntry->set_text(*pVar);
+ }
+
+ if(pComboBoxEntry)
+ {
+ Glib::ustring* pVar = (Glib::ustring*)(pVariable);
+ Gtk::Entry* pIEntry = dynamic_cast<Gtk::Entry*>(pComboBoxEntry->get_child());
+
+ if(to_variable)
+ {
+ if(pIEntry)
+ (*pVar) = pIEntry->get_text();
+ } else {
+ if(pIEntry)
+ pIEntry->set_text(*pVar);
+ }
+ }
+
+ if(pToggleButton)
+ {
+ bool* pVar = (bool*)(pVariable);
+
+ if(to_variable)
+ (*pVar) = pToggleButton->get_active();
+ else
+ pToggleButton->set_active(*pVar);
+ }
+
+ if(pScale)
+ {
+ double* pVar = (double*)(pVariable);
+
+ if(to_variable)
+ (*pVar) = pScale->get_value();
+ else
+ pScale->set_value(*pVar);
+ }
+
+ if(pCalendar)
+ {
+ Glib::Date* pVar = (Glib::Date*)(pVariable);
+
+ if(to_variable)
+ {
+ guint year,month,day;
+ pCalendar->get_date(year,month,day);
+ (*pVar) = Glib::Date(day,(Glib::Date::Month)month,year);
+ }
+ else
+ {
+ pCalendar->select_day(pVar->get_day());
+ pCalendar->select_month(pVar->get_month(), pVar->get_year());
+ }
+ }
+ }
+ }
+}
+
+bool VariablesMap::validate_widgets()
+{
+ //Override to add validation.
+ //TODO: We could add some automatic data-range and text-length validation.
+ return true;
+}
+
+
+} // namespace Glom
+
Added: trunk/glom/variablesmap.h
==============================================================================
--- (empty file)
+++ trunk/glom/variablesmap.h Tue Mar 17 14:42:09 2009
@@ -0,0 +1,90 @@
+/* variablesmap.h
+ *
+ * Copyright (C) 2002 The libglademm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _GLOM_VARIABLESMAP_H
+#define _GLOM_VARIABLESMAP_H
+
+#include <gtkmm/builder.h>
+#include <map>
+
+namespace Glom
+{
+
+/** Associates named Glade widgets with member variables.
+ * Use connect_widget() to link the widgets with variables that will contain their data.
+ * Then use transfer_widgets_to_variables() and transfer_variables_to_widgets() to get or set all of the variables at once.
+ *
+ * This is meant to be a bit like MFC's "Dialog Data Exchange and Validation".
+ *
+ * The association of widget and member varables follow this mapping:
+ *
+ * Gtk::Entry --> Glib::ustring
+ * Gtk::SpinBox --> Glib::ustring
+ * Gtk::ComboBoxEntry --> Glib::ustring
+ * Gtk::Scale --> double
+ * Gtk::Calendar --> Glib::Date
+ * Gtk::CheckBox --> bool
+ * Gtk::RadioButton --> bool
+ *
+ */
+class VariablesMap
+{
+public:
+ explicit VariablesMap(const Glib::RefPtr<Gtk::Builder>& builder);
+ virtual ~VariablesMap();
+
+ ///For ToggleButton (CheckBox and RadioButton)
+ void connect_widget(const Glib::ustring& widget_name, bool& variable);
+
+ ///For Entry, ComboBoxEntry and SpinBox
+ void connect_widget(const Glib::ustring& widget_name, Glib::ustring& variable);
+
+ ///For Scale (HScale and VScale)
+ void connect_widget(const Glib::ustring& widget_name, double& variable);
+
+ ///For Calendar
+ void connect_widget(const Glib::ustring& widget_name, Glib::Date& variable);
+
+ ///Transfer data from the widget to the variable.
+ void transfer_widgets_to_variables();
+
+ ///Transfer data from the variable to the widget.
+ void transfer_variables_to_widgets();
+
+protected:
+
+ /** Override this to validate the data that the user enters into the widgets.
+ * The return value indicates whether the widgets' data is valid.
+ */
+ virtual bool validate_widgets();
+
+ void transfer_one_widget(Gtk::Widget* pWidget, bool to_variable);
+
+ typedef std::map<Gtk::Widget*, void*> type_mapWidgetsToVariables;
+ type_mapWidgetsToVariables m_mapWidgetsToVariables;
+
+ Glib::RefPtr<Gtk::Builder> m_builder;
+};
+
+} /* namespace Glom */
+
+
+#endif /* _GLOM_VARIABLESMAP_H */
+
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
