r21735 - gnucash/trunk - Bug #666311 - Migrate inport-export GladeXML dialogs to builder
Geert Janssens
gjanssens at code.gnucash.org
Sat Dec 17 06:02:55 EST 2011
Author: gjanssens
Date: 2011-12-17 06:02:55 -0500 (Sat, 17 Dec 2011)
New Revision: 21735
Trac: http://svn.gnucash.org/trac/changeset/21735
Added:
gnucash/trunk/src/import-export/csv/gnc-csv-import.glade
Removed:
gnucash/trunk/src/import-export/csv/gnc-csv-preview-dialog.glade
gnucash/trunk/src/import-export/generic-import.glade
gnucash/trunk/src/import-export/gnc-import-desc-format.c
gnucash/trunk/src/import-export/gnc-import-desc-format.h
gnucash/trunk/src/import-export/gnc-import-format-cb.c
gnucash/trunk/src/import-export/gnc-import-format-cb.h
gnucash/trunk/src/import-export/gnc-import-format-gnome.c
gnucash/trunk/src/import-export/gnc-import-format-gnome.h
gnucash/trunk/src/import-export/import-provider-format.glade
Modified:
gnucash/trunk/po/POTFILES.in
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/import-export/csv/Makefile.am
gnucash/trunk/src/import-export/csv/gnc-csv-import.c
gnucash/trunk/src/import-export/dialog-import.glade
gnucash/trunk/src/import-export/gncmod-generic-import.c
gnucash/trunk/src/import-export/import-account-matcher.c
gnucash/trunk/src/import-export/import-commodity-matcher.c
gnucash/trunk/src/import-export/import-format-dialog.c
gnucash/trunk/src/import-export/import-main-matcher.c
gnucash/trunk/src/import-export/import-match-picker.c
Log:
Bug #666311 - Migrate inport-export GladeXML dialogs to builder
Patch by Robert Fewell
Modified: gnucash/trunk/po/POTFILES.in
===================================================================
--- gnucash/trunk/po/POTFILES.in 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/po/POTFILES.in 2011-12-17 11:02:55 UTC (rev 21735)
@@ -382,14 +382,10 @@
src/import-export/csv/gnc-csv-gnumeric-popup.c
src/import-export/csv/gnc-csv-import.c
src/import-export/csv/gnc-csv-model.c
-src/import-export/csv/gnc-csv-preview-dialog.glade
+src/import-export/csv/gnc-csv-import.glade
src/import-export/csv/gncmod-csv-import.c
src/import-export/csv/gnc-plugin-csv.c
src/import-export/dialog-import.glade
-src/import-export/generic-import.glade
-src/import-export/gnc-import-desc-format.c
-src/import-export/gnc-import-format-cb.c
-src/import-export/gnc-import-format-gnome.c
src/import-export/gncmod-generic-import.c
src/import-export/import-account-matcher.c
src/import-export/import-backend.c
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/Makefile.am 2011-12-17 11:02:55 UTC (rev 21735)
@@ -20,16 +20,11 @@
import-settings.c \
import-match-map.c \
import-main-matcher.c \
- gnc-import-desc-format.c \
- gnc-import-format-cb.c \
- gnc-import-format-gnome.c \
gncmod-generic-import.c
gncincludedir = ${GNC_INCLUDE_DIR}
gncinclude_HEADERS = \
import-match-map.h \
- gnc-import-desc-format.h \
- gnc-import-format-cb.h \
import-parse.h
noinst_HEADERS = \
@@ -40,8 +35,7 @@
import-match-map.h \
import-match-picker.h \
import-settings.h \
- import-utilities.h \
- gnc-import-format-gnome.h
+ import-utilities.h
libgncmod_generic_import_la_LDFLAGS = -avoid-version
@@ -57,11 +51,6 @@
${REGEX_LIBS} \
${GLIB_LIBS}
-gladedir = ${GNC_GLADE_DIR}
-glade_DATA = \
- generic-import.glade \
- import-provider-format.glade
-
gtkbuilderdir = ${GNC_GTKBUILDER_DIR}
gtkbuilder_DATA = dialog-import.glade
@@ -80,7 +69,6 @@
${GLIB_CFLAGS}
EXTRA_DIST = \
- $(glade_DATA) \
$(gtkbuilder_DATA) \
generic-import-design.txt
Modified: gnucash/trunk/src/import-export/csv/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv/Makefile.am 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/csv/Makefile.am 2011-12-17 11:02:55 UTC (rev 21735)
@@ -52,10 +52,10 @@
ui_DATA = \
gnc-plugin-csv-ui.xml
-gladedir = ${GNC_GLADE_DIR}
-glade_DATA = \
- gnc-csv-preview-dialog.glade
+gtkbuilderdir = ${GNC_GTKBUILDER_DIR}
+gtkbuilder_DATA = \
+ gnc-csv-import.glade
-EXTRA_DIST = $(ui_DATA) $(glade_DATA)
+EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.csv\"
Modified: gnucash/trunk/src/import-export/csv/gnc-csv-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv/gnc-csv-import.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/csv/gnc-csv-import.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -23,7 +23,6 @@
#include "config.h"
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <glib/gi18n.h>
#include <goffice/gtk/go-charmap-sel.h>
@@ -57,32 +56,32 @@
* import. */
typedef struct
{
- GncCsvParseData* parse_data; /**< The actual data we are previewing */
+ GncCsvParseData* parse_data; /**< The actual data we are previewing */
GtkDialog* dialog;
- GOCharmapSel* encselector; /**< The widget for selecting the encoding */
- GtkComboBox* date_format_combo; /**< The widget for selecting the date format */
- GladeXML* xml; /**< The Glade file that contains the dialog. */
- GtkTreeView* treeview; /**< The treeview containing the data */
- GtkTreeView* ctreeview; /**< The treeview containing the column types */
+ GOCharmapSel* encselector; /**< The widget for selecting the encoding */
+ GtkComboBox* date_format_combo; /**< The widget for selecting the date format */
+ GtkTreeView* treeview; /**< The treeview containing the data */
+ GtkTreeView* ctreeview; /**< The treeview containing the column types */
GtkCheckButton* sep_buttons[SEP_NUM_OF_TYPES]; /**< Checkbuttons for common separators */
- GtkCheckButton* custom_cbutton; /**< The checkbutton for a custom separator */
- GtkEntry* custom_entry; /**< The entry for custom separators */
+ GtkCheckButton* custom_cbutton; /**< The checkbutton for a custom separator */
+ GtkEntry* custom_entry; /**< The entry for custom separators */
+ GtkLabel* instructions_label; /**< The instructions label */
+ GtkImage* instructions_image; /**< The instructions image */
gboolean encoding_selected_called; /**< Before encoding_selected is first called, this is FALSE.
- * (See description of encoding_selected.) */
- gboolean not_empty; /**< FALSE initially, true after the first type gnc_csv_preview_update is called. */
- gboolean previewing_errors; /**< TRUE if the dialog is displaying
- * error lines, instead of all the file
- * data. */
- int code_encoding_calls; /**< Normally this is 0. If the computer
- * changes encselector, this is set to
- * 2. encoding_selected is called twice,
- * each time decrementing this by 1. */
- gboolean approved; /**< This is FALSE until the user clicks "OK". */
- GtkWidget** treeview_buttons; /**< This array contains the header buttons in treeview */
- int longest_line; /**< The length of the longest row */
- int fixed_context_col; /**< The number of the column whose the user has clicked */
- int fixed_context_dx; /**< The horizontal coordinate of the pixel in the header of the column
- * the user has clicked */
+ * (See description of encoding_selected.) */
+ gboolean not_empty; /**< FALSE initially, true after the first type gnc_csv_preview_update is called. */
+ gboolean previewing_errors; /**< TRUE if the dialog is displaying
+ * error lines, instead of all the file data. */
+ int code_encoding_calls; /**< Normally this is 0. If the computer
+ * changes encselector, this is set to
+ * 2. encoding_selected is called twice,
+ * each time decrementing this by 1. */
+ gboolean approved; /**< This is FALSE until the user clicks "OK". */
+ GtkWidget** treeview_buttons; /**< This array contains the header buttons in treeview */
+ int longest_line; /**< The length of the longest row */
+ int fixed_context_col; /**< The number of the column whose the user has clicked */
+ int fixed_context_dx; /**< The horizontal coordinate of the pixel in the header of the column
+ * the user has clicked */
} GncCsvPreview;
static void gnc_csv_preview_update(GncCsvPreview* preview);
@@ -408,7 +407,8 @@
GncCsvPreview* preview = g_new(GncCsvPreview, 1);
GtkWidget *ok_button, *cancel_button, *csv_button;
GtkContainer* date_format_container;
- /* The names in the glade file for the sep buttons. */
+ GtkBuilder *builder;
+ /* The names in the glade builder file for the sep buttons. */
char* sep_button_names[] = {"space_cbutton",
"tab_cbutton",
"comma_cbutton",
@@ -425,17 +425,19 @@
g_signal_connect(G_OBJECT(preview->encselector), "charmap_changed",
G_CALLBACK(encoding_selected), (gpointer)preview);
- /* Load the Glade file. */
- preview->xml = gnc_glade_xml_new("gnc-csv-preview-dialog.glade", "dialog");
+ /* Load the Glade builder file. */
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder, "gnc-csv-import.glade", "preview-dialog");
+
/* Load the dialog. */
- preview->dialog = GTK_DIALOG(glade_xml_get_widget(preview->xml, "dialog"));
+ preview->dialog = GTK_DIALOG(gtk_builder_get_object (builder, "preview-dialog"));
- /* Load the separator buttons from the glade file into the
+ /* Load the separator buttons from the glade builder file into the
* preview->sep_buttons array. */
for (i = 0; i < SEP_NUM_OF_TYPES; i++)
{
preview->sep_buttons[i]
- = (GtkCheckButton*)glade_xml_get_widget(preview->xml, sep_button_names[i]);
+ = (GtkCheckButton*)GTK_WIDGET(gtk_builder_get_object (builder, sep_button_names[i]));
/* Connect them to the sep_button_clicked event handler. */
g_signal_connect(G_OBJECT(preview->sep_buttons[i]), "toggled",
G_CALLBACK(sep_button_clicked), (gpointer)preview);
@@ -444,23 +446,27 @@
/* Load and connect the custom separator checkbutton in the same way
* as the other separator buttons. */
preview->custom_cbutton
- = (GtkCheckButton*)glade_xml_get_widget(preview->xml, "custom_cbutton");
+ = (GtkCheckButton*)GTK_WIDGET(gtk_builder_get_object (builder, "custom_cbutton"));
g_signal_connect(G_OBJECT(preview->custom_cbutton), "clicked",
G_CALLBACK(sep_button_clicked), (gpointer)preview);
/* Load the entry for the custom separator entry. Connect it to the
* sep_button_clicked event handler as well. */
- preview->custom_entry = (GtkEntry*)glade_xml_get_widget(preview->xml, "custom_entry");
+ preview->custom_entry = (GtkEntry*)GTK_WIDGET(gtk_builder_get_object (builder, "custom_entry"));
g_signal_connect(G_OBJECT(preview->custom_entry), "changed",
G_CALLBACK(sep_button_clicked), (gpointer)preview);
- /* Get the table from the Glade file. */
- enctable = GTK_TABLE(glade_xml_get_widget(preview->xml, "enctable"));
+ /* Get the table from the Glade builder file. */
+ enctable = GTK_TABLE(gtk_builder_get_object (builder, "enctable"));
/* Put the selector in at the top. */
gtk_table_attach_defaults(enctable, GTK_WIDGET(preview->encselector), 1, 2, 0, 1);
/* Show the table in all its glory. */
gtk_widget_show_all(GTK_WIDGET(enctable));
+ /* The instructions label and image */
+ preview->instructions_label = GTK_LABEL(gtk_builder_get_object (builder, "instructions_label"));
+ preview->instructions_image = GTK_IMAGE(gtk_builder_get_object (builder, "instructions_image"));
+
/* Add in the date format combo box and hook it up to an event handler. */
preview->date_format_combo = GTK_COMBO_BOX(gtk_combo_box_new_text());
for (i = 0; i < num_date_formats; i++)
@@ -472,33 +478,32 @@
G_CALLBACK(date_format_selected), (gpointer)preview);
/* Add it to the dialog. */
- date_format_container = GTK_CONTAINER(glade_xml_get_widget(preview->xml,
- "date_format_container"));
+ date_format_container = GTK_CONTAINER(gtk_builder_get_object (builder, "date_format_container"));
gtk_container_add(date_format_container, GTK_WIDGET(preview->date_format_combo));
gtk_widget_show_all(GTK_WIDGET(date_format_container));
/* Connect the "OK" and "Cancel" buttons to their event handlers. */
- ok_button = glade_xml_get_widget(preview->xml, "ok_button");
+ ok_button = GTK_WIDGET(gtk_builder_get_object (builder, "ok_button"));
g_signal_connect(G_OBJECT(ok_button), "clicked",
G_CALLBACK(ok_button_clicked), (gpointer)preview);
- cancel_button = glade_xml_get_widget(preview->xml, "cancel_button");
+ cancel_button = GTK_WIDGET(gtk_builder_get_object (builder, "cancel_button"));
g_signal_connect(G_OBJECT(cancel_button), "clicked",
G_CALLBACK(cancel_button_clicked), (gpointer)preview);
/* Connect the CSV/Fixed-Width radio button event handler. */
- csv_button = glade_xml_get_widget(preview->xml, "csv_button");
+ csv_button = GTK_WIDGET(gtk_builder_get_object (builder, "csv_button"));
g_signal_connect(csv_button, "toggled",
G_CALLBACK(separated_or_fixed_selected), (gpointer)preview);
/* Load the data treeview and connect it to its resizing event handler. */
- preview->treeview = (GtkTreeView*)(glade_xml_get_widget(preview->xml, "treeview"));
+ preview->treeview = (GtkTreeView*)GTK_WIDGET(gtk_builder_get_object (builder, "treeview"));
g_signal_connect(G_OBJECT(preview->treeview), "size-allocate",
G_CALLBACK(treeview_resized), (gpointer)preview);
context = gtk_widget_create_pango_context(GTK_WIDGET(preview->treeview));
/* Load the column type treeview. */
- preview->ctreeview = (GtkTreeView*)(glade_xml_get_widget(preview->xml, "ctreeview"));
+ preview->ctreeview = (GtkTreeView*)GTK_WIDGET(gtk_builder_get_object (builder, "ctreeview"));
/* This is TRUE only after encoding_selected is called, so we must
* set it initially to FALSE. */
@@ -507,6 +512,8 @@
/* It is empty at first. */
preview->not_empty = FALSE;
+ g_object_unref(G_OBJECT(builder));
+
return preview;
}
@@ -516,7 +523,6 @@
*/
static void gnc_csv_preview_free(GncCsvPreview* preview)
{
- g_object_unref(preview->xml);
g_free(preview);
}
@@ -1065,18 +1071,16 @@
/* TODO Let the user manually edit cells' data? */
static int gnc_csv_preview_errors(GncCsvPreview* preview)
{
- GtkLabel* instructions_label = GTK_LABEL(glade_xml_get_widget(preview->xml, "instructions_label"));
- GtkImage* instructions_image = GTK_IMAGE(glade_xml_get_widget(preview->xml, "instructions_image"));
gchar* name;
GtkIconSize size;
GtkTreeViewColumn* last_col;
- gtk_image_get_stock(instructions_image, &name, &size);
- gtk_image_set_from_stock(instructions_image, GTK_STOCK_DIALOG_ERROR, size);
- gtk_label_set_text(instructions_label,
+ gtk_image_get_stock(preview->instructions_image, &name, &size);
+ gtk_image_set_from_stock(preview->instructions_image, GTK_STOCK_DIALOG_ERROR, size);
+ gtk_label_set_text(preview->instructions_label,
_("The rows displayed below had errors. You can attempt to correct these errors by changing the configuration."));
- gtk_widget_show(GTK_WIDGET(instructions_image));
- gtk_widget_show(GTK_WIDGET(instructions_label));
+ gtk_widget_show(GTK_WIDGET(preview->instructions_image));
+ gtk_widget_show(GTK_WIDGET(preview->instructions_label));
preview->previewing_errors = TRUE;
preview->approved = FALSE; /* This is FALSE until the user clicks "OK". */
Copied: gnucash/trunk/src/import-export/csv/gnc-csv-import.glade (from rev 21734, gnucash/trunk/src/import-export/csv/gnc-csv-preview-dialog.glade)
===================================================================
--- gnucash/trunk/src/import-export/csv/gnc-csv-import.glade (rev 0)
+++ gnucash/trunk/src/import-export/csv/gnc-csv-import.glade 2011-12-17 11:02:55 UTC (rev 21735)
@@ -0,0 +1,583 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkDialog" id="preview-dialog">
+ <property name="can_focus">False</property>
+ <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">Import CSV/Fixed-Width File</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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 internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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>
+ <object class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="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_action_appearance">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="ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="use_action_appearance">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="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkTable" id="enctable">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">4</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkRadioButton" id="csv_button">
+ <property name="label" translatable="yes">Separated</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton2">
+ <property name="label" translatable="yes">Fixed-Width</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">csv_button</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">Data type: </property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">Encoding: </property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">3</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">3</property>
+ <property name="row_spacing">3</property>
+ <child>
+ <object class="GtkCheckButton" id="space_cbutton">
+ <property name="label" translatable="yes">Space</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="tab_cbutton">
+ <property name="label" translatable="yes">Tab</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="comma_cbutton">
+ <property name="label" translatable="yes">Comma (,)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="colon_cbutton">
+ <property name="label" translatable="yes">Colon (:)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="semicolon_cbutton">
+ <property name="label" translatable="yes">Semicolon (;)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">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="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="hyphen_cbutton">
+ <property name="label" translatable="yes">Hyphen (-)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">True</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">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="custom_cbutton">
+ <property name="label" translatable="yes">Custom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</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_action_appearance">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="custom_entry">
+ <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="invisible_char">●</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ </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="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">Separators</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">3</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="date_format_container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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">Date Format</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHSeparator" id="hseparator3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">3</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkImage" id="instructions_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="stock">gtk-dialog-info</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="instructions_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select the type of each column below.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="ctreeview">
+ <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">False</property>
+ <property name="enable_grid_lines">both</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <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="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <object class="GtkViewport" id="viewport1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="resize_mode">queue</property>
+ <child>
+ <object class="GtkTreeView" id="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="enable_grid_lines">both</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">9</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">cancel_button</action-widget>
+ <action-widget response="0">ok_button</action-widget>
+ </action-widgets>
+ </object>
+</interface>
Deleted: gnucash/trunk/src/import-export/csv/gnc-csv-preview-dialog.glade
===================================================================
--- gnucash/trunk/src/import-export/csv/gnc-csv-preview-dialog.glade 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/csv/gnc-csv-preview-dialog.glade 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,517 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.10 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="dialog">
- <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">Import CSV/Fixed-Width File</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-vbox1">
- <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="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <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="orientation">vertical</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkTable" id="enctable">
- <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">4</property>
- <property name="n_columns">2</property>
- <child>
- <widget class="GtkHSeparator" id="hseparator1">
- <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>
- </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="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="y_padding">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator2">
- <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>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="y_padding">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <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="GtkRadioButton" id="csv_button">
- <property name="label" translatable="yes">Separated</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton" id="radiobutton2">
- <property name="label" translatable="yes">Fixed-Width</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">csv_button</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label1">
- <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">Data type: </property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator4">
- <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>
- </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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator5">
- <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>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- <property name="y_padding">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label3">
- <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">Encoding: </property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame1">
- <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_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <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="left_padding">12</property>
- <child>
- <widget 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">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">3</property>
- <property name="row_spacing">3</property>
- <child>
- <widget class="GtkCheckButton" id="space_cbutton">
- <property name="label" translatable="yes">Space</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="tab_cbutton">
- <property name="label" translatable="yes">Tab</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="comma_cbutton">
- <property name="label" translatable="yes">Comma (,)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="colon_cbutton">
- <property name="label" translatable="yes">Colon (:)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="semicolon_cbutton">
- <property name="label" translatable="yes">Semicolon (;)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="hyphen_cbutton">
- <property name="label" translatable="yes">Hyphen (-)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">True</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">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="custom_cbutton">
- <property name="label" translatable="yes">Custom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="custom_entry">
- <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>
- <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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label5">
- <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">Separators</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget 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>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator6">
- <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>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame2">
- <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_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <widget class="GtkAlignment" id="date_format_container">
- <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="left_padding">12</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label4">
- <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">Date Format</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">5</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHSeparator" id="hseparator3">
- <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>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">3</property>
- <property name="position">6</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox3">
- <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="GtkImage" id="instructions_image">
- <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="stock">gtk-dialog-info</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="padding">2</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="instructions_label">
- <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="xalign">0</property>
- <property name="label" translatable="yes">Select the type of each column below.</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">7</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTreeView" id="ctreeview">
- <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">False</property>
- <property name="enable_grid_lines">both</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">8</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <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="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <widget class="GtkViewport" id="viewport1">
- <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="resize_mode">queue</property>
- <child>
- <widget class="GtkTreeView" id="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="enable_grid_lines">both</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">9</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <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="cancel_button">
- <property name="label">gtk-cancel</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="ok_button">
- <property name="label">gtk-ok</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
Modified: gnucash/trunk/src/import-export/dialog-import.glade
===================================================================
--- gnucash/trunk/src/import-export/dialog-import.glade 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/dialog-import.glade 2011-12-17 11:02:55 UTC (rev 21735)
@@ -2,6 +2,133 @@
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
+ <object class="GtkDialog" id="Generic Import Account Picker">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Select Account</property>
+ <property name="default_width">800</property>
+ <property name="default_height">600</property>
+ <property name="type_hint">dialog</property>
+ <signal name="map" handler="gnc_ui_generic_account_picker_map_cb" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="newbutton">
+ <property name="label">gnc-new-account</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">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="cancelbutton">
+ <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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="okbutton">
+ <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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847715">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes">Please select or create an appropriate GnuCash account for:</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="online_id_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="ypad">3</property>
+ <property name="label" translatable="yes">Online account ID here...</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="account_tree_sw">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="1">newbutton</action-widget>
+ <action-widget response="-6">cancelbutton</action-widget>
+ <action-widget response="-5">okbutton</action-widget>
+ </action-widgets>
+ </object>
<object class="GtkWindow" id="Preferences">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -347,10 +474,864 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkDialog" id="format_picker">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Choose a format</property>
+ <property name="resizable">False</property>
+ <property name="modal">True</property>
+ <property name="default_width">600</property>
+ <property name="default_height">400</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="okbutton1">
+ <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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">15</property>
+ <child>
+ <object class="GtkLabel" id="msg_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">do not translate</property>
+ <property name="justify">center</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="label847775">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ <property name="label" translatable="yes">Format:</property>
+ <property name="justify">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="menu_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label847773">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Choose a format</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-5">okbutton1</action-widget>
+ </action-widgets>
+ </object>
<object class="GtkAdjustment" id="match_adj">
<property name="upper">6</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkDialog" id="match_picker">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Select matching existing transaction</property>
+ <property name="default_width">600</property>
+ <property name="default_height">400</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="cancel_button1">
+ <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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="ok_button1">
+ <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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label847772">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes">Imported transaction's first split:</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow30">
+ <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="download_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847766">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes">Potential splits matching the selected transaction: </property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow29">
+ <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="matched_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="rules_hint">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">cancel_button1</action-widget>
+ <action-widget response="-5">ok_button1</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="matcher_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Transaction List Help</property>
+ <property name="resizable">False</property>
+ <property name="type_hint">dialog</property>
+ <signal name="close" handler="on_matcher_help_close_clicked" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="matcher_help_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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_matcher_help_close_clicked" swapped="no"/>
+ </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">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">13</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label847790">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Colors</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow33">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">5</property>
+ <property name="pixels_below_lines">5</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="left_margin">5</property>
+ <property name="right_margin">5</property>
+ <property name="cursor_visible">False</property>
+ <property name="buffer">textbuffer3</property>
+ <property name="accepts_tab">False</property>
+ </object>
+ </child>
+ </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="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow34">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">5</property>
+ <property name="pixels_below_lines">5</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="left_margin">5</property>
+ <property name="right_margin">5</property>
+ <property name="cursor_visible">False</property>
+ <property name="buffer">textbuffer4</property>
+ <property name="accepts_tab">False</property>
+ </object>
+ </child>
+ </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="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow32">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">5</property>
+ <property name="pixels_below_lines">5</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="left_margin">5</property>
+ <property name="right_margin">5</property>
+ <property name="cursor_visible">False</property>
+ <property name="buffer">textbuffer2</property>
+ <property name="accepts_tab">False</property>
+ </object>
+ </child>
+ </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">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847794">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847795">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><b>Actions</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847796">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">"A"</property>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847797">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">"U+R"</property>
+ </object>
+ <packing>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847798">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">"R"</property>
+ </object>
+ <packing>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847799">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select "A" to add the transaction as new.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847780">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select "U+R" to update and reconcile a matching transaction.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="bottom_attach">8</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847781">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select "R" to reconcile a matching transaction.</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">8</property>
+ <property name="bottom_attach">9</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847800">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Select neither to skip the transaction (it won't be imported at all).</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label847801">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">(none)</property>
+ </object>
+ <packing>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow35">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTextView" id="textview5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="pixels_above_lines">5</property>
+ <property name="pixels_below_lines">5</property>
+ <property name="editable">False</property>
+ <property name="wrap_mode">word</property>
+ <property name="left_margin">5</property>
+ <property name="right_margin">5</property>
+ <property name="cursor_visible">False</property>
+ <property name="buffer">textbuffer5</property>
+ <property name="accepts_tab">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEventBox" id="red">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label847802">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Red</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEventBox" id="yellow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label847803">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Yellow</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEventBox" id="green">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label847804">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">12</property>
+ <property name="label" translatable="yes">Green</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-7">matcher_help_close</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkTextBuffer" id="textbuffer2">
+ <property name="text" translatable="yes">This transaction probably requires your intervention or it will be imported unbalanced.</property>
+ </object>
+ <object class="GtkTextBuffer" id="textbuffer3">
+ <property name="text" translatable="yes">This transaction will be imported balanced (you may still want to double check the match or destination account).</property>
+ </object>
+ <object class="GtkTextBuffer" id="textbuffer4">
+ <property name="text" translatable="yes">This transaction requires your intervention or it will NOT be imported.</property>
+ </object>
+ <object class="GtkTextBuffer" id="textbuffer5">
+ <property name="text" translatable="yes">Double click on the transaction to change the matching transaction to reconcile, or the destination account of the auto-balance split (if required).</property>
+ </object>
+ <object class="GtkDialog" id="transaction_matcher">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Generic import transaction matcher</property>
+ <property name="default_width">600</property>
+ <property name="default_height">400</property>
+ <property name="type_hint">dialog</property>
+ <signal name="close" handler="on_matcher_cancel_clicked" swapped="no"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="matcher_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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_matcher_cancel_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="matcher_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="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_matcher_ok_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="matcher__help">
+ <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">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_matcher_help_clicked" swapped="no"/>
+ </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">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="heading_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xpad">5</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes">List of downloaded transactions (source split shown):</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow25">
+ <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="downloaded_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="reorderable">True</property>
+ <property name="rules_hint">True</property>
+ <property name="enable_search">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-6">matcher_cancel</action-widget>
+ <action-widget response="-5">matcher_ok</action-widget>
+ <action-widget response="-11">matcher__help</action-widget>
+ </action-widgets>
+ </object>
</interface>
Deleted: gnucash/trunk/src/import-export/generic-import.glade
===================================================================
--- gnucash/trunk/src/import-export/generic-import.glade 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/generic-import.glade 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,1382 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.10 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="Generic Import Account Picker">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Select Account</property>
- <property name="default_width">800</property>
- <property name="default_height">600</property>
- <property name="type_hint">dialog</property>
- <signal name="map" handler="gnc_ui_generic_account_picker_map_cb"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label847715">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please select or create an appropriate GnuCash account for:</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="online_id_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Online account ID here...</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="account_tree_sw">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="newbutton">
- <property name="label">gnc-new-account</property>
- <property name="response_id">1</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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="cancelbutton">
- <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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="okbutton">
- <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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="transaction_matcher">
- <property name="title" translatable="yes">Generic import transaction matcher</property>
- <property name="default_width">600</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="on_matcher_cancel_clicked"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="heading_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">List of downloaded transactions (source split shown):</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow25">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="downloaded_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="reorderable">True</property>
- <property name="rules_hint">True</property>
- <property name="enable_search">False</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="matcher_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>
- <signal name="clicked" handler="on_matcher_cancel_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="matcher_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="has_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>
- <signal name="clicked" handler="on_matcher_ok_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="button1">
- <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>
- <signal name="clicked" handler="on_matcher_help_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="transaction_list_dialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Generic import transaction matcher</property>
- <property name="default_width">600</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="on_matcher_cancel_clicked"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="heading_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">List of downloaded transactions (source split shown):</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow28">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkCList" id="downloaded_clist">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="n_columns">7</property>
- <property name="shadow_type">in</property>
- <property name="selection_mode">single</property>
- <signal name="select_row" handler="downloaded_transaction_select_cb"/>
- <signal name="unselect_row" handler="downloaded_transaction_unselect_cb"/>
- <child>
- <widget class="GtkLabel" id="label847761">
- <property name="label" translatable="yes">Date</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label847762">
- <property name="label" translatable="yes">Description</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label847763">
- <property name="label" translatable="yes">Amount</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label847764">
- <property name="label" translatable="yes">New?</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.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>
- </child>
- <child>
- <widget class="GtkLabel" id="label847765">
- <property name="label" translatable="yes">Duplicate Transaction</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label847766">
- <property name="label" translatable="yes">Other Account</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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>
- </child>
- <child>
- <widget class="GtkLabel" id="label847767">
- <property name="label" translatable="yes">Amount</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="explanation_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">For a new transaction, click on the "Other Account" entry to choose the other (destination) account of this transaction.
-For a transaction that is a duplicate of an existing one, click on the "Other Account" or "Description" entry to
-check whether GnuCash chose the right existing transaction.
-To switch transactions between both states, click on the checkmark in the "New" column.
-When all new transactions have the correct destination account and all duplicates are matched with the right existing transaction,
-click "OK".</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area3">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="cancel_button">
- <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>
- <signal name="clicked" handler="on_matcher_cancel_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="ok_button">
- <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>
- <signal name="clicked" handler="on_matcher_ok_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="match_picker">
- <property name="title" translatable="yes">Select matching existing transaction</property>
- <property name="default_width">600</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox3">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child>
- <widget class="GtkVBox" id="vbox7">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label847772">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Imported transaction's first split:</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="downloaded_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="rules_hint">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847766">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Potential splits matching the selected transaction: </property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow29">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTreeView" id="matched_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="rules_hint">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area4">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="cancel_button">
- <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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton" id="ok_button">
- <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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="format_picker">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Choose a format</property>
- <property name="resizable">False</property>
- <property name="modal">True</property>
- <property name="default_width">600</property>
- <property name="default_height">400</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox4">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkFrame" id="frame2">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child>
- <widget class="GtkVBox" id="vbox8">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">15</property>
- <child>
- <widget class="GtkLabel" id="msg_label">
- <property name="visible">True</property>
- <property name="label">do not translate</property>
- <property name="justify">center</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="spacing">3</property>
- <child>
- <widget class="GtkLabel" id="label847775">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Format:</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="menu_box">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label847773">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Choose a format</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area5">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="okbutton1">
- <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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkWindow" id="Preferences">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Preferences</property>
- <child>
- <widget class="GtkTable" id="matcher_prefs">
- <property name="visible">True</property>
- <property name="n_rows">10</property>
- <property name="n_columns">4</property>
- <child>
- <widget class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/enable_skip">
- <property name="label" translatable="yes">Enable skip transaction action</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Enable the SKIP action in the transaction matcher. If enabled, a transaction whose best match's score is in the yellow zone (above the Auto-ADD threshold but below the Auto-CLEAR threshold) will be skipped by default.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/enable_update">
- <property name="label" translatable="yes">Enable update match action</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Enable the UPDATE AND RECONCILE action in the transaction matcher. If enabled, a transaction whose best match's score is above the Auto-CLEAR threshold and has a different date or amount than the matching existing transaction will cause the existing transaction to be updated and cleared by default.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847785">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Generic Importer</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="gconf/dialogs/import/generic_matcher/atm_fee_threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">In some places commercial ATMs (not belonging to a financial institution) are installed in places like convenience stores. These ATMs add their fee directly to the amount instead of showing up as a separate transaction or in your monthly banking fees. For example, you withdraw $100, and you are charged $101,50 plus Interac fees. If you manually entered that $100, the amounts won't match. You should set this to whatever is the maximum such fee in your area (in units of your local currency), so the transaction will be recognised as a match.</property>
- <property name="adjustment">2 0 1000 0.01 1 0</property>
- <property name="climb_rate">1</property>
- <property name="digits">2</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="gconf/dialogs/import/generic_matcher/auto_clear_threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">A transaction whose best match's score is in the green zone (above or equal to the Auto-CLEAR threshold) will be CLEARed by default.</property>
- <property name="adjustment">6 6 12 1 10 0</property>
- <property name="climb_rate">1</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="gconf/dialogs/import/generic_matcher/auto_add_threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">A transaction whose best match's score is in the red zone (above the display threshold but below or equal to the Auto-ADD threshold) will be ADDed by default.</property>
- <property name="adjustment">1 1 6 1 10 0</property>
- <property name="climb_rate">1</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkSpinButton" id="gconf/dialogs/import/generic_matcher/match_threshold">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip" translatable="yes">The minimum score a potential match must have to be displayed in the match list.</property>
- <property name="adjustment">1 0 6 1 10 0</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847789">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Commercial ATM _fees threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/atm_fee_threshold</property>
- </widget>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847788">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Auto-c_lear threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/auto_clear_threshold</property>
- </widget>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847787">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Auto-_add threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/auto_add_threshold</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847786">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Match _display threshold</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">gconf/dialogs/import/generic_matcher/match_threshold</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/use_bayes">
- <property name="label" translatable="yes">Use _bayesian matching</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Use bayesian algorithms to match new transactions with existing accounts.</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="gconf/dialogs/import/generic_matcher/auto_create_commodity">
- <property name="label" translatable="yes">Automatically create new commodities</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Enables the automatic creation of new commodities if any unknown commodity is encountered during import. Otherwise the user will be asked what to do with each unknown commodity.</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="right_attach">4</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_padding">12</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="matcher_help">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="title" translatable="yes">Transaction List Help</property>
- <property name="resizable">False</property>
- <property name="type_hint">dialog</property>
- <signal name="close" handler="on_matcher_help_close_clicked"/>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox5">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">13</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label847790">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Colors</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow33">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="textview3">
- <property name="visible">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- <property name="text" translatable="yes">This transaction will be imported balanced (you may still want to double check the match or destination account).</property>
- </widget>
- </child>
- </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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow34">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="textview4">
- <property name="visible">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- <property name="text" translatable="yes">This transaction requires your intervention or it will NOT be imported.</property>
- </widget>
- </child>
- </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="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow32">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="textview2">
- <property name="visible">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- <property name="text" translatable="yes">This transaction probably requires your intervention or it will be imported unbalanced.</property>
- </widget>
- </child>
- </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">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847794">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- </widget>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847795">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Actions</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847796">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">"A"</property>
- </widget>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847797">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">"U+R"</property>
- </widget>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847798">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">"R"</property>
- </widget>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847799">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Select "A" to add the transaction as new.</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847780">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Select "U+R" to update and reconcile a matching transaction.</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847781">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Select "R" to reconcile a matching transaction.</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847800">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Select neither to skip the transaction (it won't be imported at all).</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847801">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">(none)</property>
- </widget>
- <packing>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow35">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <widget class="GtkTextView" id="textview5">
- <property name="visible">True</property>
- <property name="editable">False</property>
- <property name="wrap_mode">word</property>
- <property name="cursor_visible">False</property>
- <property name="accepts_tab">False</property>
- <property name="text" translatable="yes">Double click on the transaction to change the matching transaction to reconcile, or the destination account of the auto-balance split (if required).</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="red">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label847802">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Red</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="yellow">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label847803">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Yellow</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="green">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label847804">
- <property name="visible">True</property>
- <property name="xpad">12</property>
- <property name="label" translatable="yes">Green</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area6">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <widget class="GtkButton" id="closebutton1">
- <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>
- <signal name="clicked" handler="on_matcher_help_close_clicked"/>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
Deleted: gnucash/trunk/src/import-export/gnc-import-desc-format.c
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-desc-format.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gnc-import-desc-format.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,82 +0,0 @@
-
-
-#include "config.h"
-#include "gnc-import-desc-format.h"
-#include "gnc-basic-gobject.h"
-
-static void gnc_import_desc_format_class_init (GNCImportDescFormatClass *class);
-static void gnc_import_desc_format_init (GNCImportDescFormat *gspaper);
-static void gnc_import_desc_format_finalize (GObject *obj);
-
-static GNCDruidProviderDescClass *parent_class;
-
-GNC_BASIC_GOBJECT(GNCImportDescFormat, GNCImportDescFormatClass,
- G_TYPE_GNC_DRUID_PROVIDER_DESC,
- gnc_import_desc_format_class_init,
- gnc_import_desc_format_init,
- gnc_import_desc_format_get_type,
- gnc_import_desc_format_new)
-
-static void
-gnc_import_desc_format_class_init (GNCImportDescFormatClass *klass)
-{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
- object_class->finalize = gnc_import_desc_format_finalize;
-}
-
-static void
-gnc_import_desc_format_finalize (GObject *obj)
-{
- GNCImportDescFormat *desc = (GNCImportDescFormat *)obj;
-
- if (desc->text)
- g_free(desc->text);
-
- G_OBJECT_CLASS (parent_class)->finalize(obj);
-}
-
-static void
-gnc_import_desc_format_init (GNCImportDescFormat *o)
-{
- o->parent.name = GNC_IMPORT_DESC_TYPE_FORMAT;
-}
-
-GNCImportDescFormat*
-gnc_import_desc_format_new_with_data(const gchar* title,
- const gchar* text,
- gboolean (*next_cb)(GNCDruidCB*),
- GncImportFormat (*get_formats)(GNCImportFormatCB*),
- const gchar* (*get_sample)(GNCImportFormatCB*))
-{
- GNCImportDescFormat* desc;
-
- desc = gnc_import_desc_format_new();
- g_assert(desc);
-
- desc->parent.next_cb = next_cb;
- desc->get_formats = get_formats;
- desc->get_sample = get_sample;
-
- if (text)
- gnc_import_desc_format_set_text(desc, text);
- if (title)
- gnc_druid_provider_desc_set_title(&(desc->parent), title);
-
- return desc;
-}
-
-void
-gnc_import_desc_format_set_text(GNCImportDescFormat* desc, const gchar* text)
-{
- g_return_if_fail(desc);
- g_return_if_fail(IS_GNC_IMPORT_DESC_FORMAT(desc));
- g_return_if_fail(text);
-
- if (desc->text)
- g_free(desc->text);
- desc->text = g_strdup(text);
-}
Deleted: gnucash/trunk/src/import-export/gnc-import-desc-format.h
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-desc-format.h 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gnc-import-desc-format.h 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,60 +0,0 @@
-
-
-#ifndef GNC_IMPORT_DESC_FORMAT_H
-#define GNC_IMPORT_DESC_FORMAT_H
-
-#ifdef __cplusplus
-//extern "C" {
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-
-#define G_TYPE_GNC_IMPORT_DESC_FORMAT gnc_import_desc_format_get_type()
-#define GNC_IMPORT_DESC_FORMAT(obj) G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_GNC_IMPORT_DESC_FORMAT, GNCImportDescFormat)
-#define IS_GNC_IMPORT_DESC_FORMAT(obj) G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_GNC_IMPORT_DESC_FORMAT)
-
-typedef struct _GNCImportDescFormat GNCImportDescFormat;
-typedef struct _GNCImportDescFormatClass GNCImportDescFormatClass;
-
-#include "gnc-druid.h"
-#include "import-parse.h"
-
-#include "gnc-import-format-cb.h"
-
-#define GNC_IMPORT_DESC_TYPE_FORMAT "import:format"
-
-struct _GNCImportDescFormat
-{
- GNCDruidProviderDesc parent;
-
- gchar* text;
- GncImportFormat (*get_formats)(GNCImportFormatCB*);
- const gchar* (*get_sample)(GNCImportFormatCB*);
-
-};
-
-struct _GNCImportDescFormatClass
-{
- GNCDruidProviderDescClass parent;
-};
-
-GType gnc_import_desc_format_get_type(void);
-GNCImportDescFormat* gnc_import_desc_format_new(void);
-GNCImportDescFormat*
-gnc_import_desc_format_new_with_data(const gchar* title,
- const gchar* text,
- gboolean (*next_cb)(GNCDruidCB*),
- GncImportFormat (*get_formats)(GNCImportFormatCB*),
- const gchar* (*get_sample)(GNCImportFormatCB*));
-
-void gnc_import_desc_format_set_text(GNCImportDescFormat*,
- const gchar* text);
-
-/* methods */
-
-#ifdef __cplusplus
-//}
-#endif
-
-#endif /* GNC_IMPORT_DESC_FORMAT_H */
Deleted: gnucash/trunk/src/import-export/gnc-import-format-cb.c
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-format-cb.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gnc-import-format-cb.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,10 +0,0 @@
-
-
-#include "config.h"
-#include "gnc-import-format-cb.h"
-#include "gnc-basic-gobject.h"
-
-GNC_BASIC_GOBJECT(GNCImportFormatCB, GNCImportFormatCBClass,
- G_TYPE_GNC_DRUID_CB, NULL, NULL,
- gnc_import_format_cb_get_type,
- gnc_import_format_cb_new)
Deleted: gnucash/trunk/src/import-export/gnc-import-format-cb.h
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-format-cb.h 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gnc-import-format-cb.h 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,46 +0,0 @@
-
-
-#ifndef GNC_IMPORT_FORMAT_CB_H
-#define GNC_IMPORT_FORMAT_CB_H
-
-#ifdef __cplusplus
-//extern "C" {
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-
-#define G_TYPE_GNC_IMPORT_FORMAT_CB gnc_import_format_cb_get_type()
-#define GNC_IMPORT_FORMAT_CB(obj) G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_GNC_IMPORT_FORMAT_CB, GNCImportFormatCB)
-#define GNC_IMPORT_FORMAT_CB_CLASS(klass) G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_GNC_IMPORT_FORMAT_CB, GNCImportFormatCBClass)
-#define IS_GNC_IMPORT_FORMAT_CB(obj) G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_GNC_IMPORT_FORMAT_CB)
-#define IS_GNC_IMPORT_FORMAT_CB_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_GNC_IMPORT_FORMAT_CB)
-
-typedef struct _GNCImportFormatCB GNCImportFormatCB;
-typedef struct _GNCImportFormatCBClass GNCImportFormatCBClass;
-
-#include "gnc-druid-cb.h"
-#include "import-parse.h"
-
-struct _GNCImportFormatCB
-{
- GNCDruidCB parent;
-
- GncImportFormat format;
-};
-
-struct _GNCImportFormatCBClass
-{
- GNCDruidCBClass parent_class;
-};
-
-GType gnc_import_format_cb_get_type(void);
-GNCImportFormatCB* gnc_import_format_cb_new(void);
-
-/* methods */
-
-#ifdef __cplusplus
-//}
-#endif
-
-#endif /* GNC_IMPORT_FORMAT_CB_H */
Deleted: gnucash/trunk/src/import-export/gnc-import-format-gnome.c
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-format-gnome.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gnc-import-format-gnome.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,234 +0,0 @@
-
-
-#include "config.h"
-
-#include <gnome.h>
-#include <glib/gi18n.h>
-
-#include "gnc-druid-gnome-ui.h"
-#include "gnc-import-format-gnome.h"
-#include "gnc-import-desc-format.h"
-
-#include "gnc-basic-gobject.h"
-#include "dialog-utils.h"
-#include "gnc-ui.h"
-#include "gnc-gui-query.h"
-
-static void gnc_import_format_gnome_class_init (GNCImportProvFormatGnomeClass *class);
-static void gnc_import_format_gnome_finalize (GObject *obj);
-
-static GNCDruidPage* gnc_ip_format_gnome_first_page(GNCDruidProvider*);
-static GNCDruidPage* gnc_ip_format_gnome_next_page(GNCDruidProvider*);
-
-static GNCDruidProviderClass *parent_class;
-
-GNC_BASIC_GOBJECT_TYPE(GNCImportProvFormatGnome, GNCImportProvFormatGnomeClass,
- G_TYPE_GNC_DRUID_PROVIDER,
- gnc_import_format_gnome_class_init, NULL,
- gnc_import_format_gnome_get_type)
-
-enum ifg_cols
-{
- IFG_COL_TEXT = 0,
- IFG_COL_VALUE,
- NUM_IFG_COLS
-};
-
-static void
-gnc_import_format_gnome_class_init (GNCImportProvFormatGnomeClass *klass)
-{
- GObjectClass *object_class;
- GNCDruidProviderClass *gdp_class = (GNCDruidProviderClass*)klass;
-
- object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
- object_class->finalize = gnc_import_format_gnome_finalize;
-
- /* override methods */
- gdp_class->first_page = gnc_ip_format_gnome_first_page;
- gdp_class->last_page = gnc_ip_format_gnome_first_page;
- gdp_class->next_page = gnc_ip_format_gnome_next_page;
- // gdp_class->prev_page = gnc_ip_format_gnome_prev_page;
-}
-
-static void
-gnc_import_format_gnome_finalize (GObject *obj)
-{
- //GNCImportProvFormatGnome *prov_f = (GNCImportProvFormatGnome *)obj;
-
- G_OBJECT_CLASS(parent_class)->finalize(obj);
-}
-
-static void
-gnc_ifg_option_changed (GtkComboBox *combo, GNCImportProvFormatGnome *prov_f)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- GncImportFormat value;
-
- g_return_if_fail(GTK_IS_COMBO_BOX(combo));
-
- model = gtk_combo_box_get_model(combo);
- if (!gtk_combo_box_get_active_iter(combo, &iter))
- return;
-
- gtk_tree_model_get(model, &iter, IFG_COL_VALUE, &value, -1);
- prov_f->choice = value;
-}
-
-#define ADD_MENU_ITEM(str,op) { \
- gtk_list_store_append(store, &iter); \
- gtk_list_store_set(store, &iter, \
- IFG_COL_TEXT, str, \
- IFG_COL_VALUE, op, \
- -1); \
-}
-
-static void
-make_menu (GNCImportProvFormatGnome *prov_f, GncImportFormat formats)
-{
- GtkComboBox *combo = prov_f->format_combo;
- GtkListStore *store;
- GtkTreeIter iter;
- GtkCellRenderer *renderer;
-
- store = gtk_list_store_new(NUM_IFG_COLS, G_TYPE_STRING, G_TYPE_INT);
- gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
- g_object_unref(store);
-
- renderer = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, TRUE);
- gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(combo), renderer,
- "text", IFG_COL_TEXT);
-
- /* Numeric formats */
- ADD_MENU_ITEM(_("Period-as-decimal (1,000.00)"), GNCIF_NUM_PERIOD);
- ADD_MENU_ITEM(_("Comma-as-decimal (1.000,00)"), GNCIF_NUM_COMMA);
-
- /* Date formats */
- ADD_MENU_ITEM(_("m-d-y"), GNCIF_DATE_MDY);
- ADD_MENU_ITEM(_("d-m-y"), GNCIF_DATE_DMY);
- ADD_MENU_ITEM(_("y-m-d"), GNCIF_DATE_YMD);
- ADD_MENU_ITEM(_("y-d-m"), GNCIF_DATE_YDM);
-
- g_signal_connect(G_OBJECT(prov_f->format_combo), "changed",
- G_CALLBACK(gnc_ifg_option_changed), prov_f);
- gtk_combo_box_set_active(prov_f->format_combo, 0);
-}
-
-static GNCDruidPage*
-gnc_ip_format_gnome_first_page(GNCDruidProvider* prov)
-{
- GNCImportProvFormatGnome *prov_f = GNC_IMPORT_FORMAT_GNOME(prov);
- GNCImportDescFormat *desc_f = GNC_IMPORT_DESC_FORMAT(prov->desc);
- GncImportFormat formats;
- const gchar* sample;
-
- /* See if we have anything to do. */
- formats = desc_f->get_formats(prov_f->cb);
-
- /* If nothing to do, return NULL */
- if (formats == GNCIF_NONE)
- return NULL;
-
- /* Otherwise set up the menu and sample, then let the user at it */
- sample = desc_f->get_sample(prov_f->cb);
-
- if (sample)
- gtk_label_set_text(prov_f->sample_label, sample);
-
- make_menu(prov_f, formats);
-
- return prov->pages->data;
-}
-
-static GNCDruidPage*
-gnc_ip_format_gnome_next_page(GNCDruidProvider* prov)
-{
- GNCImportProvFormatGnome *prov_f = GNC_IMPORT_FORMAT_GNOME(prov);
-
- /* Grab the entry from the user and supply it to the backend */
- prov_f->cb->format = prov_f->choice;
-
- /* Figure out whether they want to move on or not */
- if (prov->desc->next_cb(&(prov_f->cb->parent)))
- return NULL;
-
- return prov->pages->data;
-}
-
-static GNCDruidProvider*
-gnc_import_pf_gnome_build(GNCDruid* druid, GNCDruidProviderDesc* desc)
-{
- GNCDruidProvider *prov_base;
- GNCImportProvFormatGnome *prov;
- GNCImportDescFormat *desc_f;
- GNCImportFormatCB *cb;
- GtkWidget *window, *page, *label, *format_combo, *sample_label;
- GladeXML *xml;
-
- /* verify that this is the correct provider descriptor */
- g_return_val_if_fail(IS_GNC_IMPORT_DESC_FORMAT(desc), NULL);
- desc_f = GNC_IMPORT_DESC_FORMAT(desc);
-
- g_return_val_if_fail(desc->next_cb, NULL);
- g_return_val_if_fail(desc_f->get_formats, NULL);
- g_return_val_if_fail(desc_f->get_sample, NULL);
-
- /* Build the provider */
- prov = GNC_IMPORT_FORMAT_GNOME(g_object_new(G_TYPE_GNC_IMPORT_FORMAT_GNOME, NULL));
- g_assert(prov);
- prov_base = GNC_DRUID_PROVIDER(prov);
-
- /* Build the callback object. */
- cb = gnc_import_format_cb_new();
- g_assert(cb);
- cb->parent.prov_ctx = prov_base;
- cb->parent.druid_ctx = druid;
- prov->cb = cb;
-
- /* Build the Druid Page */
- xml = gnc_glade_xml_new("import-provider-format.glade",
- "Format Provider Window");
- g_assert(xml);
- window = glade_xml_get_widget(xml, "Format Provider Window");
- page = glade_xml_get_widget(xml, "Format Provider Page");
- label = glade_xml_get_widget(xml, "inst_label");
- format_combo = glade_xml_get_widget(xml, "import_format_combo");
- sample_label = glade_xml_get_widget(xml, "format_sample_label");
-
- prov->format_combo = GTK_COMBO_BOX(format_combo);
- prov->sample_label = GTK_LABEL(sample_label);
-
- g_object_ref(page);
- gtk_container_remove(GTK_CONTAINER(window), page);
- gtk_widget_destroy(window);
-
- /* XXX: Am I going to have to unref this later? */
-
- /* Remember this page for later */
- g_assert(page);
- prov->page = GNOME_DRUID_PAGE(page);
- prov_base->pages = g_list_prepend(NULL, page);
-
- if (desc->title)
- gnome_druid_page_standard_set_title(GNOME_DRUID_PAGE_STANDARD(page),
- desc->title);
-
- if (desc_f->text)
- gtk_label_set_text(GTK_LABEL(label), desc_f->text);
-
- /* Show the page */
- gtk_widget_show_all(GTK_WIDGET(page));
-
- /* Return the provider instance */
- return prov_base;
-}
-
-void
-gnc_import_format_gnome_register(void)
-{
- gnc_druid_provider_register(GNC_DRUID_GNOME_UI, GNC_IMPORT_DESC_TYPE_FORMAT,
- gnc_import_pf_gnome_build);
-}
Deleted: gnucash/trunk/src/import-export/gnc-import-format-gnome.h
===================================================================
--- gnucash/trunk/src/import-export/gnc-import-format-gnome.h 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gnc-import-format-gnome.h 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,53 +0,0 @@
-
-
-#ifndef GNC_IMPORT_FORMAT_GNOME_H
-#define GNC_IMPORT_FORMAT_GNOME_H
-
-#ifdef __cplusplus
-//extern "C" {
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-#include <libgnomeui/libgnomeui.h>
-#include "gnc-druid.h"
-#include "gnc-import-format-cb.h"
-
-#define G_TYPE_GNC_IMPORT_FORMAT_GNOME (gnc_import_format_gnome_get_type())
-#define GNC_IMPORT_FORMAT_GNOME(obj) G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_GNC_IMPORT_FORMAT_GNOME, GNCImportProvFormatGnome)
-#define GNC_IMPORT_FORMAT_GNOME_CLASS(klass) G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_GNC_IMPORT_FORMAT_GNOME, GNCImportProvFormatGnomeClass)
-#define IS_GNC_IMPORT_FORMAT_GNOME(obj) G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_GNC_IMPORT_FORMAT_GNOME)
-#define IS_GNC_IMPORT_FORMAT_GNOME_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_GNC_IMPORT_FORMAT_GNOME)
-#define GNC_IMPORT_FORMAT_GNOME_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), G_TYPE_GNC_IMPORT_FORMAT_GNOME, GNCImportProvFormatGnomeClass))
-
-typedef struct _GNCImportProvFormatGnome GNCImportProvFormatGnome;
-typedef struct _GNCImportProvFormatGnomeClass GNCImportProvFormatGnomeClass;
-
-struct _GNCImportProvFormatGnome
-{
- GNCDruidProvider parent;
-
- GnomeDruidPage* page;
- GtkComboBox* format_combo;
- GtkLabel* sample_label;
-
- GncImportFormat choice;
-
- GNCImportFormatCB* cb;
-};
-
-struct _GNCImportProvFormatGnomeClass
-{
- GNCDruidProviderClass parent_class;
-};
-
-GType gnc_import_format_gnome_get_type(void);
-void gnc_import_format_gnome_register(void);
-
-/* methods */
-
-#ifdef __cplusplus
-//}
-#endif
-
-#endif /* GNC_IMPORT_FORMAT_GNOME_H */
Modified: gnucash/trunk/src/import-export/gncmod-generic-import.c
===================================================================
--- gnucash/trunk/src/import-export/gncmod-generic-import.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/gncmod-generic-import.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -9,7 +9,6 @@
#include <libguile.h>
#include <glib/gi18n.h>
-#include "gnc-import-format-gnome.h"
#include "dialog-preferences.h"
#include "gnc-module.h"
@@ -57,8 +56,6 @@
if (!refcount)
{
- gnc_import_format_gnome_register();
-
/* Add to preferences under Online Banking */
/* The parameters are; glade file, items to add from glade file - last being the dialog, preference tab name */
gnc_preferences_add_to_page("dialog-import.glade", "atm_fee_adj,auto_add_adj,auto_clear_adj,match_adj,matcher_prefs",
Modified: gnucash/trunk/src/import-export/import-account-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-account-matcher.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/import-account-matcher.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -38,7 +38,6 @@
#include "gnc-tree-view-account.h"
#include "gnc-ui.h"
-
static QofLogModule log_module = GNC_MOD_IMPORT;
#define GCONF_SECTION "dialogs/import/generic_matcher/account_matcher"
@@ -156,7 +155,7 @@
gint response;
Account * retval = NULL;
const gchar *retval_name = NULL;
- GladeXML *xml;
+ GtkBuilder *builder;
GtkWidget * online_id_label, *button;
gchar account_description_text[ACCOUNT_DESCRIPTION_MAX_SIZE] = "";
gboolean ok_pressed_retval = FALSE;
@@ -183,20 +182,21 @@
if (retval == NULL && auto_create != 0)
{
/* load the interface */
- xml = gnc_glade_xml_new ("generic-import.glade", "Generic Import Account Picker");
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder,"dialog-import.glade", "Generic Import Account Picker");
/* connect the signals in the interface */
- if (xml == NULL)
+ if (builder == NULL)
{
- PERR("Error opening the glade interface");
+ PERR("Error opening the glade builder interface");
}
- picker->dialog = glade_xml_get_widget (xml, "Generic Import Account Picker");
+ picker->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Generic Import Account Picker"));
if (parent)
gtk_window_set_transient_for (GTK_WINDOW (picker->dialog),
GTK_WINDOW (parent));
- picker->account_tree_sw = glade_xml_get_widget (xml, "account_tree_sw");
- online_id_label = glade_xml_get_widget (xml, "online_id_label");
- button = glade_xml_get_widget (xml, "newbutton");
+ picker->account_tree_sw = GTK_WIDGET(gtk_builder_get_object (builder, "account_tree_sw"));
+ online_id_label = GTK_WIDGET(gtk_builder_get_object (builder, "online_id_label"));
+ button = GTK_WIDGET(gtk_builder_get_object (builder, "newbutton"));
gtk_button_set_use_stock (GTK_BUTTON(button), TRUE);
//printf("gnc_import_select_account(): Fin get widget\n");
@@ -265,6 +265,8 @@
}
}
while (response == GNC_RESPONSE_NEW);
+
+ g_object_unref(G_OBJECT(builder));
gtk_widget_destroy(picker->dialog);
}
else
Modified: gnucash/trunk/src/import-export/import-commodity-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-commodity-matcher.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/import-commodity-matcher.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -27,7 +27,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include <stdlib.h>
#include <math.h>
Modified: gnucash/trunk/src/import-export/import-format-dialog.c
===================================================================
--- gnucash/trunk/src/import-export/import-format-dialog.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/import-format-dialog.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -29,7 +29,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <glade/glade.h>
#include "import-parse.h"
#include "dialog-utils.h"
@@ -131,7 +130,7 @@
gnc_import_choose_fmt(const char* msg, GncImportFormat fmts, gpointer data)
{
- GladeXML *xml;
+ GtkBuilder *builder;
GtkWidget *dialog;
GtkWidget *widget;
@@ -142,12 +141,16 @@
{
return fmts;
}
-
- xml = gnc_glade_xml_new("generic-import.glade", "format_picker");
- dialog = glade_xml_get_widget(xml, "format_picker");
- widget = glade_xml_get_widget(xml, "msg_label");
+ /* Open the Glade Builder file */
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder,"dialog-import.glade", "format_picker");
+ dialog = GTK_WIDGET(gtk_builder_get_object (builder, "format_picker"));
+ widget = GTK_WIDGET(gtk_builder_get_object (builder, "msg_label"));
gtk_label_set_text(GTK_LABEL(widget), msg);
- widget = glade_xml_get_widget(xml, "menu_box");
+ widget = GTK_WIDGET(gtk_builder_get_object (builder, "menu_box"));
+
+ g_object_unref(G_OBJECT(builder));
+
return add_menu_and_run_dialog(dialog, widget, fmts);
}
Modified: gnucash/trunk/src/import-export/import-main-matcher.c
===================================================================
--- gnucash/trunk/src/import-export/import-main-matcher.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/import-main-matcher.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -80,6 +80,11 @@
static QofLogModule log_module = GNC_MOD_IMPORT;
+void on_matcher_ok_clicked (GtkButton *button, GNCImportMainMatcher *info);
+void on_matcher_cancel_clicked (GtkButton *button, gpointer user_data);
+void on_matcher_help_clicked (GtkButton *button, gpointer user_data);
+void on_matcher_help_close_clicked (GtkButton *button, gpointer user_data);
+
/* Local prototypes */
static void
automatch_store_transactions(GNCImportMainMatcher *info,
@@ -126,7 +131,7 @@
g_free (info);
}
-static void
+void
on_matcher_ok_clicked (GtkButton *button,
GNCImportMainMatcher *info)
{
@@ -196,48 +201,51 @@
/* DEBUG ("End") */
}
-static void
-on_matcher_cancel_clicked (GtkButton *button,
- gpointer user_data)
+void
+on_matcher_cancel_clicked (GtkButton *button, gpointer user_data)
{
GNCImportMainMatcher *info = user_data;
gnc_gen_trans_list_delete (info);
}
-static void
-on_matcher_help_close_clicked (GtkButton *button,
- gpointer user_data)
+void
+on_matcher_help_close_clicked (GtkButton *button, gpointer user_data)
{
GtkWidget *help_dialog = user_data;
gtk_widget_destroy(help_dialog);
}
-static void
-on_matcher_help_clicked (GtkButton *button,
- gpointer user_data)
+void
+on_matcher_help_clicked (GtkButton *button, gpointer user_data)
{
GNCImportMainMatcher *info = user_data;
- GladeXML *xml;
- GtkWidget *help_dialog, *box;
+ GtkBuilder *builder;
+ GtkWidget *help_dialog, *box, *closebutton;
- xml = gnc_glade_xml_new ("generic-import.glade", "matcher_help");
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer2");
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer3");
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer4");
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "textbuffer5");
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "matcher_help");
- box = glade_xml_get_widget (xml, "red");
+ box = GTK_WIDGET(gtk_builder_get_object (builder, "red"));
gtk_widget_modify_bg(box, GTK_STATE_NORMAL, &info->color_back_red);
- box = glade_xml_get_widget (xml, "yellow");
+ box = GTK_WIDGET(gtk_builder_get_object (builder, "yellow"));
gtk_widget_modify_bg(box, GTK_STATE_NORMAL, &info->color_back_yellow);
- box = glade_xml_get_widget (xml, "green");
+ box = GTK_WIDGET(gtk_builder_get_object (builder, "green"));
gtk_widget_modify_bg(box, GTK_STATE_NORMAL, &info->color_back_green);
- help_dialog = glade_xml_get_widget (xml, "matcher_help");
+ help_dialog = GTK_WIDGET(gtk_builder_get_object (builder, "matcher_help"));
gtk_window_set_transient_for(GTK_WINDOW(help_dialog),
GTK_WINDOW(info->dialog));
- glade_xml_signal_connect_data(xml, "on_matcher_help_close_clicked",
- G_CALLBACK(on_matcher_help_close_clicked),
- help_dialog);
+ /* Connect the signals */
+ gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, help_dialog);
+ g_object_unref(G_OBJECT(builder));
+
gtk_widget_show(help_dialog);
}
@@ -523,8 +531,9 @@
gint match_date_hardlimit)
{
GNCImportMainMatcher *info;
- GladeXML *xml;
+ GtkBuilder *builder;
GtkWidget *heading_label;
+ GtkWidget *button;
gboolean show_update;
info = g_new0 (GNCImportMainMatcher, 1);
@@ -534,33 +543,23 @@
gnc_import_Settings_set_match_date_hardlimit (info->user_settings, match_date_hardlimit);
/* Initialize the GtkDialog. */
- xml = gnc_glade_xml_new ("generic-import.glade", "transaction_matcher");
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "transaction_matcher");
- info->dialog = glade_xml_get_widget (xml, "transaction_matcher");
+ info->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "transaction_matcher"));
g_assert (info->dialog != NULL);
- info->view = GTK_TREE_VIEW(glade_xml_get_widget (xml, "downloaded_view"));
+ info->view = GTK_TREE_VIEW(gtk_builder_get_object (builder, "downloaded_view"));
g_assert (info->view != NULL);
show_update = gnc_import_Settings_get_action_update_enabled(info->user_settings);
gnc_gen_trans_init_view(info, all_from_same_account, show_update);
- heading_label = glade_xml_get_widget (xml, "heading_label");
+ heading_label = GTK_WIDGET(gtk_builder_get_object (builder, "heading_label"));
g_assert (heading_label != NULL);
/* if (parent)
gtk_window_set_transient_for (GTK_WINDOW (info->dialog),
GTK_WINDOW (parent));*/
- /* Connect signals */
- glade_xml_signal_connect_data(xml, "on_matcher_ok_clicked",
- G_CALLBACK(on_matcher_ok_clicked),
- info);
- glade_xml_signal_connect_data(xml, "on_matcher_cancel_clicked",
- G_CALLBACK(on_matcher_cancel_clicked),
- info);
- glade_xml_signal_connect_data(xml, "on_matcher_help_clicked",
- G_CALLBACK(on_matcher_help_clicked),
- info);
-
/*Initialise the colors */
gdk_color_parse(COLOR_RED, &info->color_back_red);
gdk_color_parse(COLOR_YELLOW, &info->color_back_yellow);
@@ -574,6 +573,11 @@
info->transaction_processed_cb = NULL;
+ /* Connect the signals */
+ gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, info);
+
+ g_object_unref(G_OBJECT(builder));
+
return info;
}
@@ -627,9 +631,7 @@
gtk_list_store_set(store, iter, DOWNLOADED_COL_ACCOUNT, ro_text, -1);
/*Date*/
-
- text =
- qof_print_date ( xaccTransGetDate( gnc_import_TransInfo_get_trans(info) ) );
+ text = qof_print_date ( xaccTransGetDate( gnc_import_TransInfo_get_trans(info) ) );
gtk_list_store_set(store, iter, DOWNLOADED_COL_DATE, text, -1);
g_free(text);
Modified: gnucash/trunk/src/import-export/import-match-picker.c
===================================================================
--- gnucash/trunk/src/import-export/import-match-picker.c 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/import-match-picker.c 2011-12-17 11:02:55 UTC (rev 21735)
@@ -36,7 +36,6 @@
#include "qof.h"
#include "gnc-ui-util.h"
-#include <glade/glade.h>
#include "dialog-utils.h"
/********************************************************************\
* Constants *
@@ -401,7 +400,7 @@
static void
init_match_picker_gui(GNCImportMatchPicker * matcher)
{
- GladeXML *xml;
+ GtkBuilder *builder;
/* DEBUG("Begin..."); */
@@ -409,12 +408,13 @@
matcher->user_settings = gnc_import_Settings_new ();
/* load the interface */
- xml = gnc_glade_xml_new ("generic-import.glade", "match_picker");
- g_return_if_fail (xml != NULL);
+ builder = gtk_builder_new();
+ gnc_builder_add_from_file (builder, "dialog-import.glade", "match_picker");
+ g_return_if_fail (builder != NULL);
- matcher->transaction_matcher = glade_xml_get_widget (xml, "match_picker");
- matcher->downloaded_view = (GtkTreeView *)glade_xml_get_widget (xml, "downloaded_view");
- matcher->match_view = (GtkTreeView *)glade_xml_get_widget (xml, "matched_view");
+ matcher->transaction_matcher = GTK_WIDGET(gtk_builder_get_object (builder, "match_picker"));
+ matcher->downloaded_view = (GtkTreeView *)GTK_WIDGET(gtk_builder_get_object (builder, "download_view"));
+ matcher->match_view = (GtkTreeView *)GTK_WIDGET(gtk_builder_get_object (builder, "matched_view"));
gnc_import_match_picker_init_downloaded_view(matcher);
gnc_import_match_picker_init_match_view(matcher);
@@ -430,6 +430,8 @@
GTK_WINDOW (matcher->transaction_matcher));
gtk_widget_show(matcher->transaction_matcher);
+ g_object_unref(G_OBJECT(builder));
+
}/* end init_match_picker_gui */
/**
Deleted: gnucash/trunk/src/import-export/import-provider-format.glade
===================================================================
--- gnucash/trunk/src/import-export/import-provider-format.glade 2011-12-17 11:02:41 UTC (rev 21734)
+++ gnucash/trunk/src/import-export/import-provider-format.glade 2011-12-17 11:02:55 UTC (rev 21735)
@@ -1,99 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.10 -->
- <requires lib="gnome"/>
- <!-- interface-requires gnome 2531.8424 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkWindow" id="Format Provider Window">
- <property name="visible">True</property>
- <property name="title" translatable="yes">window1</property>
- <child>
- <widget class="GnomeDruidPageStandard" id="Format Provider Page">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Set a date format for this QIF file</property>
- <property name="title_foreground_gdk">#a028081e49eb</property>
- <property name="background_gdk">#a028081ed728</property>
- <property name="logo_background_gdk">#57804081d718</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="druid-vbox22">
- <property name="visible">True</property>
- <property name="border_width">25</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="inst_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">The QIF file format does not specify which order the day, month, and year components of a date are printed. In most cases, it is possible to automatically determine which format is in use in a particular file. However, in the file you have just imported there exist more than one possible format that fits the data.
-
-Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-day-year.
-</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">True</property>
- <child>
- <widget class="GtkLabel" id="label847714">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Sample data:</property>
- <property name="justify">right</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="format_sample_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">(no)</property>
- <property name="justify">center</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkComboBox" id="import_format_combo">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label847713">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Click "Back" to cancel the loading of this file and choose another.</property>
- <property name="justify">center</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
-</glade-interface>
More information about the gnucash-changes
mailing list