IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gtk3'

Browse Source
This commit is contained in:
Geert Janssens 2017-07-08 17:49:44 +02:00
commit 5405cf480c
320 changed files with 20110 additions and 23205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
AUTHORS
View File

@ -1,11 +1,8 @@
GETTING HELP: If you need help with GnuCash, please do not contact any
of the Authors directly. Instead, first look at
http://wiki.gnucash.org/wiki/FAQ to see if your question is common and
is answered there. If that doesn't help, there are mailing lists in
English, Dutch, French, German, Italian, and Portuguese and an English
IRC channel. More information can be found at
http://wiki.gnucash.org/wiki/Mailing_Lists and
http://wiki.gnucash.org/wiki/IRC.
of the Authors directly. Instead, first look at the <a href="http://wiki.gnucash.org/wiki/FAQ">FAQ</a> to see if your question
is common and is answered there. If that doesn't help, there are mailing
lists in English, Dutch, French, German, Italian, Portuguese and an English
IRC channel. More information can be found at for <a href="http://wiki.gnucash.org/wiki/Mailing_Lists">Mailing List</a> and <a href="http://wiki.gnucash.org/wiki/IRC">IRC</a>.
Current Project Team:
=====================
@ -47,7 +44,7 @@ Linas Vepstas liked what he saw: the GUI was slick, the code was
X-Accountant internals to add double-entry, an account hierarchy,
split out a transaction mini-engine, add support for stocks, and
spiffed up the help menus. All for version 1.0 as of January 1998.
Since then, for version 1.1 & 1.2, the engine was expanded &
Since then, for version 1.1 &amp; 1.2, the engine was expanded &amp;
refined, and the register window code completely redesigned and
made mostly Motif-(and GUI-)independent.
@ -87,7 +84,7 @@ Christian Stimming was a report-generating monster. He's been one of
translation.
Joshua Sled worked on scheduled transactions and general project
monkeying (IRC bot, logs, website maintenance, bug-triage, &c.).
monkeying (IRC bot, logs, website maintenance, bug-triage, &amp;c.).
Derek Atkins wrote the business-accounting package for Gnucash. This
includes the Customer/Vendor database, Job tracking, Order entry,
@ -129,11 +126,11 @@ Other Contributors:
(In alphabetical order)
Mike Alexander Cap gains, lot and MacOS fixes.
Andrew Arensburger for FreeBSD & other patches
Andrew Arensburger for FreeBSD &amp; other patches
Matt Armstrong for misc fixes
Jon Arney Windows porting patches, misc fixes
A. Alper Atici Turkish translation
J. Alex Aycinena Heavily improved Tax Report & TXF export
J. Alex Aycinena Heavily improved Tax Report &amp; TXF export
Roman Bertle Austrian German account templates
Jan-Pascal van Best MT940 importer
Dennis Björklund Swedish translation
@ -153,10 +150,10 @@ Conrad Canterford register bug fix
Bill Carlson performance improvements
David Marín Carreño Spanish translation of account setup.
Tomas Cernaj GType consistency changes, register fixes
Carol Champagne documentation & a patient GUI usability critic
Carol Champagne documentation &amp; a patient GUI usability critic
Nikos Charonitakis Greek translation
Graham Chapman for the xacc-rpts addon package
George Chen for MS-Money QIF's & fixes
George Chen for MS-Money QIF's &amp; fixes
Albert Chin-A-Young configure.in patch
Kenneth Christiansen Danish translation
Matthew Condell FreeBSD patch
@ -164,7 +161,7 @@ Patrick Condron for webserver and T1 connection (credits to rackspace.com)
Raphael Dechenaux register patch
Ciaran Deignan for AIX binary version
Glen Ditchfield updated documentation
Tyson Dowd for config/make patches & debian maint
Tyson Dowd for config/make patches &amp; debian maint
Koen D'Hondt for Solaris patches to XmHTML
Bob Drzyzgula for budgeting design notes
Frank H. Ellenberger small things, usually germany related
@ -187,7 +184,8 @@ Christoph Franzen German account template for Wohnungswirtschaft business
Dave Freese for leap-year fix
Todd T. Fries OpenBSD fix
John Goerzen file i/o fix for 64-bit architectures
Jeff Green Python bindings, with grant funding from Assiniboine Credit Union (http://assiniboine.mb.ca/)
Jeff Green Python bindings, with grant funding from
<a href="http://assiniboine.mb.ca/">Assiniboine Credit Union</a>
Hans de Graaff XML patches
Daniel Hagerty patch to balance sheet report
Mitsuo Hamada messages Japanese translations
@ -207,7 +205,9 @@ Edward J. Huff Date handling in reports, quarterly option
Tomokazu Iwashita Japanese translation of xea
Geert Janssens GUI fixes for Lots, autocompletion in gnc-general-search, several small fixes
David Jafferian Delete account query code.
Mark Jenkins Python bindings, with grant funding from Assiniboine Credit Union (http://assiniboine.mb.ca/) and Legal Aid Manitoba (http://www.legalaid.mb.ca/)
Mark Jenkins Python bindings, with grant funding from
<a href="http://assiniboine.mb.ca/">Assiniboine Credit Union</a> and
<a href="http://www.legalaid.mb.ca/">Legal Aid Manitoba</a>
Rich Johnson Mac OS X patch
Miquel Jordana Vilamitjana Spanish translation of manual
Prakash Kailasa for gnome build fixes
@ -263,7 +263,7 @@ Martin Norbäck Swedish translation
Peter Norton for a valiant attempt at a GTK port
Bill Nottingham guile configure patch
Peter O'Gorman file i/o patches, Mac OS X patches
OmNiBuS web site graphics & content
OmNiBuS web site graphics &amp; content
Gordon Oliver multiple currency status line patch
Scott Oonk register changes for utf-8 and pango.
Alan Orndorff Solaris packager
@ -277,7 +277,7 @@ Gavin Porter for euro style dates
Tomas Pospisek Debian patches
Paul Poulain French translations
John Ralls MacOSX integration
Ron Record for SCO Unixware & OpenServer binaries
Ron Record for SCO Unixware &amp; OpenServer binaries
Keith Refson Solaris fixes
Jerry Quinn Bugfixes
Andreas Rottmann fixes for g-wrap 1.9
@ -293,20 +293,20 @@ Keld Simonsen messages Danish translation
Richard Skelton for Solaris cleanup
Thomas Vander Stichele Macro for filtering system directories
James Strandboge "Easy" Invoice report
Henning Spruth for German text & euro date rework
Henning Spruth for German text &amp; euro date rework
Ben Stanley test infrastructure
Robby Stephenson register & file history patches
Robby Stephenson register &amp; file history patches
Robert Stocks additional register report options
Michael T. Garrison Stuber report patch
Bartek Szady engine and build system patches
Herbert Thoma gnome register & euro support patches
Herbert Thoma gnome register &amp; euro support patches
Tor Harald Thorland testing, Norwegian translation
Nigel Titley British English translation
James A. Treacy doc patch
Arnold Troeger Mandrake packager
Diane Trout scheme QIF import patch
Nicolae Turcan Romanian translation
Richard -Gilligan- Uschold tax report & txf export
Richard -Gilligan- Uschold tax report &amp; txf export
Tom Van Braeckel various patches and fixes
Matthew Vanecek lots of postgres backend work
Didier Vidal various G2 fixes.

9
CMakeLists.txt
View File

@ -165,11 +165,10 @@ GNC_PKG_CHECK_MODULES (GMODULE REQUIRED gmodule-2.0>=2.20)
GNC_PKG_CHECK_MODULES (GTHREAD REQUIRED gthread-2.0>=2.20)
GNC_PKG_CHECK_MODULES (LIBXML2 REQUIRED libxml-2.0>=2.7.0)
GNC_PKG_CHECK_MODULES (GNOMECANVAS REQUIRED libgnomecanvas-2.0)
GNC_PKG_CHECK_MODULES (LIBXSLT REQUIRED libxslt)
GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkit-1.0>=1.2)
GNC_PKG_CHECK_MODULES (WEBKIT REQUIRED webkit2gtk-4.0>=2.6.0)
IF (WITH_GNUCASH)
GNC_PKG_CHECK_MODULES (GTK2 REQUIRED gtk+-2.0>=2.24.0)
GNC_PKG_CHECK_MODULES (GTK3 REQUIRED gtk+-3.0>=3.14.0)
ENDIF (WITH_GNUCASH)
GNC_PKG_CHECK_MODULES (ZLIB REQUIRED zlib)
@ -448,7 +447,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") # FIXME: should be -std=
IF (UNIX)
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wno-unused")
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations -std=gnu11")
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations -std=gnu11")
SET( CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2")
ENDIF (UNIX)
IF (MINGW)
@ -459,7 +458,7 @@ IF (APPLE)
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedef")
ENDIF(APPLE)
SET( CMAKE_C_FLAGS_DEBUG "-O0 -g ${CMAKE_C_FLAGS}")
SET( CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS}")
SET( CMAKE_CXX_FLAGS_DEBUG "-O0 -g ${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
IF (APPLE AND WITH_GNUCASH)
SET(CMAKE_MACOSX_RPATH ON)

11
DOCUMENTERS
View File

@ -1,9 +1,8 @@
GETTING HELP: If you need help with GnuCash, please do not contact any of the
Documentors directly. Instead, first look at http://wiki.gnucash.org/wiki/FAQ to
see if your question is common and is answered there. If that doesn't help,
there are mailing lists in English, Dutch, French, German, Italian, and
Portuguese and an English IRC channel. More information can be found at
http://wiki.gnucash.org/wiki/Mailing_Lists and http://wiki.gnucash.org/wiki/IRC.
GETTING HELP: If you need help with GnuCash, please do not contact any
of the Documentors directly. Instead, first look at the <a href="http://wiki.gnucash.org/wiki/FAQ">FAQ</a> to see if your question
is common and is answered there. If that doesn't help, there are mailing
lists in English, Dutch, French, German, Italian, Portuguese and an English
IRC channel. More information can be found at for <a href="http://wiki.gnucash.org/wiki/Mailing_Lists">Mailing List</a> and <a href="http://wiki.gnucash.org/wiki/IRC">IRC</a>.
Contributors:

8
configure.ac
View File

@ -1340,14 +1340,10 @@ then
AM_CFLAGS="$CFLAGS"
CFLAGS="$__cflags"
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24.0)
PKG_CHECK_MODULES(GTK, gtk+-3.0)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
PKG_CHECK_MODULES(GNOMECANVAS, libgnomecanvas-2.0)
AC_SUBST(GNOMECANVAS_CFLAGS)
AC_SUBST(GNOMECANVAS_LIBS)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0)
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
@ -1355,7 +1351,7 @@ then
### --------------------------------------------------------------------------
### checks for webkit
PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= "1.2")
PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= "2.6.0")
AC_SUBST(WEBKIT_CFLAGS)
AC_SUBST(WEBKIT_LIBS)

8
lib/goffice/go-charmap-sel.c
View File

@ -255,7 +255,7 @@ static GHashTable *encoding_hash;
struct _GOCharmapSel
{
GtkHBox box;
GtkBox box;
GOOptionMenu *encodings;
GtkMenu *encodings_menu;
GOCharmapSelTestDirection test;
@ -263,7 +263,7 @@ struct _GOCharmapSel
typedef struct
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
gboolean (*charmap_changed)(GOCharmapSel *cs, char const *new_charmap);
} GOCharmapSelClass;
@ -361,6 +361,8 @@ static void cs_emphasize_label(GtkLabel *label)
static void cs_init(GOCharmapSel *cs)
{
gtk_orientable_set_orientation (GTK_ORIENTABLE(cs), GTK_ORIENTATION_HORIZONTAL);
cs->test = GO_CHARMAP_SEL_TO_UTF8;
cs->encodings = GO_OPTION_MENU(go_option_menu_new());
@ -604,7 +606,7 @@ go_charmap_sel_get_type (void)
(GInstanceInitFunc) cs_init
};
go_charmap_sel_type = g_type_register_static (GTK_TYPE_HBOX,
go_charmap_sel_type = g_type_register_static (GTK_TYPE_BOX,
"GOCharmapSel",
&go_charmap_sel_info, 0);
}

46
lib/goffice/go-optionmenu.c
View File

@ -121,7 +121,7 @@ static void go_option_menu_position(GtkMenu *menu, gint *x, gint *y,
widget = GTK_WIDGET(option_menu);
gtk_widget_get_child_requisition(GTK_WIDGET(menu), &requisition);
gtk_widget_get_preferred_size(GTK_WIDGET(menu), &requisition, NULL);
menu_width = requisition.width;
gdk_window_get_origin(gtk_widget_get_window(widget), &menu_xpos,
@ -139,14 +139,14 @@ static void go_option_menu_position(GtkMenu *menu, gint *x, gint *y,
if (GTK_IS_CHECK_MENU_ITEM(child)
&& gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(child)))
{
gtk_widget_get_child_requisition(child, &requisition);
gtk_widget_get_preferred_size(child, &requisition, NULL);
menu_ypos -= requisition.height / 2;
break;
}
if (gtk_widget_get_visible(child))
{
gtk_widget_get_child_requisition(child, &requisition);
gtk_widget_get_preferred_size(child, &requisition, NULL);
menu_ypos -= requisition.height;
}
@ -251,8 +251,7 @@ void go_option_menu_set_menu(GOOptionMenu *option_menu, GtkWidget *menu)
if (option_menu->menu)
{
if (option_menu->menu->active)
gtk_menu_shell_cancel(option_menu->menu);
gtk_menu_shell_cancel(option_menu->menu);
handle_menu_signals(option_menu, FALSE);
@ -353,13 +352,13 @@ static void go_option_menu_get_property(GObject *object, guint prop_id,
}
}
static void go_option_menu_destroy(GtkObject *object)
static void go_option_menu_destroy(GtkWidget *widget)
{
GOOptionMenu *option_menu;
g_return_if_fail(GO_IS_OPTION_MENU(object));
g_return_if_fail(GO_IS_OPTION_MENU(widget));
option_menu = GO_OPTION_MENU(object);
option_menu = GO_OPTION_MENU(widget);
if (option_menu->menu)
{
@ -369,13 +368,12 @@ static void go_option_menu_destroy(GtkObject *object)
}
option_menu->selected = NULL;
GTK_OBJECT_CLASS(parent_class)->destroy(object);
GTK_WIDGET_CLASS(parent_class)->destroy(widget);
}
static void go_option_menu_class_init(GOOptionMenuClass *class)
{
GObjectClass *gobject_class = (GObjectClass*) class;
GtkObjectClass *object_class = (GtkObjectClass*) class;
GtkWidgetClass *widget_class = (GtkWidgetClass*) class;
parent_class = g_type_class_peek_parent(class);
@ -386,7 +384,7 @@ static void go_option_menu_class_init(GOOptionMenuClass *class)
gobject_class->set_property = go_option_menu_set_property;
gobject_class->get_property = go_option_menu_get_property;
object_class->destroy = go_option_menu_destroy;
widget_class->destroy = go_option_menu_destroy;
widget_class->button_press_event = go_option_menu_button_press;
widget_class->key_press_event = go_option_menu_key_press;
@ -397,28 +395,36 @@ static void go_option_menu_class_init(GOOptionMenuClass *class)
static void go_option_menu_init(GOOptionMenu *option_menu)
{
GtkBox *box;
GtkWidget *box;
GtkWidget *arrow, *sep;
gtk_widget_set_can_focus(GTK_WIDGET(option_menu), TRUE);
gtk_widget_set_can_default(GTK_WIDGET(option_menu), FALSE);
gtk_widget_set_receives_default(GTK_WIDGET(option_menu), FALSE);
box = GTK_BOX(gtk_hbox_new(FALSE, FALSE));
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
option_menu->menu = NULL;
option_menu->selected = NULL;
option_menu->button_label = GTK_LABEL(gtk_label_new(""));
gtk_box_pack_start(box, GTK_WIDGET(option_menu->button_label), FALSE, TRUE,
0);
gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(option_menu->button_label), FALSE, TRUE, 0);
#if GTK_CHECK_VERSION(3,14,0)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
#else
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
#endif
#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
#else
gtk_widget_set_margin_left (GTK_WIDGET(arrow), 5);
#endif
arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE);
g_object_set(arrow, "xalign", 0.75, NULL);
gtk_box_pack_end(box, arrow, FALSE, FALSE, 0);
gtk_box_pack_end(GTK_BOX(box), arrow, FALSE, FALSE, 0);
sep = gtk_vseparator_new();
gtk_box_pack_end(box, sep, FALSE, FALSE, 0);
sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_end(GTK_BOX(box), sep, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(option_menu), GTK_WIDGET(box));
}

3
po/POTFILES.in
View File

@ -574,12 +574,13 @@ src/register/register-gnome/gncmod-register-gnome.c
src/register/register-gnome/gnucash-color.c
src/register/register-gnome/gnucash-cursor.c
src/register/register-gnome/gnucash-date-picker.c
src/register/register-gnome/gnucash-grid.c
src/register/register-gnome/gnucash-header.c
src/register/register-gnome/gnucash-item-edit.c
src/register/register-gnome/gnucash-item-list.c
src/register/register-gnome/gnucash-register.c
src/register/register-gnome/gnucash-scrolled-window.c
src/register/register-gnome/gnucash-sheet.c
src/register/register-gnome/gnucash-sheet-private.c
src/register/register-gnome/gnucash-style.c
src/register/register-gnome/pricecell-gnome.c
src/register/register-gnome/quickfillcell-gnome.c

4
src/app-utils/CMakeLists.txt
View File

@ -79,9 +79,9 @@ SET (app_utils_SOURCES
SET_SOURCE_FILES_PROPERTIES (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
SET(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
SET(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GTK2_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
SET(app_utils_ALL_LIBRARIES gncmod-engine gnc-module ${GTK3_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS})
SET(app_utils_ALL_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/calculation ${LIBXML2_INCLUDE_DIRS}
${LIBXSLT_INCLUDE_DIRS} ${GTK2_INCLUDE_DIRS})
${LIBXSLT_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS})
IF (WIN32)
LIST(APPEND app_utils_ALL_SOURCES gnc-help-utils.c)

2
src/backend/dbi/CMakeLists.txt
View File

@ -29,7 +29,7 @@ ADD_LIBRARY (gncmod-backend-dbi
${backend_dbi_noinst_HEADERS}
)
TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\")

2
src/bin/CMakeLists.txt
View File

@ -25,7 +25,7 @@ TARGET_COMPILE_DEFINITIONS(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
TARGET_LINK_LIBRARIES (gnucash
gncmod-ledger-core gncmod-report-gnome gnc-gnome gncmod-gnome-utils gncmod-app-utils
gncmod-engine gnc-module gnc-core-utils gnc-qof gncmod-report-system
${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK2_LDFLAGS} ${GTK_MAC_LDFLAGS}
${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
)

1
src/bin/gnucash-bin.c
View File

@ -805,7 +805,6 @@ main(int argc, char ** argv)
}
/* We need to initialize gtk before looking up all modules */
gnc_gtk_add_rc_file ();
if(!gtk_init_check (&argc, &argv))
{
g_printerr(_("%s\nRun '%s --help' to see a full list of available command line options.\n"),

4
src/business/business-gnome/CMakeLists.txt
View File

@ -51,7 +51,7 @@ ADD_LIBRARY(gncmod-business-gnome
)
TARGET_LINK_LIBRARIES(gncmod-business-gnome gnc-business-ledger gncmod-gnome-search
gncmod-report-gnome gncmod-gnome-utils gnc-gnome gncmod-engine gnc-qof ${GTK2_LDFLAGS})
gncmod-report-gnome gncmod-gnome-utils gnc-gnome gncmod-engine gnc-qof ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-business-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.business.gnome\")
@ -84,4 +84,4 @@ SET_LOCAL_DIST(business_gnome_DIST_local CMakeLists.txt Makefile.am ${business_g
${business_gnome_noinst_HEADERS} ${gncmod_business_gnome_SCHEME})
SET(business_gnome_DIST ${business_gnome_DIST_local} ${business_gnome_gschema_DIST}
${business_gnome_gtkbuilder_DIST} ${business_gnome_ui_DIST} PARENT_SCOPE)
${business_gnome_gtkbuilder_DIST} ${business_gnome_ui_DIST} PARENT_SCOPE)

26
src/business/business-gnome/business-options-gnome.c
View File

@ -84,7 +84,7 @@ make_name_label (char *name)
colon_name = g_strconcat (name, ":", (char *)NULL);
label = gtk_label_new (colon_name);
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gnc_label_set_alignment (label, 1.0, 0.5);
g_free (colon_name);
return label;
@ -114,7 +114,9 @@ owner_set_widget (GNCOption *option, GtkBox *page_box,
GtkWidget *value;
GtkWidget *label;
*enclosing = gtk_hbox_new (FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
label = make_name_label (name);
gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0);
@ -183,7 +185,9 @@ customer_set_widget (GNCOption *option, GtkBox *page_box,
GtkWidget *value;
GtkWidget *label;
*enclosing = gtk_hbox_new (FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
label = make_name_label (name);
gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0);
@ -241,7 +245,9 @@ vendor_set_widget (GNCOption *option, GtkBox *page_box,
GtkWidget *value;
GtkWidget *label;
*enclosing = gtk_hbox_new (FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
label = make_name_label (name);
gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0);
@ -298,7 +304,9 @@ employee_set_widget (GNCOption *option, GtkBox *page_box,
GtkWidget *value;
GtkWidget *label;
*enclosing = gtk_hbox_new (FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
label = make_name_label (name);
gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0);
@ -372,7 +380,9 @@ invoice_set_widget (GNCOption *option, GtkBox *page_box,
GtkWidget *value;
GtkWidget *label;
*enclosing = gtk_hbox_new (FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
label = make_name_label (name);
gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0);
@ -450,7 +460,9 @@ taxtable_set_widget (GNCOption *option, GtkBox *page_box,
GtkWidget *value;
GtkWidget *label;
*enclosing = gtk_hbox_new (FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
label = make_name_label (name);
gtk_box_pack_start (GTK_BOX (*enclosing), label, FALSE, FALSE, 0);

23
src/business/business-gnome/dialog-billterms.c
View File

@ -109,7 +109,6 @@ read_widget (GtkBuilder *builder, char *name, gboolean read_only)
adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
gtk_adjustment_set_step_increment (adj, 0.0);
gtk_adjustment_set_page_increment (adj, 0.0);
gtk_adjustment_changed (adj);
}
return widget;
@ -132,9 +131,12 @@ init_notebook_widgets (BillTermNB *notebook, gboolean read_only,
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "pdiscount_day_adj");
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "pdue_day_adj");
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "pcutoff_day_adj");
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "Term Notebook");
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "terms_notebook_window");
notebook->notebook = GTK_WIDGET(gtk_builder_get_object (builder, "term_notebook"));
parent = GTK_WIDGET(gtk_builder_get_object (builder, "Term Notebook"));
parent = GTK_WIDGET(gtk_builder_get_object (builder, "terms_notebook_window"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(notebook->notebook), "GncBillTermsDialog");
/* load the "days" widgets */
notebook->days_due_days = read_widget (builder, "days:due_days", read_only);
@ -419,14 +421,14 @@ new_billterm_dialog (BillTermsWindow *btw, GncBillTerm *term,
/* Open and read the Glade File */
if (term == NULL)
{
dialog_name = "New Term Dialog";
dialog_name = "new_term_dialog";
dialog_desc = "description_entry";
dialog_combo = "type_combobox";
dialog_nb = "note_book_hbox";
}
else
{
dialog_name = "Edit Term Dialog";
dialog_name = "edit_term_dialog";
dialog_desc = "entry_desc";
dialog_combo = "type_combo";
dialog_nb = "notebook_hbox";
@ -437,6 +439,10 @@ new_billterm_dialog (BillTermsWindow *btw, GncBillTerm *term,
nbt->dialog = GTK_WIDGET(gtk_builder_get_object (builder, dialog_name));
nbt->name_entry = GTK_WIDGET(gtk_builder_get_object (builder, "name_entry"));
nbt->desc_entry = GTK_WIDGET(gtk_builder_get_object (builder, dialog_desc));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(nbt->dialog), "GncBillTermsDialog");
if (name)
gtk_entry_set_text (GTK_ENTRY (nbt->name_entry), name);
@ -767,13 +773,16 @@ gnc_ui_billterms_window_new (QofBook *book)
/* Open and read the Glade File */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "Terms Window");
btw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Terms Window"));
gnc_builder_add_from_file (builder, "dialog-billterms.glade", "terms_dialog");
btw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "terms_dialog"));
btw->terms_view = GTK_WIDGET(gtk_builder_get_object (builder, "terms_view"));
btw->desc_entry = GTK_WIDGET(gtk_builder_get_object (builder, "desc_entry"));
btw->type_label = GTK_WIDGET(gtk_builder_get_object (builder, "type_label"));
btw->term_vbox = GTK_WIDGET(gtk_builder_get_object (builder, "term_vbox"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(btw->dialog), "GncBillTermsDialog");
/* Initialize the view */
view = GTK_TREE_VIEW(btw->terms_view);
store = gtk_list_store_new (NUM_BILL_TERM_COLS, G_TYPE_STRING, G_TYPE_POINTER);

7
src/business/business-gnome/dialog-choose-owner.c
View File

@ -59,13 +59,16 @@ gcoi_create_dialog(Split* split)
/* Open the Glade file */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-choose-owner.glade", "Choose Owner Dialog");
gnc_builder_add_from_file (builder, "dialog-choose-owner.glade", "choose_owner_dialog");
g_assert(builder);
/* Get the dialog handle */
dco->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Choose Owner Dialog"));
dco->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "choose_owner_dialog"));
g_assert(dco->dialog);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dco->dialog), "GncChooseOwnerDialog");
/* Get the title widget and set the title */
widget = GTK_WIDGET(gtk_builder_get_object (builder, "title_label"));
if (1 == 1)

7
src/business/business-gnome/dialog-customer.c
View File

@ -572,8 +572,11 @@ gnc_customer_new_window (QofBook *bookp, GncCustomer *cust)
gnc_builder_add_from_file (builder, "dialog-customer.glade", "terms_store");
gnc_builder_add_from_file (builder, "dialog-customer.glade", "tax_included_store");
gnc_builder_add_from_file (builder, "dialog-customer.glade", "taxtable_store");
gnc_builder_add_from_file (builder, "dialog-customer.glade", "Customer Dialog");
cw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "Customer Dialog"));
gnc_builder_add_from_file (builder, "dialog-customer.glade", "customer_dialog");
cw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "customer_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(cw->dialog), "GncCustomerDialog");
g_object_set_data (G_OBJECT (cw->dialog), "dialog_info", cw);

21
src/business/business-gnome/dialog-date-close.c
View File

@ -137,8 +137,11 @@ gnc_dialog_date_close_parented (GtkWidget *parent, const char *message,
ddc->ts = ts;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-date-close.glade", "Date Close Dialog");
ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Date Close Dialog"));
gnc_builder_add_from_file (builder, "dialog-date-close.glade", "date_close_dialog");
ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "date_close_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ddc->dialog), "GncDateCloseDialog");
date_box = GTK_WIDGET(gtk_builder_get_object (builder, "date_box"));
ddc->date = gnc_date_edit_new (time(NULL), FALSE, FALSE);
@ -227,10 +230,13 @@ gnc_dialog_dates_acct_question_parented (GtkWidget *parent, const char *message,
ddc->terms = terms;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-date-close.glade", "Date Account Dialog");
ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Date Account Dialog"));
gnc_builder_add_from_file (builder, "dialog-date-close.glade", "date_account_dialog");
ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "date_account_dialog"));
ddc->memo_entry = GTK_WIDGET(gtk_builder_get_object (builder, "memo_entry"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ddc->dialog), "GncDateCloseDialog");
acct_box = GTK_WIDGET(gtk_builder_get_object (builder, "acct_hbox"));
ddc->acct_combo = gnc_account_sel_new();
gtk_box_pack_start (GTK_BOX(acct_box), ddc->acct_combo, TRUE, TRUE, 0);
@ -343,8 +349,11 @@ gnc_dialog_date_acct_parented (GtkWidget *parent, const char *message,
ddc->acct = *acct;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-date-close.glade", "Date Account Dialog");
ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Date Account Dialog"));
gnc_builder_add_from_file (builder, "dialog-date-close.glade", "date_account_dialog");
ddc->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "date_account_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ddc->dialog), "GncDateCloseDialog");
acct_box = GTK_WIDGET(gtk_builder_get_object (builder, "acct_hbox"));
ddc->acct_combo = gnc_account_sel_new();

7
src/business/business-gnome/dialog-employee.c
View File

@ -435,8 +435,11 @@ gnc_employee_new_window (QofBook *bookp,
/* Find the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-employee.glade", "Employee Dialog");
ew->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Employee Dialog"));
gnc_builder_add_from_file (builder, "dialog-employee.glade", "employee_dialog");
ew->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "employee_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ew->dialog), "GncEmployeeDialog");
g_object_set_data (G_OBJECT (ew->dialog), "dialog_info", ew);

31
src/business/business-gnome/dialog-invoice.c
View File

@ -42,6 +42,7 @@
#include "gnc-date-edit.h"
#include "gnc-amount-edit.h"
#include "gnucash-sheet.h"
#include "gnucash-register.h"
#include "window-report.h"
#include "dialog-search.h"
#include "search-param.h"
@ -247,10 +248,13 @@ iw_ask_unpost (InvoiceWindow *iw)
gint response;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-invoice.glade", "Unpost Message Dialog");
dialog = GTK_WIDGET (gtk_builder_get_object (builder, "Unpost Message Dialog"));
gnc_builder_add_from_file (builder, "dialog-invoice.glade", "unpost_message_dialog");
dialog = GTK_WIDGET (gtk_builder_get_object (builder, "unpost_message_dialog"));
toggle = GTK_TOGGLE_BUTTON(gtk_builder_get_object (builder, "yes_tt_reset"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncInvoiceDialog");
gtk_window_set_transient_for (GTK_WINDOW(dialog),
GTK_WINDOW(iw_get_window(iw)));
@ -1203,15 +1207,16 @@ add_summary_label (GtkWidget *summarybar, const char *label_str)
GtkWidget *hbox;
GtkWidget *label;
hbox = gtk_hbox_new(FALSE, 2);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
gtk_box_pack_start (GTK_BOX(summarybar), hbox, FALSE, FALSE, 5);
label = gtk_label_new (label_str);
gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment (label, 1.0, 0.5);
gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment (label, 1.0, 0.5);
gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
return label;
@ -1228,7 +1233,8 @@ gnc_invoice_window_create_summary_bar (InvoiceWindow *iw)
iw->total_subtotal_label = NULL;
iw->total_tax_label = NULL;
summarybar = gtk_hbox_new (FALSE, 4);
summarybar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
gtk_box_set_homogeneous (GTK_BOX (summarybar), FALSE);
iw->total_label = add_summary_label (summarybar, _("Total:"));
@ -2259,6 +2265,9 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
gnc_builder_add_from_file (builder, "dialog-invoice.glade", "invoice_entry_vbox");
dialog = GTK_WIDGET (gtk_builder_get_object (builder, "invoice_entry_vbox"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncInvoiceDialog");
/* Autoconnect all the signals */
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, iw);
@ -2417,9 +2426,8 @@ gnc_invoice_create_page (InvoiceWindow *iw, gpointer page)
/* Watch the order of operations, here... */
regWidget = gnucash_register_new (gnc_entry_ledger_get_table
(entry_ledger));
(entry_ledger), NULL);
gtk_widget_show(regWidget);
gnc_table_init_gui( regWidget, NULL);
frame = GTK_WIDGET (gtk_builder_get_object (builder, "ledger_frame"));
gtk_container_add (GTK_CONTAINER (frame), regWidget);
@ -2532,8 +2540,11 @@ gnc_invoice_window_new_invoice (InvoiceDialogType dialog_type, QofBook *bookp,
/* Find the glade page layout */
iw->builder = builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-invoice.glade", "terms_store");
gnc_builder_add_from_file (builder, "dialog-invoice.glade", "New Invoice Dialog");
iw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "New Invoice Dialog"));
gnc_builder_add_from_file (builder, "dialog-invoice.glade", "new_invoice_dialog");
iw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "new_invoice_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(iw->dialog), "GncInvoiceDialog");
g_object_set_data (G_OBJECT (iw->dialog), "dialog_info", iw);

7
src/business/business-gnome/dialog-job.c
View File

@ -335,10 +335,13 @@ gnc_job_new_window (QofBook *bookp, GncOwner *owner, GncJob *job)
/* Load the Glade File */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-job.glade", "Job Dialog");
gnc_builder_add_from_file (builder, "dialog-job.glade", "job_dialog");
/* Find the dialog */
jw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Job Dialog"));
jw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "job_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(jw->dialog), "GncJobDialog");
/* Get entry points */
jw->id_entry = GTK_WIDGET(gtk_builder_get_object (builder, "id_entry"));

19
src/business/business-gnome/dialog-order.c
View File

@ -33,6 +33,7 @@
#include "gnc-gui-query.h"
#include "gnc-ui-util.h"
#include "qof.h"
#include "gnucash-register.h"
#include "gnucash-sheet.h"
#include "dialog-search.h"
#include "search-param.h"
@ -588,8 +589,11 @@ gnc_order_new_window (QofBook *bookp, OrderDialogType type,
/* Find the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-order.glade", "Order Entry Dialog");
ow->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Order Entry Dialog"));
gnc_builder_add_from_file (builder, "dialog-order.glade", "order_entry_dialog");
ow->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "order_entry_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ow->dialog), "GncOrderDialog");
/* Grab the widgets */
ow->id_entry = GTK_WIDGET(gtk_builder_get_object (builder, "id_entry"));
@ -641,8 +645,8 @@ gnc_order_new_window (QofBook *bookp, OrderDialogType type,
// gnc_entry_ledger_load (entry_ledger, entries);
/* Watch the order of operations, here... */
regWidget = gnucash_register_new (gnc_entry_ledger_get_table (entry_ledger));
gnc_table_init_gui( regWidget, NULL);
regWidget = gnucash_register_new (gnc_entry_ledger_get_table (entry_ledger),
NULL);
ow->reg = GNUCASH_REGISTER (regWidget);
gnucash_sheet_set_window (gnucash_register_get_sheet (ow->reg), ow->dialog);
gnc_entry_ledger_set_parent (entry_ledger, ow->dialog);
@ -699,9 +703,12 @@ gnc_order_window_new_order (QofBook *bookp, GncOwner *owner)
/* Find the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-order.glade", "New Order Dialog");
gnc_builder_add_from_file (builder, "dialog-order.glade", "new_order_dialog");
ow->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "New Order Dialog"));
ow->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "new_order_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ow->dialog), "GncOrderDialog");
g_object_set_data (G_OBJECT (ow->dialog), "dialog_info", ow);

10
src/business/business-gnome/dialog-payment.c
View File

@ -930,8 +930,11 @@ new_payment_window (GncOwner *owner, QofBook *book, GncInvoice *invoice)
gnc_builder_add_from_file (builder, "dialog-payment.glade", "docs_list_vert_adj");
gnc_builder_add_from_file (builder, "dialog-payment.glade", "docs_list_model");
gnc_builder_add_from_file (builder, "dialog-payment.glade", "post_combo_model");
gnc_builder_add_from_file (builder, "dialog-payment.glade", "Payment Dialog");
pw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "Payment Dialog"));
gnc_builder_add_from_file (builder, "dialog-payment.glade", "payment_dialog");
pw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "payment_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(pw->dialog), "GncPaymentDialog");
/* Grab the widgets and build the dialog */
pw->payment_warning = GTK_WIDGET (gtk_builder_get_object (builder, "payment_warning"));
@ -996,6 +999,9 @@ new_payment_window (GncOwner *owner, QofBook *book, GncInvoice *invoice)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(pw->docs_list_tree_view));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
// Set grid lines option to preference
gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(pw->docs_list_tree_view), gnc_tree_view_get_grid_lines_pref ());
/* Configure date column */
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_get_column (GTK_TREE_VIEW (pw->docs_list_tree_view), 0);

7
src/business/business-gnome/dialog-vendor.c
View File

@ -438,8 +438,11 @@ gnc_vendor_new_window (QofBook *bookp, GncVendor *vendor)
gnc_builder_add_from_file (builder, "dialog-vendor.glade", "terms_store");
gnc_builder_add_from_file (builder, "dialog-vendor.glade", "tax_included_store");
gnc_builder_add_from_file (builder, "dialog-vendor.glade", "taxtable_store");
gnc_builder_add_from_file (builder, "dialog-vendor.glade", "Vendor Dialog");
vw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "Vendor Dialog"));
gnc_builder_add_from_file (builder, "dialog-vendor.glade", "vendor_dialog");
vw->dialog = GTK_WIDGET (gtk_builder_get_object (builder, "vendor_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(vw->dialog), "GncVendorDialog");
/* Get entry points */
vw->id_entry = GTK_WIDGET (gtk_builder_get_object (builder, "id_entry"));

4
src/business/business-gnome/gnc-plugin-business.c
View File

@ -47,7 +47,7 @@
#include "gnc-file.h"
#include "guile-mappings.h"
#include "gnc-session.h"
#include "gnome-utils/gnc-icons.h" /* for GNC_STOCK_INVOICE_NEW */
#include "gnome-utils/gnc-icons.h" /* for GNC_ICON_INVOICE_NEW */
#include "gnc-prefs.h"
#include "gnome-utils/gnc-main-window.h"
@ -308,7 +308,7 @@ static GtkActionEntry gnc_plugin_actions [] =
/* Toolbar */
{
"ToolbarNewInvoiceAction", GNC_STOCK_INVOICE_NEW, N_("New _Invoice..."), NULL,
"ToolbarNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice..."), NULL,
N_("Open the New Invoice dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_new_invoice)
},

46
src/business/business-gnome/gnc-plugin-page-invoice.c
View File

@ -37,10 +37,11 @@
#include "gnc-gobject-utils.h"
#include "gnc-gnome-utils.h"
#include "gnc-icons.h"
#include "gnucash-sheet.h"
#include "gnucash-register.h"
#include "gnc-prefs.h"
#include "gnc-ui-util.h"
#include "gnc-window.h"
#include "dialog-utils.h"
/* This static indicates the debugging module that this .o belongs to. */
static QofLogModule log_module = GNC_MOD_GUI;
@ -99,98 +100,98 @@ static GtkActionEntry gnc_plugin_page_invoice_actions [] =
/* File menu */
{
"FileNewAccountAction", GNC_STOCK_NEW_ACCOUNT, N_("New _Account..."), NULL,
"FileNewAccountAction", GNC_ICON_NEW_ACCOUNT, N_("New _Account..."), NULL,
N_("Create a new account"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_new_account)
},
{
"FilePrintAction", GTK_STOCK_PRINT, N_("Print Invoice"), "<primary>p",
"FilePrintAction", "document-print", N_("Print Invoice"), "<primary>p",
N_("Make a printable invoice"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_print)
},
/* Edit menu */
{
"EditCutAction", GTK_STOCK_CUT, N_("_Cut"), NULL,
"EditCutAction", "edit-cut", N_("_Cut"), NULL,
NULL,
G_CALLBACK (gnc_plugin_page_invoice_cmd_cut)
},
{
"EditCopyAction", GTK_STOCK_COPY, N_("Copy"), NULL,
"EditCopyAction", "edit-copy", N_("Copy"), NULL,
NULL,
G_CALLBACK (gnc_plugin_page_invoice_cmd_copy)
},
{
"EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), NULL,
"EditPasteAction", "edit-paste", N_("_Paste"), NULL,
NULL,
G_CALLBACK (gnc_plugin_page_invoice_cmd_paste)
},
{
"EditEditInvoiceAction", GNC_STOCK_INVOICE_EDIT, N_("_Edit Invoice"), NULL,
"EditEditInvoiceAction", GNC_ICON_INVOICE_EDIT, N_("_Edit Invoice"), NULL,
N_("Edit this invoice"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_edit)
},
{
"EditDuplicateInvoiceAction", GNC_STOCK_INVOICE_DUPLICATE, N_("_Duplicate Invoice"),
"EditDuplicateInvoiceAction", GNC_ICON_INVOICE_DUPLICATE, N_("_Duplicate Invoice"),
NULL, N_("Create a new invoice as a duplicate of the current one"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_duplicateInvoice)
},
{
"EditPostInvoiceAction", GNC_STOCK_INVOICE_POST, N_("_Post Invoice"), NULL,
"EditPostInvoiceAction", GNC_ICON_INVOICE_POST, N_("_Post Invoice"), NULL,
N_("Post this Invoice to your Chart of Accounts"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_post)
},
{
"EditUnpostInvoiceAction", GNC_STOCK_INVOICE_UNPOST, N_("_Unpost Invoice"), NULL,
"EditUnpostInvoiceAction", GNC_ICON_INVOICE_UNPOST, N_("_Unpost Invoice"), NULL,
N_("Unpost this Invoice and make it editable"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_unpost)
},
/* Actions menu */
{
"RecordEntryAction", GTK_STOCK_ADD, N_("_Enter"), NULL,
"RecordEntryAction", "list-add", N_("_Enter"), NULL,
N_("Record the current entry"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_enter)
},
{
"CancelEntryAction", GTK_STOCK_CANCEL, N_("_Cancel"), NULL,
"CancelEntryAction", "process-stop", N_("_Cancel"), NULL,
N_("Cancel the current entry"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_cancel)
},
{
"DeleteEntryAction", GTK_STOCK_DELETE, N_("_Delete"), NULL,
"DeleteEntryAction", "edit-delete", N_("_Delete"), NULL,
N_("Delete the current entry"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_delete)
},
{
"BlankEntryAction", GTK_STOCK_GOTO_BOTTOM, N_("_Blank"), NULL,
"BlankEntryAction", "go-bottom", N_("_Blank"), NULL,
N_("Move to the blank entry at the bottom of the Invoice"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_blank)
},
{
"DuplicateEntryAction", GTK_STOCK_COPY, N_("Dup_licate Entry"), NULL,
"DuplicateEntryAction", "edit-copy", N_("Dup_licate Entry"), NULL,
N_("Make a copy of the current entry"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_duplicateEntry)
},
{
"EntryUpAction", GTK_STOCK_GO_UP, N_("Move Entry _Up"), NULL,
"EntryUpAction", "go-up", N_("Move Entry _Up"), NULL,
N_("Move the current entry one row upwards"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_entryUp)
},
{
"EntryDownAction", GTK_STOCK_GO_DOWN, N_("Move Entry Do_wn"), NULL,
"EntryDownAction", "go-down", N_("Move Entry Do_wn"), NULL,
N_("Move the current entry one row downwards"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_entryDown)
},
/* Business menu */
{
"BusinessNewInvoiceAction", GNC_STOCK_INVOICE_NEW, N_("New _Invoice"), "",
"BusinessNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice"), "",
N_("Create a new invoice for the same owner as the current one"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_new_invoice)
},
{
"ToolsProcessPaymentAction", GNC_STOCK_INVOICE_PAY, N_("_Pay Invoice"), NULL,
"ToolsProcessPaymentAction", GNC_ICON_INVOICE_PAY, N_("_Pay Invoice"), NULL,
N_("Enter a payment for the owner of this Invoice"),
G_CALLBACK (gnc_plugin_page_invoice_cmd_pay_invoice)
},
@ -460,7 +461,12 @@ gnc_plugin_page_invoice_create_widget (GncPluginPage *plugin_page)
return priv->widget;
}
priv->widget = gtk_vbox_new (FALSE, 0);
priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE);
// Set the style context for this page so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(priv->widget), "GncInvoicePage");
gtk_widget_show (priv->widget);
widget = gnc_invoice_create_page(priv->iw, page);

47
src/business/business-gnome/gnc-plugin-page-owner-tree.c
View File

@ -138,39 +138,39 @@ static GtkActionEntry gnc_plugin_page_owner_tree_actions [] =
/* Edit menu */
{
"OTEditVendorAction", GNC_STOCK_EDIT_ACCOUNT, N_("E_dit Vendor"), "<primary>e",
"OTEditVendorAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Vendor"), "<primary>e",
N_("Edit the selected vendor"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_edit_owner)
},
{
"OTEditCustomerAction", GNC_STOCK_EDIT_ACCOUNT, N_("E_dit Customer"), "<primary>e",
"OTEditCustomerAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Customer"), "<primary>e",
N_("Edit the selected customer"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_edit_owner)
},
{
"OTEditEmployeeAction", GNC_STOCK_EDIT_ACCOUNT, N_("E_dit Employee"), "<primary>e",
"OTEditEmployeeAction", GNC_ICON_EDIT_ACCOUNT, N_("E_dit Employee"), "<primary>e",
N_("Edit the selected employee"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_edit_owner)
},
{
"OTNewVendorAction", GNC_STOCK_NEW_ACCOUNT, N_("_New Vendor..."), NULL,
"OTNewVendorAction", GNC_ICON_NEW_ACCOUNT, N_("_New Vendor..."), NULL,
N_("Create a new vendor"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_owner)
},
{
"OTNewCustomerAction", GNC_STOCK_NEW_ACCOUNT, N_("_New Customer..."), NULL,
"OTNewCustomerAction", GNC_ICON_NEW_ACCOUNT, N_("_New Customer..."), NULL,
N_("Create a new customer"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_owner)
},
{
"OTNewEmployeeAction", GNC_STOCK_NEW_ACCOUNT, N_("_New Employee..."), NULL,
"OTNewEmployeeAction", GNC_ICON_NEW_ACCOUNT, N_("_New Employee..."), NULL,
N_("Create a new employee"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_owner)
},
#if 0 /* Disabled due to crash */
{
"EditDeleteOwnerAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete Owner..."), "Delete",
"EditDeleteOwnerAction", GNC_ICON_DELETE_ACCOUNT, N_("_Delete Owner..."), "Delete",
N_("Delete selected owner"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_delete_owner)
},
@ -184,27 +184,27 @@ static GtkActionEntry gnc_plugin_page_owner_tree_actions [] =
/* Business menu */
{
"OTNewBillAction", GNC_STOCK_INVOICE_NEW, N_("New _Bill..."), NULL,
"OTNewBillAction", GNC_ICON_INVOICE_NEW, N_("New _Bill..."), NULL,
N_("Create a new bill"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_invoice)
},
{
"OTNewInvoiceAction", GNC_STOCK_INVOICE_NEW, N_("New _Invoice..."), NULL,
"OTNewInvoiceAction", GNC_ICON_INVOICE_NEW, N_("New _Invoice..."), NULL,
N_("Create a new invoice"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_invoice)
},
{
"OTNewVoucherAction", GNC_STOCK_INVOICE_NEW, N_("New _Voucher..."), NULL,
"OTNewVoucherAction", GNC_ICON_INVOICE_NEW, N_("New _Voucher..."), NULL,
N_("Create a new voucher"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_new_invoice)
},
{
"OTVendorListingReportAction", GTK_STOCK_PRINT_PREVIEW, N_("Vendor Listing"), NULL,
"OTVendorListingReportAction", "document-print-preview", N_("Vendor Listing"), NULL,
N_("Show vendor aging overview for all vendors"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_owners_report)
},
{
"OTCustomerListingReportAction", GTK_STOCK_PRINT_PREVIEW, N_("Customer Listing"), NULL,
"OTCustomerListingReportAction", "document-print-preview", N_("Customer Listing"), NULL,
N_("Show customer aging overview for all customers"),
G_CALLBACK (gnc_plugin_page_owner_tree_cmd_owners_report)
},
@ -397,7 +397,7 @@ gnc_plugin_page_owner_tree_class_init (GncPluginPageOwnerTreeClass *klass)
object_class->finalize = gnc_plugin_page_owner_tree_finalize;
gnc_plugin_class->tab_icon = GNC_STOCK_ACCOUNT;
gnc_plugin_class->tab_icon = GNC_ICON_ACCOUNT;
gnc_plugin_class->plugin_name = GNC_PLUGIN_PAGE_OWNER_TREE_NAME;
gnc_plugin_class->create_widget = gnc_plugin_page_owner_tree_create_widget;
gnc_plugin_class->destroy_widget = gnc_plugin_page_owner_tree_destroy_widget;
@ -560,6 +560,7 @@ gnc_plugin_page_owner_tree_create_widget (GncPluginPage *plugin_page)
GtkTreeViewColumn *col;
const gchar *state_section = NULL;
gchar* label = "";
const gchar *style_label = NULL;
ENTER("page %p", plugin_page);
page = GNC_PLUGIN_PAGE_OWNER_TREE (plugin_page);
@ -570,9 +571,13 @@ gnc_plugin_page_owner_tree_create_widget (GncPluginPage *plugin_page)
return priv->widget;
}
priv->widget = gtk_vbox_new (FALSE, 0);
priv->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous (GTK_BOX (priv->widget), FALSE);
gtk_widget_show (priv->widget);
// Set the style context for this page so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(priv->widget), "GncBusinessPage");
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@ -597,33 +602,39 @@ gnc_plugin_page_owner_tree_create_widget (GncPluginPage *plugin_page)
g_object_set_data(G_OBJECT(col), DEFAULT_VISIBLE, GINT_TO_POINTER(1));
gnc_tree_view_configure_columns(GNC_TREE_VIEW(tree_view));
switch (priv->owner_type)
{
case GNC_OWNER_NONE :
case GNC_OWNER_UNDEFINED :
PWARN("missing owner_type");
label = _("Unknown");
style_label = "GncUnknown";
break;
case GNC_OWNER_CUSTOMER :
label = _("Customers");
state_section = "Customers Overview";
style_label = "GncCustomers";
break;
case GNC_OWNER_JOB :
label = _("Jobs");
state_section = "Jobs Overview";
style_label = "GncJobs";
break;
case GNC_OWNER_VENDOR :
label = _("Vendors");
state_section = "Vendors Overview";
style_label = "GncVendors";
break;
case GNC_OWNER_EMPLOYEE :
label = _("Employees");
state_section = "Employees Overview";
style_label = "GncEmployees";
break;
}
// Set a secondary style context for this page so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(priv->widget), style_label);
g_object_set(G_OBJECT(tree_view), "state-section", state_section,
"show-column-menu", TRUE,
NULL);
@ -1075,8 +1086,8 @@ gnc_plugin_page_owner_tree_cmd_delete_owner (GtkAction *action, GncPluginPageOwn
"%s", message);
g_free(message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("Delete"), GTK_RESPONSE_ACCEPT,
(gchar *)NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL);
response = gtk_dialog_run(GTK_DIALOG(dialog));

21
src/business/business-gnome/gtkbuilder/business-options-gnome.glade
View File

@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<object class="GtkWindow" id="dummy_toplevel">
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="taxtable_store">
<columns>
<!-- column-name taxtable_name -->
<column type="gchararray"/>
<!-- column-name taxtable_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkWindow" id="dummy_toplevel_window">
<property name="can_focus">False</property>
<child>
<object class="GtkComboBox" id="taxtable_menu">
@ -17,12 +26,4 @@
</object>
</child>
</object>
<object class="GtkListStore" id="taxtable_store">
<columns>
<!-- column-name taxtable_name -->
<column type="gchararray"/>
<!-- column-name taxtable_value -->
<column type="gpointer"/>
</columns>
</object>
</interface>

366
src/business/business-gnome/gtkbuilder/business-prefs.glade
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="cust_days_in_adj">
<property name="lower">1</property>
<property name="upper">180</property>
@ -36,88 +36,37 @@
</row>
</data>
</object>
<object class="GtkWindow" id="Preferences">
<object class="GtkWindow" id="preferences_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Preferences</property>
<child>
<object class="GtkTable" id="business_prefs">
<object class="GtkGrid" id="business_prefs">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="n_rows">15</property>
<property name="n_columns">4</property>
<property name="column_spacing">12</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label53">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="right_attach">4</property>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label54">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;Invoices&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
@ -129,15 +78,14 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Whether tax is included by default in entries on Bills. This setting is inherited by new customers and vendors.</property>
<property name="tooltip_text" translatable="yes">Whether tax is included by default in entries on Bills. This setting is inherited by new customers and vendors.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">13</property>
<property name="bottom_attach">14</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
@ -148,40 +96,29 @@
<property name="tooltip_markup">How many days in the future to warn about Bills coming due.</property>
<property name="tooltip_text" translatable="yes">How many days in the future to warn about Bills coming due.</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>
<property name="adjustment">days_in_adj</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="left_attach">2</property>
<property name="top_attach">12</property>
<property name="bottom_attach">13</property>
<property name="x_options"/>
<property name="y_options"/>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Days in advance:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.business.bill/days-in-advance</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="left_attach">1</property>
<property name="top_attach">12</property>
<property name="bottom_attach">13</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
@ -193,51 +130,39 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Whether to display the list of Bills Due at startup.</property>
<property name="tooltip_text" translatable="yes">Whether to display the list of Bills Due at startup.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">12</property>
<property name="bottom_attach">13</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;Bills&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">11</property>
<property name="bottom_attach">12</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel" id="label50">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
</object>
<packing>
<property name="right_attach">4</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="left_attach">0</property>
<property name="top_attach">9</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="pref/dialogs.business.invoice/tax-included">
<property name="label" translatable="yes">_Tax included</property>
@ -247,16 +172,14 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Whether tax is included by default in entries on Invoices. This setting is inherited by new customers and vendors.</property>
<property name="tooltip_text" translatable="yes">Whether tax is included by default in entries on Invoices. This setting is inherited by new customers and vendors.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</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 name="x_padding">12</property>
</packing>
</child>
<child>
@ -268,16 +191,14 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Whether multiple entries in an invoice which transfer to the same account should be accumulated into a single split by default. This setting can be changed in the Post dialog.</property>
<property name="tooltip_text" translatable="yes">Whether multiple entries in an invoice which transfer to the same account should be accumulated into a single split by default. This setting can be changed in the Post dialog.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</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 name="x_padding">12</property>
</packing>
</child>
<child>
@ -289,30 +210,27 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">If checked, each invoice will be opened in its own top level window. If clear, the invoice will be opened in the current window.</property>
<property name="tooltip_text" translatable="yes">If checked, each invoice will be opened in its own top level window. If clear, the invoice will be opened in the current window.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</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 name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0.47999998927116394</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -324,16 +242,14 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">If active, extra toolbar buttons for common business functions are shown as well. Otherwise they are not shown.</property>
<property name="tooltip_text" translatable="yes">If active, extra toolbar buttons for common business functions are shown as well. Otherwise they are not shown.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</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 name="x_padding">12</property>
</packing>
</child>
<child>
@ -353,32 +269,21 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">3</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 name="width">3</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">10</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="label" translatable="yes">Report for printing:</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</packing>
</child>
<child>
@ -388,15 +293,14 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">At post time, automatically attempt to pay customer documents with outstanding pre-payments and counter documents. The pre-payments and documents obviously have to be against the same customer. Counter documents are documents with opposite sign. For example for an invoice, customer credit notes and negative invoices are considered counter documents.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</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 name="x_padding">12</property>
</packing>
</child>
<child>
@ -406,108 +310,170 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">At post time, automatically attempt to pay vendor documents with outstanding pre-payments and counter documents. The pre-payments and documents obviously have to be against the same vendor. Counter documents are documents with opposite sign. For example for a bill, vendor credit notes and negative bills are considered counter documents.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">14</property>
<property name="bottom_attach">15</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
<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>
<object class="GtkCheckButton" id="pref/dialogs.business.invoice/notify-when-due">
<property name="label" translatable="yes">Not_ify when due</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Whether to display the list of Invoices Due at startup.</property>
<property name="tooltip_text" translatable="yes">Whether to display the list of Invoices Due at startup.</property>
<property name="tooltip_markup" translatable="yes">Whether to display the list of Invoices Due at startup.</property>
<property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</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 name="x_padding">12</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="pref/dialogs.business.invoice/days-in-advance">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">How many days in the future to warn about Bills coming due.</property>
<property name="tooltip_text" translatable="yes">How many days in the future to warn about Bills coming due.</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>
<property name="tooltip_markup" translatable="yes">How many days in the future to warn about Bills coming due.</property>
<property name="adjustment">cust_days_in_adj</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
<property name="left_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options"/>
<property name="y_options"/>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Days in ad_vance:</property>
<property name="label" translatable="yes">_Days in advance:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pref/dialogs.business.invoice/days-in-advance</property>
<property name="mnemonic_widget">pref/dialogs.business.bill/days-in-advance</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="left_attach">1</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"/>
</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>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
</object>

1379
src/business/business-gnome/gtkbuilder/dialog-billterms.glade
View File

File diff suppressed because it is too large Load Diff

41
src/business/business-gnome/gtkbuilder/dialog-choose-owner.glade
View File

@ -1,30 +1,30 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="Choose Owner Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="choose_owner_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Choose Owner Dialog</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area3">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -34,13 +34,12 @@
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -57,9 +56,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="title_label">
<property name="visible">True</property>
@ -74,7 +74,7 @@
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator1">
<object class="GtkSeparator" id="hseparator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@ -85,19 +85,19 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Description</property>
</object>
<packing>
@ -110,7 +110,6 @@
<object class="GtkLabel" id="owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">(owner)</property>
</object>
<packing>
@ -127,15 +126,15 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="desc_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label">(desc)</property>
</object>
<packing>
@ -145,7 +144,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="owner_box">
<object class="GtkBox" id="owner_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>

180
src/business/business-gnome/gtkbuilder/dialog-customer.glade
View File

@ -1,7 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<!-- interface-requires gtk+ 2.16 -->
<object class="GtkDialog" id="Customer Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="tax_included_store">
<columns>
<!-- column-name tax_included_name -->
<column type="gchararray"/>
<!-- column-name tax_included_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="taxtable_store">
<columns>
<!-- column-name taxtable_name -->
<column type="gchararray"/>
<!-- column-name taxtable_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="terms_store">
<columns>
<!-- column-name terms_name -->
<column type="gchararray"/>
<!-- column-name terms_pointer -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkDialog" id="customer_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Customer</property>
@ -20,13 +45,12 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_customer_window_help_cb" swapped="no"/>
</object>
<packing>
@ -37,13 +61,12 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_customer_window_cancel_cb" swapped="no"/>
</object>
<packing>
@ -54,14 +77,13 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_customer_window_ok_cb" swapped="no"/>
</object>
<packing>
@ -83,9 +105,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@ -93,20 +116,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="border_width">2</property>
<child>
<object class="GtkVBox" id="vbox11">
<object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Customer Number: </property>
<property name="justify">right</property>
</object>
@ -120,7 +148,7 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Company Name: </property>
<property name="justify">right</property>
</object>
@ -136,7 +164,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@ -155,9 +183,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox12">
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="id_entry">
@ -229,20 +258,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkVBox" id="vbox5">
<object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Name: </property>
<property name="justify">right</property>
</object>
@ -256,7 +290,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Address: </property>
<property name="justify">right</property>
</object>
@ -306,7 +340,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Phone: </property>
<property name="justify">right</property>
</object>
@ -320,7 +354,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Fax: </property>
<property name="justify">right</property>
</object>
@ -334,7 +368,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Email: </property>
<property name="justify">right</property>
</object>
@ -353,10 +387,11 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox6">
<object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="name_entry">
@ -493,6 +528,12 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@ -533,9 +574,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox13">
<object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
@ -543,19 +585,24 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox6">
<object class="GtkBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkVBox" id="vbox7">
<object class="GtkBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Currency: </property>
<property name="justify">right</property>
</object>
@ -569,7 +616,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Terms: </property>
<property name="justify">right</property>
</object>
@ -583,7 +630,7 @@
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Discount: </property>
<property name="justify">right</property>
</object>
@ -597,7 +644,7 @@
<object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Credit Limit: </property>
<property name="justify">right</property>
</object>
@ -611,7 +658,7 @@
<object class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Tax Included: </property>
<property name="justify">right</property>
</object>
@ -625,7 +672,7 @@
<object class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Tax Table: </property>
<property name="justify">right</property>
</object>
@ -643,13 +690,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="currency_box">
<object class="GtkBox" id="currency_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -682,7 +730,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="discount_box">
<object class="GtkBox" id="discount_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -696,7 +744,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="credit_box">
<object class="GtkBox" id="credit_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -729,7 +777,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox7">
<object class="GtkBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -738,7 +786,8 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Override the global Tax Table?</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="margin_right">5</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_customer_taxtable_check_cb" swapped="no"/>
@ -819,9 +868,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox9">
<object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
@ -829,20 +879,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox5">
<object class="GtkBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkVBox" id="vbox8">
<object class="GtkBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">4</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Name: </property>
<property name="justify">right</property>
</object>
@ -856,7 +911,7 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Address: </property>
<property name="justify">right</property>
</object>
@ -906,7 +961,7 @@
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Phone: </property>
<property name="justify">right</property>
</object>
@ -920,7 +975,7 @@
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Fax: </property>
<property name="justify">right</property>
</object>
@ -934,7 +989,7 @@
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Email: </property>
<property name="justify">right</property>
</object>
@ -953,10 +1008,11 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="shipname_entry">
@ -1122,28 +1178,4 @@
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="tax_included_store">
<columns>
<!-- column-name tax_included_name -->
<column type="gchararray"/>
<!-- column-name tax_included_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="taxtable_store">
<columns>
<!-- column-name taxtable_name -->
<column type="gchararray"/>
<!-- column-name taxtable_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="terms_store">
<columns>
<!-- column-name terms_name -->
<column type="gchararray"/>
<!-- column-name terms_pointer -->
<column type="gpointer"/>
</columns>
</object>
</interface>

112
src/business/business-gnome/gtkbuilder/dialog-date-close.glade
View File

@ -1,31 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<object class="GtkDialog" id="Date Account Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="date_account_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Question</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
<object class="GtkBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area6">
<object class="GtkButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -35,14 +36,13 @@
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_dialog_date_close_ok_cb" swapped="no"/>
</object>
<packing>
@ -60,11 +60,12 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="the_top_hbox">
<object class="GtkBox" id="the_top_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
@ -72,8 +73,7 @@
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">8</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon_name">dialog-question</property>
</object>
<packing>
<property name="expand">False</property>
@ -85,8 +85,7 @@
<object class="GtkLabel" id="top_msg_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">8</property>
<property name="label" translatable="no">Dummy message</property>
<property name="label">Dummy message</property>
</object>
<packing>
<property name="expand">True</property>
@ -102,7 +101,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox4">
<object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
@ -119,16 +118,17 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox4">
<object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="postdate_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="no">postdate</property>
<property name="halign">end</property>
<property name="label">postd</property>
<property name="justify">right</property>
</object>
<packing>
@ -141,8 +141,8 @@
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="no">duedate</property>
<property name="halign">end</property>
<property name="label">duedate</property>
<property name="justify">right</property>
</object>
<packing>
@ -155,8 +155,8 @@
<object class="GtkLabel" id="memo_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="Yes">Description</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Description</property>
<property name="justify">right</property>
</object>
<packing>
@ -169,8 +169,8 @@
<object class="GtkLabel" id="acct_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="no">acct</property>
<property name="halign">end</property>
<property name="label">acct</property>
<property name="justify">right</property>
</object>
<packing>
@ -199,12 +199,13 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox5">
<object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="post_date_box">
<object class="GtkBox" id="post_date_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -218,7 +219,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="date_hbox">
<object class="GtkBox" id="date_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -235,12 +236,9 @@
<object class="GtkEntry" id="memo_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char_set">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -249,7 +247,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="acct_hbox">
<object class="GtkBox" id="acct_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -264,11 +262,11 @@
</child>
<child>
<object class="GtkCheckButton" id="question_check">
<property name="label" translatable="no">question</property>
<property name="label">question</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@ -319,31 +317,31 @@
<action-widget response="-5">okbutton1</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="Date Close Dialog">
<object class="GtkDialog" id="date_close_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Question</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<object class="GtkBox" id="dialog-vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area4">
<object class="GtkButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_dialog_date_close_cancel_cb" swapped="no"/>
</object>
<packing>
@ -354,14 +352,13 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_dialog_date_close_ok_cb" swapped="no"/>
</object>
<packing>
@ -379,11 +376,12 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="the_hbox">
<object class="GtkBox" id="the_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
@ -391,8 +389,7 @@
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">8</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon_name">dialog-question</property>
</object>
<packing>
<property name="expand">False</property>
@ -404,8 +401,7 @@
<object class="GtkLabel" id="msg_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xpad">8</property>
<property name="label" translatable="no">Dummy message</property>
<property name="label">Dummy message</property>
</object>
<packing>
<property name="expand">True</property>
@ -416,14 +412,15 @@
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="border_width">3</property>
<child>
<object class="GtkLabel" id="label1">
@ -441,8 +438,7 @@
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="no">label</property>
<property name="label">label</property>
</object>
<packing>
<property name="expand">False</property>
@ -452,7 +448,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="date_box">
<object class="GtkBox" id="date_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -481,13 +477,13 @@
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>

188
src/business/business-gnome/gtkbuilder/dialog-employee.glade
View File

@ -1,33 +1,33 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="Employee Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="employee_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Employee</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_employee_window_destroy_cb"/>
<signal name="destroy" handler="gnc_employee_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area3">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_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="gnc_employee_window_help_cb"/>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_employee_window_help_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -37,14 +37,13 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_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="gnc_employee_window_cancel_cb"/>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_employee_window_cancel_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -54,15 +53,14 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_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="gnc_employee_window_ok_cb"/>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_employee_window_ok_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -83,9 +81,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@ -93,20 +92,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="border_width">2</property>
<child>
<object class="GtkVBox" id="vbox11">
<object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Employee Number: </property>
<property name="justify">right</property>
</object>
@ -120,7 +124,7 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Username: </property>
<property name="justify">right</property>
</object>
@ -136,7 +140,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@ -155,9 +159,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox12">
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="id_entry">
@ -166,14 +171,11 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">The employee ID number. If left blank a reasonable number will be chosen for you</property>
<property name="tooltip_text" translatable="yes">The employee ID number. If left blank a reasonable number will be chosen for you</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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>
<signal name="changed" handler="gnc_employee_name_changed_cb"/>
<signal name="changed" handler="gnc_employee_name_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -185,14 +187,11 @@
<object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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>
<signal name="changed" handler="gnc_employee_name_changed_cb"/>
<signal name="changed" handler="gnc_employee_name_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@ -242,20 +241,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkVBox" id="vbox5">
<object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Name: </property>
<property name="justify">right</property>
</object>
@ -269,7 +273,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Address: </property>
<property name="justify">right</property>
</object>
@ -319,7 +323,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Phone: </property>
<property name="justify">right</property>
</object>
@ -333,7 +337,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Fax: </property>
<property name="justify">right</property>
</object>
@ -347,7 +351,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Email: </property>
<property name="justify">right</property>
</object>
@ -366,22 +370,20 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox6">
<object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -393,13 +395,10 @@
<object class="GtkEntry" id="addr1_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -411,13 +410,10 @@
<object class="GtkEntry" id="addr2_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -429,13 +425,10 @@
<object class="GtkEntry" id="addr3_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -447,13 +440,10 @@
<object class="GtkEntry" id="addr4_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -465,13 +455,10 @@
<object class="GtkEntry" id="phone_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -483,13 +470,10 @@
<object class="GtkEntry" id="fax_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -501,13 +485,10 @@
<object class="GtkEntry" id="email_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -545,19 +526,24 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkVBox" id="vbox14">
<object class="GtkBox" id="vbox14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox7">
<object class="GtkBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="border_width">2</property>
<child>
<object class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Language: </property>
<property name="justify">right</property>
</object>
@ -571,13 +557,11 @@
<object class="GtkEntry" id="language_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="hexpand">True</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -615,14 +599,19 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkVBox" id="vbox15">
<object class="GtkBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="border_width">2</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="hbox8">
<object class="GtkBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -639,9 +628,10 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hours_hbox">
<object class="GtkBox" id="hours_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<child>
<placeholder/>
</child>
@ -660,7 +650,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox9">
<object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -677,9 +667,10 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="rate_hbox">
<object class="GtkBox" id="rate_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<child>
<placeholder/>
</child>
@ -698,14 +689,13 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox10">
<object class="GtkBox" id="hbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Currency: </property>
<property name="justify">right</property>
</object>
@ -716,7 +706,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="currency_box">
<object class="GtkBox" id="currency_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -737,14 +727,13 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox11">
<object class="GtkBox" id="hbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Credit Account</property>
<property name="justify">right</property>
</object>
@ -759,10 +748,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="margin_right">5</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_employee_ccard_acct_toggled_cb"/>
<signal name="toggled" handler="gnc_employee_ccard_acct_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -772,7 +762,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="ccard_acct_hbox">
<object class="GtkBox" id="ccard_acct_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -822,9 +812,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox13">
<object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
@ -832,9 +823,10 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkVBox" id="vbox16">
<object class="GtkBox" id="vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>

255
src/business/business-gnome/gtkbuilder/dialog-invoice.glade
View File

@ -1,40 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkWindow" id="Invoice Entry Window">
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="terms_store">
<columns>
<!-- column-name label -->
<column type="gchararray"/>
<!-- column-name rowdata -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkWindow" id="invoice_entry_window">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Invoice</property>
<child>
<object class="GtkVBox" id="invoice_entry_vbox">
<object class="GtkBox" id="invoice_entry_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox1">
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="vexpand">False</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">5</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Type</property>
<property name="justify">right</property>
</object>
@ -48,7 +62,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Invoice ID</property>
<property name="justify">right</property>
</object>
@ -62,7 +76,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date Opened</property>
<property name="justify">right</property>
</object>
@ -76,7 +90,7 @@
<object class="GtkLabel" id="posted_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date Posted</property>
<property name="justify">right</property>
</object>
@ -90,7 +104,7 @@
<object class="GtkLabel" id="acct_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Posted Account</property>
<property name="justify">right</property>
</object>
@ -132,15 +146,16 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="page_type_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Invoice</property>
</object>
<packing>
@ -154,10 +169,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="editable">False</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="expand">False</property>
@ -166,7 +177,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="page_date_opened_hbox">
<object class="GtkBox" id="page_date_opened_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -180,7 +191,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="date_posted_hbox">
<object class="GtkBox" id="date_posted_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -198,10 +209,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="editable">False</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="expand">False</property>
@ -215,6 +222,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_invoice_window_active_toggled_cb" swapped="no"/>
@ -256,7 +264,7 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
@ -266,21 +274,23 @@
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox6">
<object class="GtkBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox8">
<object class="GtkBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">5</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="page_owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">(owner)</property>
<property name="justify">right</property>
</object>
@ -294,7 +304,7 @@
<object class="GtkLabel" id="page_job_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Job</property>
<property name="justify">right</property>
</object>
@ -308,7 +318,7 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Billing ID</property>
<property name="justify">right</property>
</object>
@ -322,7 +332,7 @@
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Terms</property>
<property name="justify">right</property>
</object>
@ -352,12 +362,13 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox9">
<object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="page_owner_hbox">
<object class="GtkBox" id="page_owner_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -371,7 +382,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="page_job_hbox">
<object class="GtkBox" id="page_job_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -389,10 +400,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="editable">False</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="expand">False</property>
@ -401,19 +408,21 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="page_terms_menu">
<object class="GtkComboBox" id="page_terms_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="editable">False</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="model">terms_store</property>
<signal name="changed" handler="gnc_invoice_terms_changed_cb" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="page_cell_renderer_text"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
@ -448,7 +457,7 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="padding">1</property>
<property name="position">1</property>
</packing>
@ -462,6 +471,8 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@ -492,7 +503,7 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="padding">3</property>
<property name="position">0</property>
</packing>
@ -501,9 +512,10 @@
<object class="GtkFrame" id="page_proj_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox8">
<object class="GtkBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
@ -512,7 +524,6 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Customer: </property>
<property name="justify">right</property>
</object>
@ -523,7 +534,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="page_proj_cust_hbox">
<object class="GtkBox" id="page_proj_cust_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -540,7 +551,6 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Job: </property>
<property name="justify">right</property>
</object>
@ -551,7 +561,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="page_proj_job_hbox">
<object class="GtkBox" id="page_proj_job_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -576,7 +586,7 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="padding">3</property>
<property name="position">1</property>
</packing>
@ -585,9 +595,10 @@
<object class="GtkFrame" id="to_charge_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox9">
<object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
@ -596,7 +607,6 @@
<object class="GtkLabel" id="label31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Additional to Card:</property>
<property name="justify">right</property>
</object>
@ -607,7 +617,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="to_charge_box">
<object class="GtkBox" id="to_charge_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -632,7 +642,7 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
@ -640,6 +650,8 @@
<object class="GtkFrame" id="ledger_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<child>
<placeholder/>
@ -662,30 +674,31 @@
</object>
</child>
</object>
<object class="GtkDialog" id="New Invoice Dialog">
<object class="GtkDialog" id="new_invoice_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Invoice</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_invoice_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<object class="GtkBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area2">
<object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_invoice_window_help_cb" swapped="no"/>
</object>
<packing>
@ -696,12 +709,12 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_invoice_window_cancel_cb" swapped="no"/>
</object>
<packing>
@ -712,12 +725,12 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_invoice_window_ok_cb" swapped="no"/>
</object>
<packing>
@ -735,9 +748,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox10">
<object class="GtkBox" id="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
@ -745,20 +759,21 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox11">
<object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Type</property>
<property name="justify">right</property>
</object>
@ -772,7 +787,7 @@
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Invoice ID</property>
<property name="justify">right</property>
</object>
@ -786,7 +801,7 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date Opened</property>
<property name="justify">right</property>
</object>
@ -804,19 +819,19 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox12">
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="dialog_type_hbox">
<object class="GtkBox" id="dialog_type_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="dialog_type_label">
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Invoice</property>
</object>
<packing>
@ -826,7 +841,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="dialog_type_choice_hbox">
<object class="GtkBox" id="dialog_type_choice_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -835,7 +850,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_invoice_type_toggled_cb" swapped="no"/>
@ -852,7 +867,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="halign">start</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">dialog_invoice_type</property>
@ -884,10 +899,6 @@
<property name="has_focus">True</property>
<property name="tooltip_text" translatable="yes">The invoice ID number. If left blank a reasonable number will be chosen for you.</property>
<property name="activates_default">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>
<signal name="changed" handler="gnc_invoice_id_changed_cb" swapped="no"/>
</object>
<packing>
@ -897,7 +908,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="dialog_date_opened_hbox">
<object class="GtkBox" id="dialog_date_opened_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -940,20 +951,21 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox4">
<object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox13">
<object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="dialog_owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label">(owner)</property>
<property name="justify">right</property>
</object>
@ -967,7 +979,7 @@
<object class="GtkLabel" id="dialog_job_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Job</property>
<property name="justify">right</property>
</object>
@ -981,7 +993,7 @@
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Billing ID</property>
<property name="justify">right</property>
</object>
@ -995,7 +1007,7 @@
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Terms</property>
<property name="justify">right</property>
</object>
@ -1013,13 +1025,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox14">
<object class="GtkBox" id="vbox14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="dialog_owner_hbox">
<object class="GtkBox" id="dialog_owner_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -1033,7 +1046,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="dialog_job_hbox">
<object class="GtkBox" id="dialog_job_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -1050,10 +1063,6 @@
<object class="GtkEntry" id="dialog_billing_id_entry">
<property name="visible">True</property>
<property name="can_focus">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="expand">False</property>
@ -1109,21 +1118,22 @@
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox5">
<object class="GtkBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<object class="GtkVBox" id="vbox15">
<object class="GtkBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Customer</property>
<property name="justify">right</property>
</object>
@ -1137,7 +1147,7 @@
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Job</property>
<property name="justify">right</property>
</object>
@ -1155,13 +1165,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox16">
<object class="GtkBox" id="vbox16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="dialog_proj_cust_hbox">
<object class="GtkBox" id="dialog_proj_cust_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -1175,7 +1186,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="dialog_proj_job_hbox">
<object class="GtkBox" id="dialog_proj_job_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -1221,6 +1232,8 @@
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@ -1262,29 +1275,30 @@
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="Unpost Message Dialog">
<object class="GtkDialog" id="unpost_message_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area3">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton1">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -1294,12 +1308,12 @@
</child>
<child>
<object class="GtkButton" id="okbutton1">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -1316,19 +1330,20 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox17">
<object class="GtkBox" id="vbox17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="hbox11">
<object class="GtkBox" id="hbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="q_pixmap">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-question</property>
<property name="icon_name">dialog-question</property>
</object>
<packing>
<property name="expand">False</property>
@ -1365,7 +1380,7 @@ Are you sure you want to unpost it?</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox12">
<object class="GtkBox" id="hbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -1374,6 +1389,7 @@ Are you sure you want to unpost it?</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_yes_tt_reset_toggled" object="Invoice Entry Window" swapped="yes"/>
@ -1390,6 +1406,7 @@ Are you sure you want to unpost it?</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@ -1433,12 +1450,4 @@ Are you sure you want to unpost it?</property>
<action-widget response="-5">okbutton1</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="terms_store">
<columns>
<!-- column-name label -->
<column type="gchararray"/>
<!-- column-name rowdata -->
<column type="gpointer"/>
</columns>
</object>
</interface>

124
src/business/business-gnome/gtkbuilder/dialog-job.glade
View File

@ -1,34 +1,34 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="Job Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="job_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Job Dialog</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_job_window_destroy_cb"/>
<signal name="destroy" handler="gnc_job_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area3">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_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="gnc_job_window_help_cb"/>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_job_window_help_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -38,14 +38,13 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_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="gnc_job_window_cancel_cb"/>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_job_window_cancel_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -55,14 +54,13 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_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>
<signal name="clicked" handler="gnc_job_window_ok_cb"/>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_job_window_ok_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -79,9 +77,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@ -89,21 +88,22 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox8">
<object class="GtkBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<object class="GtkVBox" id="vbox4">
<object class="GtkBox" id="vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Job Number</property>
<property name="justify">right</property>
</object>
@ -117,7 +117,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Job Name</property>
<property name="justify">right</property>
</object>
@ -135,10 +135,11 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox12">
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="id_entry">
@ -147,14 +148,11 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">The job ID number. If left blank a reasonable number will be chosen for you</property>
<property name="tooltip_text" translatable="yes">The job ID number. If left blank a reasonable number will be chosen for you</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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>
<signal name="changed" handler="gnc_job_name_changed_cb"/>
<signal name="changed" handler="gnc_job_name_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -166,14 +164,11 @@
<object class="GtkEntry" id="name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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>
<signal name="changed" handler="gnc_job_name_changed_cb"/>
<signal name="changed" handler="gnc_job_name_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -211,21 +206,22 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox9">
<object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<object class="GtkVBox" id="vbox5">
<object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label">(owner)</property>
<property name="justify">right</property>
</object>
@ -236,11 +232,11 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="label4">
<object class="GtkLabel" id="labelrate">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Billing ID</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Rate</property>
<property name="justify">right</property>
</object>
<packing>
@ -250,11 +246,11 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="labelrate">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Rate</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Billing ID</property>
<property name="justify">right</property>
</object>
<packing>
@ -271,13 +267,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox13">
<object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="customer_hbox">
<object class="GtkBox" id="customer_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -291,24 +288,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="desc_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</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="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="rate_entry">
<object class="GtkBox" id="rate_entry">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -321,6 +301,20 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="desc_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</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">True</property>
@ -356,7 +350,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>

801
src/business/business-gnome/gtkbuilder/dialog-order.glade
View File

@ -1,367 +1,9 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="New Order Dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Order</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox6">
<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_area6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="help_button">
<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="gnc_order_window_help_cb" 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="cancel_button">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="gnc_order_window_cancel_cb" 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="ok_button">
<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="gnc_order_window_ok_cb" 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="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Order ID</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="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Date Opened</property>
<property name="justify">right</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">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="entry_id">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">The order ID number. If left blank a reasonable number will be chosen for you</property>
<property name="tooltip_text" translatable="yes">The order ID number. If left blank a reasonable number will be chosen for you</property>
<property name="invisible_char">&#x25CF;</property>
<property name="activates_default">True</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="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="date_opened_hbox">
<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="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Order Information</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="bill_owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">(owner)</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="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Reference</property>
<property name="justify">right</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">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<object class="GtkHBox" id="bill_owner_hbox">
<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">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_ref">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="invisible_char">&#x25CF;</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="expand">False</property>
<property name="fill">False</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="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Billing Information</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="text_notes">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="buffer">text_buffer</property>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Notes</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</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="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object>
<object class="GtkDialog" id="Order Entry Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkTextBuffer" id="notes_buffer"/>
<object class="GtkDialog" id="order_entry_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Order Entry</property>
@ -369,24 +11,24 @@
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox4">
<object class="GtkBox" id="dialog-vbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area4">
<object class="GtkButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_order_window_help_cb" swapped="no"/>
</object>
<packing>
@ -397,13 +39,12 @@
</child>
<child>
<object class="GtkButton" id="closebutton">
<property name="label">gtk-close</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_order_window_ok_cb" swapped="no"/>
</object>
<packing>
@ -414,12 +55,11 @@
</child>
<child>
<object class="GtkButton" id="new_invoice_button">
<property name="label" translatable="yes">Invoices</property>
<property name="label" translatable="yes">_Invoices</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>
<signal name="clicked" handler="gnc_order_window_invoice_cb" swapped="no"/>
</object>
@ -431,12 +71,11 @@
</child>
<child>
<object class="GtkButton" id="close_order_button">
<property name="label" translatable="yes">Close Order</property>
<property name="label" translatable="yes">Close _Order</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>
<signal name="clicked" handler="gnc_order_window_close_order_cb" swapped="no"/>
</object>
@ -455,11 +94,12 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox1">
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -468,21 +108,22 @@
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<object class="GtkVBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Order ID</property>
<property name="justify">right</property>
</object>
@ -496,7 +137,7 @@
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date Opened</property>
<property name="justify">right</property>
</object>
@ -510,7 +151,7 @@
<object class="GtkLabel" id="cd_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date Closed</property>
<property name="justify">right</property>
</object>
@ -540,23 +181,21 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="id_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</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="expand">False</property>
@ -565,7 +204,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="opened_date_hbox">
<object class="GtkBox" id="opened_date_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -579,7 +218,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="closed_date_hbox">
<object class="GtkBox" id="closed_date_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -598,7 +237,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
@ -638,20 +277,21 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkVBox" id="vbox8">
<object class="GtkBox" id="vbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label">(owner)</property>
<property name="justify">right</property>
</object>
@ -665,6 +305,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Reference</property>
<property name="justify">center</property>
</object>
@ -706,13 +347,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox9">
<object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="owner_hbox">
<object class="GtkBox" id="owner_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -729,12 +371,9 @@
<object class="GtkEntry" id="ref_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">&#x25CF;</property>
<property name="invisible_char_set">True</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -799,6 +438,8 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
@ -839,10 +480,11 @@
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkVBox" id="ledger_vbox">
<object class="GtkBox" id="ledger_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
@ -882,6 +524,363 @@
<action-widget response="0">close_order_button</action-widget>
</action-widgets>
</object>
<object class="GtkTextBuffer" id="notes_buffer"/>
<object class="GtkTextBuffer" id="text_buffer"/>
<object class="GtkDialog" id="new_order_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Order</property>
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_order_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="help_button">
<property name="label" translatable="yes">_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_underline">True</property>
<signal name="clicked" handler="gnc_order_window_help_cb" 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="cancel_button">
<property name="label" translatable="yes">_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_underline">True</property>
<signal name="clicked" handler="gnc_order_window_cancel_cb" 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="ok_button">
<property name="label" translatable="yes">_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_underline">True</property>
<signal name="clicked" handler="gnc_order_window_ok_cb" 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="GtkBox" id="vbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Order ID</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="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date Opened</property>
<property name="justify">right</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">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="entry_id">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup">The order ID number. If left blank a reasonable number will be chosen for you</property>
<property name="tooltip_text" translatable="yes">The order ID number. If left blank a reasonable number will be chosen for you</property>
<property name="invisible_char">●</property>
<property name="activates_default">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="date_opened_hbox">
<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="label15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Order Information</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="vbox14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="bill_owner_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">(owner)</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="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Reference</property>
<property name="justify">right</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">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox15">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="bill_owner_hbox">
<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">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="entry_ref">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="invisible_char">●</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</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">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Billing Information</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTextView" id="text_notes">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="buffer">text_buffer</property>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Notes</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</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="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="-5">ok_button</action-widget>
</action-widgets>
</object>
</interface>

354
src/business/business-gnome/gtkbuilder/dialog-payment.glade
View File

@ -1,8 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="Payment Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="docs_list_hor_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="docs_list_model">
<columns>
<!-- column-name doc_date -->
<column type="gint64"/>
<!-- column-name doc_id -->
<column type="gchararray"/>
<!-- column-name doc_type -->
<column type="gchararray"/>
<!-- column-name doc_deb -->
<column type="gchararray"/>
<!-- column-name doc_cred -->
<column type="gchararray"/>
<!-- column-name doc_lot -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkAdjustment" id="docs_list_vert_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="post_combo_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
</object>
<object class="GtkDialog" id="payment_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Process Payment</property>
@ -10,19 +42,75 @@
<property name="type_hint">dialog</property>
<signal name="destroy" handler="gnc_payment_window_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_payment_cancel_cb" 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="okbutton">
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_payment_ok_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkImage" id="payment_warning">
<property name="can_focus">False</property>
<property name="icon_name">dialog-warning</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
<property name="secondary">True</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">
<object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
<property name="column_spacing">3</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@ -34,7 +122,7 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="owner_box">
<object class="GtkBox" id="owner_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@ -63,7 +151,8 @@
</child>
</object>
<packing>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -108,8 +197,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -126,9 +214,13 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="hadjustment">docs_list_hor_adj</property>
<property name="vadjustment">docs_list_vert_adj</property>
<property name="hscrollbar_policy">always</property>
<property name="vscrollbar_policy">always</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="docs_list_tree_view">
@ -238,15 +330,27 @@
</child>
</object>
<packing>
<property name="right_attach">2</property>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="width">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment" id="alignment3">
@ -254,33 +358,32 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="box5">
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkTable" id="table2">
<object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">9</property>
<property name="n_columns">2</property>
<property name="column_spacing">3</property>
<property name="row_spacing">3</property>
<property name="column_spacing">5</property>
<child>
<object class="GtkLabel" id="date_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Date</property>
<property name="justify">right</property>
</object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="date_box">
<object class="GtkBox" id="date_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -289,7 +392,7 @@
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
@ -307,16 +410,14 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">&lt;b&gt;Amount&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="justify">right</property>
</object>
<packing>
<property name="left_attach">0</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>
<child>
@ -334,15 +435,13 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Payment</property>
<property name="justify">right</property>
</object>
<packing>
<property name="left_attach">0</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>
@ -360,49 +459,43 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
If you have selected an invoice, GnuCash will propose the amount still due for it. You can change this amount to create a partial payment or an over-payment.
In case of an over-payment or if no invoice was selected, GnuCash will automatically assign the remaining amount to the first unpaid invoice for this company.</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Refund</property>
<property name="justify">right</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="num_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Num</property>
<property name="justify">right</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="memo_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Memo</property>
<property name="justify">right</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="amount_payment_box">
<object class="GtkBox" id="amount_payment_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@ -422,13 +515,11 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
</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>
</packing>
</child>
<child>
<object class="GtkHBox" id="amount_refund_box">
<object class="GtkBox" id="amount_refund_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@ -448,9 +539,7 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
</object>
<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>
</packing>
</child>
<child>
@ -458,13 +547,10 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</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>
</packing>
</child>
<child>
@ -472,17 +558,14 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</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>
</packing>
</child>
<child>
<object class="GtkHBox" id="amount_top_filler">
<object class="GtkBox" id="amount_top_filler">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@ -501,15 +584,12 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options"/>
<property name="y_options"/>
<property name="y_padding">3</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="amount_bot_filler">
<object class="GtkBox" id="amount_bot_filler">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
@ -528,45 +608,45 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options"/>
<property name="y_options"/>
<property name="y_padding">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="commodity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="no">(USD)</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<object class="GtkCheckButton" id="print_check">
<property name="label" translatable="yes">Print Check</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="halign">start</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">8</property>
<property name="bottom_attach">9</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="commodity_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">(USD)</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -590,15 +670,15 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
</child>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="y_options">GTK_FILL</property>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment" id="alignment1">
@ -612,6 +692,8 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">always</property>
<property name="vscrollbar_policy">always</property>
<child>
<placeholder/>
</child>
@ -632,74 +714,14 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
</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>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<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">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="gnc_payment_cancel_cb" 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="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">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="gnc_payment_ok_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkImage" id="payment_warning">
<property name="can_focus">False</property>
<property name="stock">gtk-dialog-warning</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
<property name="secondary">True</property>
<property name="top_attach">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>
<property name="position">2</property>
</packing>
</child>
</object>
@ -709,36 +731,4 @@ In case of an over-payment or if no invoice was selected, GnuCash will automatic
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
<object class="GtkAdjustment" id="docs_list_hor_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="docs_list_model">
<columns>
<!-- column-name doc_date -->
<column type="gint64"/>
<!-- column-name doc_id -->
<column type="gchararray"/>
<!-- column-name doc_type -->
<column type="gchararray"/>
<!-- column-name doc_deb -->
<column type="gchararray"/>
<!-- column-name doc_cred -->
<column type="gchararray"/>
<!-- column-name doc_lot -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkAdjustment" id="docs_list_vert_adj">
<property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="post_combo_model">
<columns>
<!-- column-name gchararray -->
<column type="gchararray"/>
</columns>
</object>
</interface>

147
src/business/business-gnome/gtkbuilder/dialog-vendor.glade
View File

@ -1,7 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<!-- interface-requires gtk+ 2.10 -->
<object class="GtkDialog" id="Vendor Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="tax_included_store">
<columns>
<!-- column-name tax_included_name -->
<column type="gchararray"/>
<!-- column-name tax_included_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="taxtable_store">
<columns>
<!-- column-name taxtable_name -->
<column type="gchararray"/>
<!-- column-name taxtable_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="terms_store">
<columns>
<!-- column-name terms_name -->
<column type="gchararray"/>
<!-- column-name terms_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkDialog" id="vendor_dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">New Vendor</property>
@ -20,14 +45,13 @@
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
<property name="label" translatable="yes">_Help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_vendor_window_help_cb" swapped="no"/>
</object>
<packing>
@ -38,13 +62,12 @@
</child>
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_vendor_window_cancel_cb" swapped="no"/>
</object>
<packing>
@ -55,14 +78,13 @@
</child>
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
<property name="label" translatable="yes">_OK</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="gnc_vendor_window_ok_cb" swapped="no"/>
</object>
<packing>
@ -84,9 +106,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<object class="GtkVBox" id="vbox2">
<object class="GtkBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@ -94,20 +117,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="border_width">2</property>
<child>
<object class="GtkVBox" id="vbox11">
<object class="GtkBox" id="vbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Vendor Number: </property>
<property name="justify">right</property>
</object>
@ -121,7 +149,7 @@
<object class="GtkLabel" id="label19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Company Name: </property>
<property name="justify">right</property>
</object>
@ -137,7 +165,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@ -156,9 +184,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox12">
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="id_entry">
@ -230,20 +259,25 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkVBox" id="vbox5">
<object class="GtkBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Name: </property>
<property name="justify">right</property>
</object>
@ -257,7 +291,7 @@
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Address: </property>
<property name="justify">right</property>
</object>
@ -307,7 +341,7 @@
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Phone: </property>
<property name="justify">right</property>
</object>
@ -321,7 +355,7 @@
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Fax: </property>
<property name="justify">right</property>
</object>
@ -335,7 +369,7 @@
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Email: </property>
<property name="justify">right</property>
</object>
@ -354,10 +388,11 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox6">
<object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkEntry" id="name_entry">
@ -488,6 +523,12 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">3</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
@ -528,9 +569,10 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox13">
<object class="GtkBox" id="vbox13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
@ -538,19 +580,24 @@
<property name="border_width">3</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkHBox" id="hbox6">
<object class="GtkBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkVBox" id="vbox7">
<object class="GtkBox" id="vbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Currency: </property>
<property name="justify">right</property>
</object>
@ -564,7 +611,7 @@
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Terms: </property>
<property name="justify">right</property>
</object>
@ -578,7 +625,7 @@
<object class="GtkLabel" id="label34">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Tax Included:</property>
<property name="justify">right</property>
</object>
@ -592,7 +639,7 @@
<object class="GtkLabel" id="label35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Tax Table:</property>
<property name="justify">right</property>
</object>
@ -610,13 +657,14 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="currency_box">
<object class="GtkBox" id="currency_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -668,7 +716,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox7">
<object class="GtkBox" id="hbox7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -677,7 +725,8 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Override the global Tax Table?</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="margin_right">5</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="gnc_vendor_taxtable_check_cb" swapped="no"/>
@ -772,28 +821,4 @@
<action-widget response="-5">okbutton</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="tax_included_store">
<columns>
<!-- column-name tax_included_name -->
<column type="gchararray"/>
<!-- column-name tax_included_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="taxtable_store">
<columns>
<!-- column-name taxtable_name -->
<column type="gchararray"/>
<!-- column-name taxtable_value -->
<column type="gpointer"/>
</columns>
</object>
<object class="GtkListStore" id="terms_store">
<columns>
<!-- column-name terms_name -->
<column type="gchararray"/>
<!-- column-name terms_value -->
<column type="gpointer"/>
</columns>
</object>
</interface>

6
src/business/business-gnome/search-owner.c
View File

@ -274,14 +274,16 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (IS_GNCSEARCH_OWNER (fi), NULL);
priv = GNC_SEARCH_OWNER_GET_PRIVATE(fi);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the "how" option menu. */
how_menu = make_how_menu (fe);
gtk_box_pack_start (GTK_BOX (box), how_menu, FALSE, FALSE, 3);
/* Create the owner box */
priv->owner_box = gtk_hbox_new (FALSE, 0);
priv->owner_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (priv->owner_box), FALSE);
/* Build and connect the "type" option menu.
* Note that this will build the owner_choice and

2
src/business/business-ledger/CMakeLists.txt
View File

@ -22,7 +22,7 @@ ADD_LIBRARY (gnc-business-ledger
)
TARGET_LINK_LIBRARIES(gnc-business-ledger gncmod-ledger-core gncmod-register-core gncmod-engine gncmod-gnome-utils
gnc-core-utils ${GTK2_LDFLAGS})
gnc-core-utils ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS (gnc-business-ledger PRIVATE -DG_LOG_DOMAIN=\"gnc.business.ledger\")

2
src/business/business-ledger/gncEntryLedger.c
View File

@ -915,7 +915,7 @@ gnc_entry_ledger_duplicate_current_entry (GncEntryLedger *ledger)
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("_Record"), GTK_RESPONSE_ACCEPT,
NULL);
response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_DUP);

2
src/business/business-ledger/gncEntryLedgerControl.c
View File

@ -896,7 +896,7 @@ static gboolean gnc_entry_ledger_traverse (VirtualLocation *p_new_virt_loc,
"%s", message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
_("_Don't Record"), GTK_RESPONSE_REJECT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("_Record"), GTK_RESPONSE_ACCEPT,
NULL);
response = gnc_dialog_run(GTK_DIALOG(dialog), GNC_PREF_WARN_INV_ENTRY_MOD);

2
src/gnome-search/CMakeLists.txt
View File

@ -46,7 +46,7 @@ ADD_LIBRARY (gncmod-gnome-search
${gnome_search_noinst_HEADERS}
)
TARGET_LINK_LIBRARIES(gncmod-gnome-search gnc-qof gncmod-gnome-utils ${GTK2_LDFLAGS})
TARGET_LINK_LIBRARIES(gncmod-gnome-search gnc-qof gncmod-gnome-utils ${GTK3_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")

73
src/gnome-search/dialog-search.c
View File

@ -341,7 +341,8 @@ gnc_search_dialog_display_results (GNCSearchWindow *sw)
gtk_container_add(GTK_CONTAINER(frame), scroller);
/* Create the button_box */
button_box = gtk_vbox_new (FALSE, 3);
button_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
gtk_box_set_homogeneous (GTK_BOX (button_box), FALSE);
/* ... and add all the buttons */
if (sw->buttons)
@ -718,15 +719,20 @@ attach_element (GtkWidget *element, GNCSearchWindow *sw, int row)
data = g_object_get_data (G_OBJECT (element), "data");
gtk_table_attach (GTK_TABLE (sw->criteria_table), element, 0, 1, row, row + 1,
GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_grid_attach (GTK_GRID (sw->criteria_table), element, 0, row, 1, 1);
gtk_widget_set_hexpand (element, TRUE);
gtk_widget_set_halign (element, GTK_ALIGN_FILL);
g_object_set (element, "margin", 0, NULL);
remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
remove = gtk_button_new_with_label (_("Remove"));
g_object_set_data (G_OBJECT (remove), "element", element);
g_signal_connect (G_OBJECT (remove), "clicked", G_CALLBACK (remove_element), sw);
gtk_table_attach (GTK_TABLE (sw->criteria_table), remove, 1, 2, row, row + 1,
0, 0, 0, 0);
gtk_grid_attach (GTK_GRID (sw->criteria_table), remove, 1, row, 1, 1);
gtk_widget_set_hexpand (remove, FALSE);
gtk_widget_set_halign (remove, GTK_ALIGN_CENTER);
g_object_set (remove, "margin", 0, NULL);
gtk_widget_show (remove);
data->button = remove; /* Save the button for later */
}
@ -851,7 +857,9 @@ get_element_widget (GNCSearchWindow *sw, GNCSearchCoreType *element)
data->element = element;
data->dialog = GTK_DIALOG (sw->dialog);
hbox = gtk_hbox_new (FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
/* only set to automatically clean up the memory */
g_object_set_data_full (G_OBJECT (hbox), "data", data, g_free);
@ -940,10 +948,42 @@ gnc_search_dialog_book_option_changed (gpointer new_val, gpointer user_data)
gtk_widget_grab_focus(focused_widget);
}
struct grid_size
{
/** The grid being sized. */
GtkGrid *grid;
/** The number of columns and rows in the grid. */
gint cols, rows;
};
static void
get_grid_size (GtkWidget *child, gpointer data)
{
struct grid_size *gridsize = data;
gint top, left, height, width;
gtk_container_child_get(GTK_CONTAINER(gridsize->grid), child,
"left-attach", &left,
"top-attach", &top,
"height", &height,
"width", &width,
NULL);
if (left + width >= gridsize->cols)
gridsize->cols = left + width;
if (top + height >= gridsize->rows)
gridsize->rows = top + height;
}
static void
gnc_search_dialog_add_criterion (GNCSearchWindow *sw)
{
GNCSearchCoreType *new_sct;
struct grid_size gridsize;
gridsize.cols = 0;
gridsize.rows = 0;
/* First, make sure that the last criterion is ok */
if (sw->crit_list)
@ -967,15 +1007,15 @@ gnc_search_dialog_add_criterion (GNCSearchWindow *sw)
{
struct _crit_data *data;
GtkWidget *w;
int rows;
w = get_element_widget (sw, new_sct);
data = g_object_get_data (G_OBJECT (w), "data");
sw->crit_list = g_list_append (sw->crit_list, data);
gtk_table_get_size (GTK_TABLE (sw->criteria_table), &rows, NULL);
gtk_table_resize (GTK_TABLE (sw->criteria_table), rows + 1, 2);
attach_element (w, sw, rows);
gridsize.grid = GTK_GRID (sw->criteria_table);
gtk_container_foreach(GTK_CONTAINER(sw->criteria_table), get_grid_size, &gridsize);
attach_element (w, sw, gridsize.rows);
gnc_search_core_type_grab_focus (new_sct);
gnc_search_core_type_editable_enters (new_sct);
@ -1110,13 +1150,16 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw, const gchar *title)
gboolean active;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-search.glade", "Search Dialog");
gnc_builder_add_from_file (builder, "dialog-search.glade", "search_dialog");
/* Grab the dialog, save the dialog info */
sw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Search Dialog"));
sw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "search_dialog"));
gtk_window_set_title(GTK_WINDOW(sw->dialog), title);
g_object_set_data (G_OBJECT (sw->dialog), "dialog-info", sw);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(sw->dialog), "GncSearchDialog");
/* Grab the result hbox */
sw->result_hbox = GTK_WIDGET(gtk_builder_get_object (builder, "result_hbox"));
@ -1132,7 +1175,7 @@ gnc_search_dialog_init_widgets (GNCSearchWindow *sw, const gchar *title)
gtk_label_set_text (GTK_LABEL (label), type_label);
/* Set the 'add criterion' button */
add = gtk_button_new_from_stock (GTK_STOCK_ADD);
add = gtk_button_new_with_label (_("Add"));
g_signal_connect (G_OBJECT (add), "clicked", G_CALLBACK (add_criterion), sw);
box = GTK_WIDGET(gtk_builder_get_object (builder, "add_button_box"));

146
src/gnome-search/dialog-search.glade
View File

@ -1,67 +1,29 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="Search Dialog">
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="search_dialog">
<property name="can_focus">False</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">8</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area3">
<object class="GtkButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="new_item_button">
<object class="GtkButton" id="help_button">
<property name="label" translatable="yes">_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>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkHBox" id="hbox74">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-new</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label848">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_New item...</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -70,14 +32,13 @@
</packing>
</child>
<child>
<object class="GtkButton" id="close_button">
<property name="label">gtk-close</property>
<object class="GtkButton" id="new_item_button">
<property name="label" translatable="yes">_New item...</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>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -86,14 +47,13 @@
</packing>
</child>
<child>
<object class="GtkButton" id="help_button">
<property name="label">gtk-help</property>
<object class="GtkButton" id="close_button">
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -103,13 +63,12 @@
</child>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label">gtk-cancel</property>
<property name="label" translatable="yes">_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>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -119,14 +78,13 @@
</child>
<child>
<object class="GtkButton" id="find_button">
<property name="label">gtk-find</property>
<property name="label" translatable="yes">_Find</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@ -143,15 +101,16 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox89">
<object class="GtkBox" id="vbox89">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="search_hbox">
<object class="GtkBox" id="search_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkHBox" id="hbox72">
<object class="GtkBox" id="hbox72">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -201,17 +160,18 @@
<property name="border_width">6</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkVBox" id="vbox88">
<object class="GtkBox" id="vbox88">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox73">
<object class="GtkBox" id="hbox73">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<object class="GtkHBox" id="add_button_box">
<object class="GtkBox" id="add_button_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -225,7 +185,7 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="type_menu_box">
<object class="GtkBox" id="type_menu_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -243,7 +203,6 @@
<object class="GtkLabel" id="label846">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Search for items where</property>
<property name="justify">right</property>
</object>
@ -276,13 +235,37 @@
</packing>
</child>
<child>
<object class="GtkTable" id="criteria_table">
<object class="GtkGrid" id="criteria_table">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
@ -307,12 +290,12 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="result_hbox">
<object class="GtkBox" id="result_hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
<object class="GtkHBox" id="hboxXXX">
<object class="GtkBox" id="hboxXXX">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -327,17 +310,18 @@
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkVBox" id="vbox24">
<object class="GtkBox" id="vbox24">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRadioButton" id="new_search_radiobutton">
<property name="label" translatable="yes">New search</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@ -354,7 +338,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">new_search_radiobutton</property>
@ -371,7 +355,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">new_search_radiobutton</property>
@ -388,7 +372,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<property name="group">new_search_radiobutton</property>
@ -400,7 +384,7 @@
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator1">
<object class="GtkSeparator" id="hseparator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@ -419,7 +403,7 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Choose whether to search all your data or only that marked as &amp;quot;active&amp;quot;.</property>
<property name="tooltip_text" translatable="yes">Choose whether to search all your data or only that marked as "active".</property>
<property name="use_action_appearance">False</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@ -472,9 +456,9 @@
</object>
</child>
<action-widgets>
<action-widget response="-11">help_button</action-widget>
<action-widget response="0">new_item_button</action-widget>
<action-widget response="-7">close_button</action-widget>
<action-widget response="-11">help_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
<action-widget response="0">find_button</action-widget>
</action-widgets>

24
src/gnome-search/gnc-general-search.c
View File

@ -59,7 +59,7 @@ enum
static void gnc_general_search_init (GNCGeneralSearch *gsl);
static void gnc_general_search_class_init (GNCGeneralSearchClass *klass);
static void gnc_general_search_destroy (GtkObject *object);
static void gnc_general_search_destroy (GtkWidget *widget);
typedef struct _GNCGeneralSearchPrivate GNCGeneralSearchPrivate;
@ -77,7 +77,7 @@ struct _GNCGeneralSearchPrivate
#define _PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_GENERAL_SEARCH, GNCGeneralSearchPrivate))
static GtkHBoxClass *parent_class;
static GtkBoxClass *parent_class;
static guint general_search_signals[LAST_SIGNAL];
@ -106,7 +106,7 @@ gnc_general_search_get_type (void)
(GInstanceInitFunc) gnc_general_search_init,
};
general_search_type = g_type_register_static (GTK_TYPE_HBOX,
general_search_type = g_type_register_static (GTK_TYPE_BOX,
"GNCGeneralSearch",
&our_info, 0);
}
@ -117,9 +117,7 @@ gnc_general_search_get_type (void)
static void
gnc_general_search_class_init (GNCGeneralSearchClass *klass)
{
GtkObjectClass *object_class = (GtkObjectClass *) klass;
object_class = (GtkObjectClass*) klass;
GtkWidgetClass *object_class = (GtkWidgetClass *) klass;
parent_class = g_type_class_peek_parent (klass);
@ -142,19 +140,21 @@ gnc_general_search_class_init (GNCGeneralSearchClass *klass)
static void
gnc_general_search_init (GNCGeneralSearch *gsl)
{
gtk_orientable_set_orientation (GTK_ORIENTABLE(gsl), GTK_ORIENTATION_HORIZONTAL);
gsl->selected_item = NULL;
}
static void
gnc_general_search_destroy (GtkObject *object)
gnc_general_search_destroy (GtkWidget *widget)
{
GNCGeneralSearch *gsl;
GNCGeneralSearchPrivate *priv;
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_GENERAL_SEARCH (object));
g_return_if_fail (widget != NULL);
g_return_if_fail (GNC_IS_GENERAL_SEARCH (widget));
gsl = GNC_GENERAL_SEARCH (object);
gsl = GNC_GENERAL_SEARCH (widget);
gsl->entry = NULL;
gsl->button = NULL;
@ -174,8 +174,8 @@ gnc_general_search_destroy (GtkObject *object)
priv->component_id = 0;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
if (GTK_WIDGET_CLASS (parent_class)->destroy)
GTK_WIDGET_CLASS (parent_class)->destroy (widget);
}
/* The "selection" contents have changed. Change the text. */

4
src/gnome-search/gnc-general-search.h
View File

@ -55,7 +55,7 @@ typedef GNCSearchWindow *(*GNCSearchCB) (gpointer start, gpointer user_data);
typedef struct
{
GtkHBox hbox;
GtkBox hbox;
GtkWidget * entry; /* display of selection name */
GtkWidget * button; /* button for popping up search window */
@ -67,7 +67,7 @@ typedef struct
typedef struct
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
void (*changed) (GNCGeneralSearch *edit);
} GNCGeneralSearchClass;

10
src/gnome-search/search-account.c
View File

@ -32,6 +32,7 @@
#include "qof.h"
#include "gnc-tree-view-account.h"
#include "gnc-gui-query.h"
#include "dialog-utils.h"
#include "search-account.h"
#include "search-core-utils.h"
@ -258,8 +259,8 @@ button_clicked (GtkButton *button, GNCSearchAccount *fi)
GTK_DIALOG(gtk_dialog_new_with_buttons(_("Select the Accounts to Compare"),
NULL,
0,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("OK"), GTK_RESPONSE_OK,
NULL));
/* Put the dialog together */
@ -296,7 +297,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_ACCOUNT (fi), NULL);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu */
menu = make_menu (fe);
@ -305,7 +307,7 @@ gncs_get_widget (GNCSearchCoreType *fe)
/* Build and connect the account entry window */
desc = describe_button (fi);
label = gtk_label_new (desc);
gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
gnc_label_set_alignment (label, 0.5, 0.5);
button = gtk_button_new ();
gtk_container_add (GTK_CONTAINER (button), label);

3
src/gnome-search/search-boolean.c
View File

@ -171,7 +171,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_BOOLEAN (fi), NULL);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the toggle */
toggle = gtk_check_button_new ();

3
src/gnome-search/search-date.c
View File

@ -243,7 +243,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (IS_GNCSEARCH_DATE (fi), NULL);
priv = _PRIVATE(fi);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu */
menu = make_menu (fe);

3
src/gnome-search/search-double.c
View File

@ -235,7 +235,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (IS_GNCSEARCH_DOUBLE (fi), NULL);
priv = _PRIVATE(fi);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu */
menu = make_menu (fe);

3
src/gnome-search/search-int64.c
View File

@ -237,7 +237,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (IS_GNCSEARCH_INT64 (fi), NULL);
priv = _PRIVATE(fi);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu */
menu = make_menu (fe);

3
src/gnome-search/search-numeric.c
View File

@ -298,7 +298,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (IS_GNCSEARCH_NUMERIC (fi), NULL);
priv = _PRIVATE(fi);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu(s) */
if (priv->is_debcred)

3
src/gnome-search/search-reconciled.c
View File

@ -216,7 +216,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (fi, NULL);
g_return_val_if_fail (IS_GNCSEARCH_RECONCILED (fi), NULL);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu */
menu = make_menu (fe);

3
src/gnome-search/search-string.c
View File

@ -312,7 +312,8 @@ gncs_get_widget (GNCSearchCoreType *fe)
g_return_val_if_fail (IS_GNCSEARCH_STRING (fi), NULL);
priv = _PRIVATE(fi);
box = gtk_hbox_new (FALSE, 3);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
/* Build and connect the option menu */
menu = make_menu (fe);

4
src/gnome-utils/CMakeLists.txt
View File

@ -212,7 +212,7 @@ ADD_LIBRARY (gncmod-gnome-utils
)
TARGET_LINK_LIBRARIES(gncmod-gnome-utils gncmod-app-utils gncmod-engine gnc-backend-xml-utils
${GTK2_LDFLAGS} ${GTK_MAC_LDFLAGS})
${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
TARGET_COMPILE_DEFINITIONS(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\")
@ -224,7 +224,7 @@ ENDIF(MAC_INTEGRATION)
TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-utils
PUBLIC
${GTK2_INCLUDE_DIRS}
${GTK3_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE
${GTK_MAC_INCLUDE_DIRS}

12
src/gnome-utils/assistant-xml-encoding.c
View File

@ -738,7 +738,9 @@ gxi_update_string_box (GncXmlImportData *data)
if (data->string_box)
gtk_widget_destroy (data->string_box);
data->string_box = gtk_vbox_new (FALSE, 6);
data->string_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_set_homogeneous (GTK_BOX (data->string_box), FALSE);
vbox = GTK_BOX (data->string_box);
data->n_unassigned = 0;
@ -1182,10 +1184,14 @@ gxi_edit_encodings_clicked_cb (GtkButton *button, GncXmlImportData *data)
gint i, j;
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "assistant-xml-encoding.glade", "Encodings Dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Encodings Dialog"));
gnc_builder_add_from_file (builder, "assistant-xml-encoding.glade", "encodings_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "encodings_dialog"));
data->encodings_dialog = dialog;
// Set the style context for this assistant so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncAssistXmlEncoding");
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, data);
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (data->assistant));

6
src/gnome-utils/cursors.c
View File

@ -50,7 +50,7 @@ gnc_ui_set_cursor (GdkWindow *win, GNCCursorType type, gboolean update_now)
return;
if (type != GNC_CURSOR_NORMAL)
cursor = gdk_cursor_new ((GdkCursorType)type);
cursor = gdk_cursor_new_for_display (gdk_display_get_default (), (GdkCursorType)type);
gdk_window_set_cursor (win, cursor);
@ -61,7 +61,7 @@ gnc_ui_set_cursor (GdkWindow *win, GNCCursorType type, gboolean update_now)
}
if (type != GNC_CURSOR_NORMAL)
gdk_cursor_unref (cursor);
g_object_unref (cursor);
}
@ -88,7 +88,7 @@ gnc_set_busy_cursor (GtkWidget *w, gboolean update_now)
{
w = node->data;
if (!w || !GTK_IS_WIDGET (w) || !gtk_widget_get_has_window(w))
if (!w || !GTK_IS_WIDGET (w) || (!gtk_widget_get_has_window(w)))
continue;
gnc_ui_set_cursor (gtk_widget_get_window(w), GNC_CURSOR_BUSY, update_now);

77
src/gnome-utils/dialog-account.c
View File

@ -208,7 +208,7 @@ gnc_account_to_ui(AccountWindow *aw)
Account *account;
gnc_commodity * commodity;
const char *string;
GdkColor color;
GdkRGBA color;
gboolean flag, nonstd_scu;
gint index;
@ -230,9 +230,9 @@ gnc_account_to_ui(AccountWindow *aw)
string = xaccAccountGetColor (account);
if (string == NULL) string = "";
if (gdk_color_parse(string, &color))
if (gdk_rgba_parse(&color, string))
{
gtk_color_button_set_color(GTK_COLOR_BUTTON(aw->color_entry_button), &color);
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(aw->color_entry_button), &color);
}
commodity = xaccAccountGetCommodity (account);
@ -337,7 +337,7 @@ gnc_ui_to_account(AccountWindow *aw)
Account *parent_account;
const char *old_string;
const char *string;
GdkColor color;
GdkRGBA color;
gboolean flag;
gnc_numeric balance;
gboolean use_equity, nonstd;
@ -376,8 +376,8 @@ gnc_ui_to_account(AccountWindow *aw)
if (g_strcmp0 (string, old_string) != 0)
xaccAccountSetDescription (account, string);
gtk_color_button_get_color(GTK_COLOR_BUTTON(aw->color_entry_button), &color );
string = gdk_color_to_string(&color);
gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(aw->color_entry_button), &color );
string = gdk_rgba_to_string(&color);
if (g_strcmp0 (string, DEFAULT_COLOR) == 0)
string = "Not Set";
@ -611,6 +611,7 @@ add_children_to_expander (GObject *object, GParamSpec *param_spec, gpointer data
gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (view));
gtk_container_add (GTK_CONTAINER (expander), scrolled_window);
gtk_widget_set_vexpand (GTK_WIDGET(scrolled_window), TRUE);
gtk_widget_show_all (scrolled_window);
}
}
@ -643,35 +644,56 @@ verify_children_compatible (AccountWindow *aw)
GTK_WINDOW(aw->dialog),
GTK_DIALOG_DESTROY_WITH_PARENT |
GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
_("Cancel"), GTK_RESPONSE_CANCEL,
_("OK"), GTK_RESPONSE_OK,
NULL);
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE);
hbox = gtk_hbox_new (FALSE, 12);
vbox = gtk_vbox_new (FALSE, 12);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
gtk_box_pack_start (
GTK_BOX (hbox),
gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG),
gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG),
FALSE, FALSE, 0);
/* primary label */
label = gtk_label_new (_("Give the children the same type?"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gnc_label_set_alignment (label, 0.0, 0.0);
{
#if GTK_CHECK_VERSION(3,16,0)
GtkCssProvider *provider = gtk_css_provider_new();
const gchar *label_css = {
"label {\n"
" font-size:large;\n"
" font-weight: bold;\n"
"}\n"
};
gtk_css_provider_load_from_data (provider, label_css, strlen(label_css), NULL);
gtk_style_context_add_provider (gtk_widget_get_style_context(GTK_WIDGET(label)),
GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref (provider);
#else
gint size;
PangoFontDescription *font_desc;
GtkStyleContext *style;
size = pango_font_description_get_size (gtk_widget_get_style (label)->font_desc);
style = gtk_widget_get_style_context(label);
gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, GTK_STYLE_PROPERTY_FONT, &font_desc, NULL);
size = pango_font_description_get_size (font_desc);
font_desc = pango_font_description_new ();
pango_font_description_set_weight (font_desc, PANGO_WEIGHT_BOLD);
pango_font_description_set_size (font_desc, size * PANGO_SCALE_LARGE);
gtk_widget_modify_font (label, font_desc);
gtk_widget_override_font(label, font_desc);
pango_font_description_free (font_desc);
#endif
}
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
@ -683,7 +705,7 @@ verify_children_compatible (AccountWindow *aw)
g_free (str);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gnc_label_set_alignment (label, 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
/* children */
@ -702,9 +724,6 @@ verify_children_compatible (AccountWindow *aw)
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14);
gtk_container_set_border_width (
GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 5);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), 6);
gtk_widget_show_all (hbox);
@ -1220,11 +1239,11 @@ gnc_account_name_changed_cb(GtkWidget *widget, gpointer data)
void
gnc_account_color_default_cb(GtkWidget *widget, gpointer data)
{
GdkColor color;
GdkRGBA color;
AccountWindow *aw = data;
gdk_color_parse( DEFAULT_COLOR, &color);
gtk_color_button_set_color(GTK_COLOR_BUTTON(aw->color_entry_button), &color);
gdk_rgba_parse(&color, DEFAULT_COLOR);
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(aw->color_entry_button), &color);
}
@ -1315,11 +1334,14 @@ gnc_account_window_create(AccountWindow *aw)
ENTER("aw %p, modal %d", aw, aw->modal);
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-account.glade", "fraction_liststore");
gnc_builder_add_from_file (builder, "dialog-account.glade", "Account Dialog");
gnc_builder_add_from_file (builder, "dialog-account.glade", "account_dialog");
aw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Account Dialog"));
aw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "account_dialog"));
awo = G_OBJECT (aw->dialog);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(aw->dialog), "GncAccountDialog");
g_object_set_data (awo, "dialog_info", aw);
if (!aw->modal)
@ -2042,12 +2064,9 @@ gnc_account_renumber_create_dialog (GtkWidget *window, Account *account)
data->num_children = gnc_account_n_children(account);
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-account.glade",
"interval_adjustment");
gnc_builder_add_from_file (builder, "dialog-account.glade",
"Renumber Accounts");
data->dialog = GTK_WIDGET(gtk_builder_get_object (builder,
"Renumber Accounts"));
gnc_builder_add_from_file (builder, "dialog-account.glade", "interval_adjustment");
gnc_builder_add_from_file (builder, "dialog-account.glade", "account_renumber_dialog");
data->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "account_renumber_dialog"));
gtk_window_set_transient_for(GTK_WINDOW(data->dialog), GTK_WINDOW(window));
g_object_set_data_full(G_OBJECT(data->dialog), "builder", builder,
g_object_unref);

7
src/gnome-utils/dialog-book-close.c
View File

@ -337,8 +337,11 @@ void gnc_ui_close_book (QofBook* book)
/* Open the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-book-close.glade", "Close Book");
cbw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Close Book"));
gnc_builder_add_from_file (builder, "dialog-book-close.glade", "close_book_dialog");
cbw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "close_book_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(cbw->dialog), "GncBookCloseDialog");
PINFO("Closed Book Window is %p, Dialog is %p", cbw, cbw->dialog);

34
src/gnome-utils/dialog-commodity.c
View File

@ -255,17 +255,20 @@ gnc_ui_select_commodity_create(const gnc_commodity * orig_sel,
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "liststore1");
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "liststore2");
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "Security Selector Dialog");
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "security_selector_dialog");
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval);
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Security Selector Dialog"));
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "security_selector_dialog"));
retval->namespace_combo = GTK_WIDGET(gtk_builder_get_object (builder, "ss_namespace_cbwe"));
retval->commodity_combo = GTK_WIDGET(gtk_builder_get_object (builder, "ss_commodity_cbwe"));
retval->select_user_prompt = GTK_WIDGET(gtk_builder_get_object (builder, "select_user_prompt"));
retval->ok_button = GTK_WIDGET(gtk_builder_get_object (builder, "ss_ok_button"));
label = GTK_WIDGET(gtk_builder_get_object (builder, "item_label"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(retval->dialog), "GncSecurityDialog");
gnc_cbwe_require_list_item(GTK_COMBO_BOX(retval->namespace_combo));
gnc_cbwe_require_list_item(GTK_COMBO_BOX(retval->commodity_combo));
@ -901,13 +904,18 @@ gnc_ui_build_commodity_dialog(const char * selected_namespace,
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "liststore2");
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "adjustment1");
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "Security Dialog");
gnc_builder_add_from_file (builder, "dialog-commodity.glade", "security_dialog");
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, retval);
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Security Dialog"));
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "security_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(retval->dialog), "GncSecurityDialog");
if (parent != NULL)
gtk_window_set_transient_for (GTK_WINDOW (retval->dialog), GTK_WINDOW (parent));
retval->edit_commodity = NULL;
help_button = GTK_WIDGET(gtk_builder_get_object (builder, "help_button"));
@ -932,10 +940,12 @@ gnc_ui_build_commodity_dialog(const char * selected_namespace,
retval->table = GTK_WIDGET(gtk_builder_get_object (builder, "edit_table"));
sec_label = GTK_WIDGET(gtk_builder_get_object (builder, "security_label"));
gtk_container_child_get(GTK_CONTAINER(retval->table), sec_label,
"bottom-attach", &retval->comm_section_top, NULL);
"top-attach", &retval->comm_section_top, NULL);
widget = GTK_WIDGET(gtk_builder_get_object (builder, "quote_label"));
gtk_container_child_get(GTK_CONTAINER(retval->table), widget,
"top-attach", &retval->comm_section_bottom, NULL);
gtk_container_child_get(GTK_CONTAINER(retval->table),
retval->user_symbol_entry, "top-attach",
&retval->comm_symbol_line, NULL);
@ -969,13 +979,11 @@ gnc_ui_build_commodity_dialog(const char * selected_namespace,
}
else
{
guint row;
gtk_grid_set_row_spacing(GTK_GRID(retval->table), 0);
widget = GTK_WIDGET(gtk_builder_get_object (builder, "unknown_source_alignment"));
gtk_container_child_get(GTK_CONTAINER(retval->table), widget,
"top-attach", &row, NULL);
gtk_table_set_row_spacing(GTK_TABLE(retval->table), row, 0);
gtk_widget_destroy(widget);
widget = GTK_WIDGET(gtk_builder_get_object (builder, "unknown_source_box"));
gtk_widget_destroy(widget);
}
@ -1013,10 +1021,12 @@ gnc_ui_build_commodity_dialog(const char * selected_namespace,
/* Determine the price quote of the dialog */
widget = GTK_WIDGET(gtk_builder_get_object (builder, "fq_warning_alignment"));
gtk_container_child_get(GTK_CONTAINER(retval->table), widget,
"bottom-attach", &retval->fq_section_top, NULL);
widget = GTK_WIDGET(gtk_builder_get_object (builder, "quote_tz_alignment"));
"top-attach", &retval->fq_section_top, NULL);
widget = GTK_WIDGET(gtk_builder_get_object (builder, "bottom_alignment"));
gtk_container_child_get(GTK_CONTAINER(retval->table), widget,
"bottom-attach", &retval->fq_section_bottom, NULL);
"top-attach", &retval->fq_section_bottom, NULL);
gnc_ui_update_fq_info (retval);
}

7
src/gnome-utils/dialog-dup-trans.c
View File

@ -103,11 +103,14 @@ gnc_dup_trans_dialog_create (GtkWidget * parent, DupTransDialog *dt_dialog,
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "num_adjustment");
gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "tnum_adjustment");
gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "Duplicate Transaction Dialog");
gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "duplicate_transaction_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Duplicate Transaction Dialog"));
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "duplicate_transaction_dialog"));
dt_dialog->dialog = dialog;
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncDupTransDialog");
/* parent */
if (parent != NULL)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));

19
src/gnome-utils/dialog-file-access.c
View File

@ -273,10 +273,12 @@ gnc_ui_file_access( int type )
/* Open the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-file-access.glade", "File Access" );
faw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "File Access" ));
g_object_set_data_full( G_OBJECT(faw->dialog), "FileAccessWindow", faw,
g_free );
gnc_builder_add_from_file (builder, "dialog-file-access.glade", "file_access_dialog" );
faw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "file_access_dialog" ));
g_object_set_data_full( G_OBJECT(faw->dialog), "FileAccessWindow", faw, g_free );
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(faw->dialog), "GncFileAccessDialog");
faw->frame_file = GTK_WIDGET(gtk_builder_get_object (builder, "frame_file" ));
faw->frame_database = GTK_WIDGET(gtk_builder_get_object (builder, "frame_database" ));
@ -293,14 +295,14 @@ gnc_ui_file_access( int type )
{
case FILE_ACCESS_OPEN:
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Open..."));
button_label = "gtk-open";
button_label = _("_Open");
fileChooserAction = GTK_FILE_CHOOSER_ACTION_OPEN;
settings_section = GNC_PREFS_GROUP_OPEN_SAVE;
break;
case FILE_ACCESS_SAVE_AS:
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Save As..."));
button_label = "gtk-save-as";
button_label = _("_Save As");
fileChooserAction = GTK_FILE_CHOOSER_ACTION_SAVE;
settings_section = GNC_PREFS_GROUP_OPEN_SAVE;
gtk_widget_destroy(faw->readonly_checkbutton);
@ -309,7 +311,7 @@ gnc_ui_file_access( int type )
case FILE_ACCESS_EXPORT:
gtk_window_set_title(GTK_WINDOW(faw->dialog), _("Export"));
button_label = "gtk-save-as";
button_label = _("_Save As");
fileChooserAction = GTK_FILE_CHOOSER_ACTION_SAVE;
settings_section = GNC_PREFS_GROUP_EXPORT;
gtk_widget_destroy(faw->readonly_checkbutton);
@ -319,10 +321,7 @@ gnc_ui_file_access( int type )
op = GTK_BUTTON(gtk_builder_get_object (builder, "pb_op" ));
if ( op != NULL )
{
gtk_button_set_label( op, button_label );
gtk_button_set_use_stock( op, TRUE );
}
file_chooser = GTK_WIDGET(gtk_builder_get_object (builder, "file_chooser" ));
fileChooser = GTK_FILE_CHOOSER_WIDGET(gtk_file_chooser_widget_new( fileChooserAction ));

7
src/gnome-utils/dialog-object-references.c
View File

@ -51,8 +51,11 @@ gnc_ui_object_references_show( const gchar* explanation_text, GList* objlist )
/* Open the dialog */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-object-references.glade", "Object references" );
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Object references" ));
gnc_builder_add_from_file (builder, "dialog-object-references.glade", "object_references_dialog" );
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "object_references_dialog" ));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncObjectRefDialog");
explanation = GTK_LABEL(gtk_builder_get_object (builder, "lbl_explanation" ));
gtk_label_set_text( explanation, explanation_text );

193
src/gnome-utils/dialog-options.c
View File

@ -133,18 +133,6 @@ gnc_option_get_gtk_widget (GNCOption *option)
return (GtkWidget *)gnc_option_get_widget(option);
}
static inline gint
color_d_to_i16 (double d)
{
return (d * 0xFFFF);
}
static inline double
color_i16_to_d (gint i16)
{
return ((double)i16 / 0xFFFF);
}
static void
gnc_options_dialog_changed_internal (GtkWidget *widget, gboolean sensitive)
{
@ -720,7 +708,8 @@ gnc_option_create_date_widget (GNCOption *option)
}
else if (g_strcmp0(type, "both") == 0)
{
box = gtk_hbox_new(FALSE, 5);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
ab_button = gtk_radio_button_new(NULL);
g_signal_connect(G_OBJECT(ab_button), "toggled",
@ -832,7 +821,8 @@ gnc_option_create_radiobutton_widget(char *name, GNCOption *option)
frame = gtk_frame_new (name);
/* Create the button box */
box = gtk_hbox_new (FALSE, 5);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (box), FALSE);
gtk_container_add (GTK_CONTAINER (frame), box);
/* Iterate over the options and create a radio button for each one */
@ -878,7 +868,9 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
frame = gtk_frame_new (name);
/* Create the verticle button box */
vbox1 = gtk_vbox_new (FALSE, 5);
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox1), FALSE);
gtk_container_add (GTK_CONTAINER (frame), vbox1);
/* Iterate over the three options and create a radio button for each one */
@ -901,8 +893,12 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
gtk_widget_set_tooltip_text(widget, tip && *tip ? _(tip) : "");
/* Use hbox & vbox2 for all buttons so they are all at the same level;
easier to get in set/get ui functions */
hbox = gtk_hbox_new(FALSE, 5);
vbox2 = gtk_vbox_new(FALSE, 5);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE);
gtk_box_pack_start (GTK_BOX (vbox2), widget, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
if (i == 1) /* book-currency */
@ -922,7 +918,9 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
"changed",
G_CALLBACK(gnc_option_changed_widget_cb),
option);
vbox2 = gtk_vbox_new(FALSE, 5);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE);
gtk_widget_set_tooltip_text(vbox2, tip && *tip ? _(tip) : "");
gtk_box_pack_start (GTK_BOX (vbox2), widget_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox2),
@ -935,7 +933,10 @@ gnc_option_create_currency_accounting_widget (char *name, GNCOption *option)
}
tip = gnc_currency_accounting_option_policy_documentation(option);
widget_label = gtk_label_new( _("Default Gains Policy") );
vbox2 = gtk_vbox_new(FALSE, 5);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox2), FALSE);
gtk_widget_set_tooltip_text(vbox2, tip && *tip ? _(tip) : "");
gtk_box_pack_start (GTK_BOX (vbox2), widget_label, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox2),
@ -1031,7 +1032,9 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
frame = gtk_frame_new(name);
vbox = gtk_vbox_new(FALSE, 0);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
gtk_container_add(GTK_CONTAINER(frame), vbox);
tree = GTK_WIDGET(gnc_tree_view_account_new (FALSE));
@ -1085,7 +1088,7 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
gtk_container_set_border_width(GTK_CONTAINER(scroll_win), 5);
gtk_container_add(GTK_CONTAINER(scroll_win), tree);
bbox = gtk_hbutton_box_new();
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 10);
@ -1124,7 +1127,7 @@ gnc_option_create_account_widget(GNCOption *option, char *name)
{
/* Put the "Show hidden" checkbox on a separate line since the 4 buttons make
the dialog too wide. */
bbox = gtk_hbutton_box_new();
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_START);
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
}
@ -1195,7 +1198,8 @@ gnc_option_create_list_widget(GNCOption *option, char *name)
gint i;
frame = gtk_frame_new(name);
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
gtk_container_add(GTK_CONTAINER(frame), hbox);
store = gtk_list_store_new(1, G_TYPE_STRING);
@ -1229,7 +1233,7 @@ gnc_option_create_list_widget(GNCOption *option, char *name)
g_signal_connect(selection, "changed",
G_CALLBACK(gnc_option_list_changed_cb), option);
bbox = gtk_vbutton_box_new();
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_SPREAD);
gtk_box_pack_start(GTK_BOX(hbox), bbox, FALSE, FALSE, 10);
@ -1381,16 +1385,20 @@ gnc_options_dialog_append_page(GNCOptionWin * propertybox,
gtk_widget_show(page_label);
/* Build this options page */
page_content_box = gtk_vbox_new(FALSE, 2);
page_content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_box_set_homogeneous (GTK_BOX (page_content_box), FALSE);
gtk_container_set_border_width(GTK_CONTAINER(page_content_box), 12);
options_scrolled_win = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(page_content_box), options_scrolled_win, TRUE, TRUE, 0);
/* Build space for the content - the options box */
options_box = gtk_vbox_new(FALSE, 5);
options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (options_box), FALSE);
gtk_container_set_border_width(GTK_CONTAINER(options_box), 0);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(options_scrolled_win), options_box);
gtk_container_add (GTK_CONTAINER(options_scrolled_win), GTK_WIDGET(options_box));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(options_scrolled_win), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
/* Create all the options */
@ -1402,7 +1410,7 @@ gnc_options_dialog_append_page(GNCOptionWin * propertybox,
}
/* Add a button box at the bottom of the page */
buttonbox = gtk_hbutton_box_new();
buttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonbox),
GTK_BUTTONBOX_EDGE);
gtk_container_set_border_width(GTK_CONTAINER (buttonbox), 5);
@ -1716,10 +1724,13 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title)
retval = g_new0(GNCOptionWin, 1);
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-options.glade", "GnuCash Options");
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "GnuCash Options"));
gnc_builder_add_from_file (builder, "dialog-options.glade", "gnucash_options_dialog");
retval->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "gnucash_options_dialog"));
retval->page_list = GTK_WIDGET(gtk_builder_get_object (builder, "page_list_scroll"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(retval->dialog), "GncOptionsDialog");
/* Page List */
{
GtkTreeView *view;
@ -1765,8 +1776,11 @@ gnc_options_dialog_new_modal(gboolean modal, gchar *title)
}
/* glade doesn't support a notebook with zero pages */
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "notebook placeholder"));
hbox = GTK_WIDGET(gtk_builder_get_object (builder, "notebook_placeholder"));
retval->notebook = gtk_notebook_new();
gtk_widget_set_vexpand (retval->notebook, TRUE);
gtk_widget_show(retval->notebook);
gtk_box_pack_start(GTK_BOX(hbox), retval->notebook, TRUE, TRUE, 5);
@ -1887,7 +1901,8 @@ gnc_option_set_ui_widget_boolean (GNCOption *option, GtkBox *page_box,
{
GtkWidget *value;
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gtk_check_button_new_with_label(name);
gnc_option_set_widget (option, value);
@ -1914,10 +1929,11 @@ gnc_option_set_ui_widget_string (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gtk_entry_new();
gnc_option_set_widget (option, value);
@ -1953,7 +1969,8 @@ gnc_option_set_ui_widget_text (GNCOption *option, GtkBox *page_box,
gtk_container_add(GTK_CONTAINER(frame), scroll);
*enclosing = gtk_hbox_new(FALSE, 10);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gtk_text_view_new();
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(value), GTK_WRAP_WORD);
gtk_text_view_set_editable(GTK_TEXT_VIEW(value), TRUE);
@ -1983,10 +2000,11 @@ gnc_option_set_ui_widget_currency (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_currency_edit_new();
gnc_option_set_widget (option, value);
@ -2013,10 +2031,11 @@ gnc_option_set_ui_widget_commodity (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_general_select_new(GNC_GENERAL_SELECT_TYPE_SELECT,
gnc_commodity_edit_get_string,
gnc_commodity_edit_new_select,
@ -2050,10 +2069,11 @@ gnc_option_set_ui_widget_multichoice (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_option_create_multichoice_widget(option);
gnc_option_set_widget (option, value);
@ -2078,10 +2098,11 @@ gnc_option_set_ui_widget_date (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_option_create_date_widget(option);
@ -2148,7 +2169,7 @@ gnc_option_set_ui_widget_account_sel (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
acct_type_list = gnc_option_get_account_type_list(option);
@ -2163,7 +2184,8 @@ gnc_option_set_ui_widget_account_sel (GNCOption *option, GtkBox *page_box,
TRUE? */
gnc_option_set_ui_value(option, TRUE);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
gtk_box_pack_start(GTK_BOX(*enclosing), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(*enclosing), value, FALSE, FALSE, 0);
gtk_widget_show_all(*enclosing);
@ -2213,10 +2235,11 @@ gnc_option_set_ui_widget_number_range (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
gnc_option_get_range_info(option, &lower_bound, &upper_bound,
&num_decimals, &step_size);
@ -2274,16 +2297,17 @@ gnc_option_set_ui_widget_color (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
use_alpha = gnc_option_use_alpha(option);
value = gtk_color_button_new();
gtk_color_button_set_title(GTK_COLOR_BUTTON(value), name);
gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(value), use_alpha);
gtk_color_chooser_set_use_alpha(GTK_COLOR_CHOOSER(value), use_alpha);
gnc_option_set_widget (option, value);
gnc_option_set_ui_value(option, FALSE);
@ -2309,10 +2333,11 @@ gnc_option_set_ui_widget_font (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gtk_font_button_new();
g_object_set(G_OBJECT(value),
"use-font", TRUE,
@ -2347,10 +2372,11 @@ gnc_option_set_ui_widget_pixmap (GNCOption *option, GtkBox *page_box,
ENTER("option %p(%s), name %s", option, gnc_option_name(option), name);
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
button = gtk_button_new_with_label(_("Clear"));
gtk_widget_set_tooltip_text(button, _("Clear any selected image file."));
@ -2393,7 +2419,8 @@ gnc_option_set_ui_widget_radiobutton (GNCOption *option, GtkBox *page_box,
{
GtkWidget *value;
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_option_create_radiobutton_widget(name, option);
gnc_option_set_widget (option, value);
@ -2486,12 +2513,14 @@ gnc_option_set_ui_widget_plot_size (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
hbox = gtk_hbox_new(FALSE, 5);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
gtk_box_pack_start(GTK_BOX(*enclosing), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(*enclosing), hbox, FALSE, FALSE, 0);
@ -2575,10 +2604,11 @@ gnc_option_set_ui_widget_budget (GNCOption *option, GtkBox *page_box,
colon_name = g_strconcat(name, ":", NULL);
label = gtk_label_new(colon_name);
gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
gnc_label_set_alignment(label, 1.0, 0.5);
g_free(colon_name);
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_option_create_budget_widget(option);
@ -2605,7 +2635,8 @@ gnc_option_set_ui_widget_currency_accounting (GNCOption *option,
{
GtkWidget *value;
*enclosing = gtk_hbox_new(FALSE, 5);
*enclosing = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (*enclosing), FALSE);
value = gnc_option_create_currency_accounting_widget(name, option);
gnc_option_set_widget (option, value);
@ -2917,22 +2948,19 @@ static gboolean
gnc_option_set_ui_value_color (GNCOption *option, gboolean use_default,
GtkWidget *widget, SCM value)
{
gdouble red, green, blue, alpha;
GdkRGBA color;
if (gnc_option_get_color_info(option, use_default,
&red, &green, &blue, &alpha))
&color.red, &color.green,
&color.blue, &color.alpha))
{
GtkColorButton *color_button;
GdkColor color;
GtkColorChooser *color_button;
DEBUG("red %f, green %f, blue %f, alpha %f", red, green, blue, alpha);
color_button = GTK_COLOR_BUTTON(widget);
DEBUG("red %f, green %f, blue %f, alpha %f",
color.red, color.green, color.blue, color.alpha);
color_button = GTK_COLOR_CHOOSER(widget);
color.red = color_d_to_i16(red);
color.green = color_d_to_i16(green);
color.blue = color_d_to_i16(blue);
gtk_color_button_set_color(color_button, &color);
gtk_color_button_set_alpha(color_button, color_d_to_i16(alpha));
gtk_color_chooser_set_rgba(color_button, &color);
return FALSE;
}
@ -3488,28 +3516,23 @@ static SCM
gnc_option_get_ui_value_color (GNCOption *option, GtkWidget *widget)
{
SCM result;
GtkColorButton *color_button;
GdkColor color;
gdouble red, green, blue, alpha;
GtkColorChooser *color_button;
GdkRGBA color;
gdouble scale;
ENTER("option %p(%s), widget %p",
option, gnc_option_name(option), widget);
color_button = GTK_COLOR_BUTTON(widget);
gtk_color_button_get_color(color_button, &color);
red = color_i16_to_d(color.red);
green = color_i16_to_d(color.green);
blue = color_i16_to_d(color.blue);
alpha = color_i16_to_d(gtk_color_button_get_alpha(color_button));
color_button = GTK_COLOR_CHOOSER(widget);
gtk_color_chooser_get_rgba(color_button, &color);
scale = gnc_option_color_range(option);
result = SCM_EOL;
result = scm_cons(scm_from_double (alpha * scale), result);
result = scm_cons(scm_from_double (blue * scale), result);
result = scm_cons(scm_from_double (green * scale), result);
result = scm_cons(scm_from_double (red * scale), result);
result = scm_cons(scm_from_double (color.alpha * scale), result);
result = scm_cons(scm_from_double (color.blue * scale), result);
result = scm_cons(scm_from_double (color.green * scale), result);
result = scm_cons(scm_from_double (color.red * scale), result);
return result;
}

160
src/gnome-utils/dialog-preferences.c
View File

@ -39,7 +39,7 @@
the name of a glade file and the content to load from that
file along with a widget in that file. If a partial
page is added, the widget name provided must be that of
a GtkTable containing four columns. If a full page is added,
a GtkGrid containing four columns. If a full page is added,
the widget name provided to this code can be any kind of
widget, but for consistency it should probably be the same.
@ -100,7 +100,7 @@ typedef struct addition_t
gchar *filename;
/** The name of the widget within the glade data file that should be
* added to the preferences dialog. This should point to a
* GtkTable widget that has four columns. */
* GtkGrid widget that has four columns. */
gchar *widgetname;
/** The name of the tab within the preferences dialog where these
* widgets should be placed. */
@ -393,19 +393,18 @@ gnc_prefs_build_widget_table (GtkBuilder *builder,
/** This data structure is used while building the preferences dialog
* to copy a table from a glade file to the dialog under construction.
* to copy a grid from a glade file to the dialog under construction.
* It maintains state information between invocations of the function
* gnc_prefs_move_table_entry which is called via a foreach loop over
* each item in the table. */
* gnc_prefs_move_grid_entry which is called via a foreach loop over
* each item in the grid. */
struct copy_data
{
/** The table being copied from. */
GtkTable *table_from;
/** The table being copied to. */
GtkTable *table_to;
/** The number of lines offset from the old table to the new
* table. */
gint row_offset;
/** The grid being copied from. */
GtkGrid *grid_from;
/** The grid being copied to. */
GtkGrid *grid_to;
/** The number of columns and rows in the grid. */
gint cols, rows;
};
@ -443,7 +442,39 @@ gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
}
/** This function moves a GtkWidget from one GtkTable to another,
/** This function finds the size of a GtkGrid and saves it to
* the data structure.
*
* @internal
*
* @param widget A pointer to the widget to move.
*
* @param data A pointer to a data structure passed in by the caller.
* This data structure contains pointers to the old and new grids
* plus the row offset into the new grid.
*/
static void
gnc_prefs_get_grid_size (GtkWidget *child, gpointer data)
{
struct copy_data *copydata = data;
gint top, left, height, width;
gtk_container_child_get(GTK_CONTAINER(copydata->grid_to), child,
"left-attach", &left,
"top-attach", &top,
"height", &height,
"width", &width,
NULL);
if (left + width >= copydata->cols)
copydata->cols = left + width;
if (top + height >= copydata->rows)
copydata->rows = top + height;
}
/** This function moves a GtkWidget from one GtkGrid to another,
* preserving its attachment data, etc. It is called when adding one
* partial preference page to another.
*
@ -452,34 +483,47 @@ gnc_prefs_find_page (GtkNotebook *notebook, const gchar *name)
* @param widget A pointer to the widget to move.
*
* @param data A pointer to a data structure passed in by the caller.
* This data structure contains pointers to the old and new tables,
* plus the row offset into the new table.
* This data structure contains pointers to the old and new grids
* plus the row offset into the new grid.
*/
static void
gnc_prefs_move_table_entry (GtkWidget *child,
gnc_prefs_move_grid_entry (GtkWidget *child,
gpointer data)
{
struct copy_data *copydata = data;
GtkAttachOptions x_opts, y_opts;
gint bottom, top, left, right, x_pad, y_pad;
gint top, left, height, width;
gboolean hexpand, vexpand;
GtkAlign halign, valign;
gint topm, bottomm, leftm, rightm;
ENTER("child %p, copy data %p", child, data);
gtk_container_child_get(GTK_CONTAINER(copydata->table_from), child,
"bottom-attach", &bottom,
gtk_container_child_get(GTK_CONTAINER(copydata->grid_from), child,
"left-attach", &left,
"right-attach", &right,
"top-attach", &top,
"x-options", &x_opts,
"x-padding", &x_pad,
"y-options", &y_opts,
"y-padding", &y_pad,
"height", &height,
"width", &width,
NULL);
hexpand = gtk_widget_get_hexpand (child);
vexpand = gtk_widget_get_vexpand (child);
halign = gtk_widget_get_halign (child);
valign = gtk_widget_get_valign (child);
g_object_get (child, "margin-top", &topm, "margin-bottom", &bottomm, NULL);
g_object_get (child, "margin-left", &leftm, "margin-right", &rightm, NULL);
g_object_ref(child);
gtk_container_remove(GTK_CONTAINER(copydata->table_from), child);
gtk_table_attach(copydata->table_to, child, left, right,
top + copydata->row_offset, bottom + copydata->row_offset,
x_opts, y_opts, x_pad, y_pad);
gtk_container_remove(GTK_CONTAINER(copydata->grid_from), child);
gtk_grid_attach(copydata->grid_to, child, left, copydata->rows + top , width, height);
gtk_widget_set_hexpand (child, hexpand);
gtk_widget_set_vexpand (child, vexpand);
gtk_widget_set_halign (child, halign);
gtk_widget_set_valign (child, valign);
g_object_set (child, "margin-left", leftm, "margin-right", rightm, NULL);
g_object_set (child, "margin-top", topm, "margin-bottom", bottomm, NULL);
g_object_unref(child);
LEAVE(" ");
}
@ -545,27 +589,17 @@ gnc_preferences_build_page (gpointer data,
if (add_in->full_page)
{
label = gtk_label_new(add_in->tabname);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gnc_label_set_alignment(label, 0.0, 0.5);
gtk_notebook_append_page(notebook, new_content, label);
g_object_unref(G_OBJECT(builder));
LEAVE("appended page");
return;
}
/* Copied tables must match the size of the main table */
if (!GTK_IS_TABLE(new_content))
/* Copied grids must be grids */
if (!GTK_IS_GRID(new_content))
{
g_critical("The object name %s in file %s is not a GtkTable. It cannot "
"be added to the preferences dialog.",
add_in->widgetname, add_in->filename);
g_object_unref(G_OBJECT(builder));
LEAVE("");
return;
}
g_object_get(G_OBJECT(new_content), "n-columns", &cols, NULL);
if (cols != 4)
{
g_critical("The table %s in file %s does not have four columns. It cannot "
g_critical("The object name %s in file %s is not a GtkGrid. It cannot "
"be added to the preferences dialog.",
add_in->widgetname, add_in->filename);
g_object_unref(G_OBJECT(builder));
@ -580,37 +614,38 @@ gnc_preferences_build_page (gpointer data,
{
/* No existing content with this name. Create a blank page */
rows = 0;
existing_content = gtk_table_new(0, 4, FALSE);
existing_content = gtk_grid_new();
gtk_container_set_border_width(GTK_CONTAINER(existing_content), 6);
label = gtk_label_new(add_in->tabname);
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gnc_label_set_alignment(label, 0.0, 0.5);
gtk_notebook_append_page(notebook, existing_content, label);
gtk_widget_show_all(existing_content);
DEBUG("created new page %s, appended it", add_in->tabname);
}
else
{
g_object_get(G_OBJECT(existing_content), "n-rows", &rows, NULL);
DEBUG("found existing page %s", add_in->tabname);
/* Lets get the size of the existing grid */
copydata.grid_to = GTK_GRID(existing_content);
gtk_container_foreach(GTK_CONTAINER(existing_content), gnc_prefs_get_grid_size, &copydata);
DEBUG("found existing page %s, grid size is %d x %d", add_in->tabname, copydata.rows, copydata.cols);
}
/* Maybe add a spacer row */
DEBUG("rows is %d", rows);
if (rows > 0)
if (copydata.rows > 0)
{
label = gtk_label_new("");
gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(existing_content), label, 0, 1, rows, rows + 1,
GTK_FILL, GTK_FILL, 0, 0);
rows++;
gtk_grid_attach (GTK_GRID(existing_content), label, 0, copydata.rows, 1, 1);
copydata.rows = copydata.rows + 1;
DEBUG("add spacer row");
}
/* Now copy all the entries in the table */
copydata.table_from = GTK_TABLE(new_content);
copydata.table_to = GTK_TABLE(existing_content);
copydata.row_offset = rows;
gtk_container_foreach(GTK_CONTAINER(new_content), gnc_prefs_move_table_entry,
&copydata);
/* Now copy all the entries in the grid */
copydata.grid_from = GTK_GRID(new_content);
copydata.grid_to = GTK_GRID(existing_content);
gtk_container_foreach(GTK_CONTAINER(new_content), gnc_prefs_move_grid_entry, &copydata);
g_object_ref_sink(new_content);
g_object_unref(G_OBJECT(builder));
@ -1144,7 +1179,7 @@ gnc_prefs_connect_one (const gchar *name,
DEBUG(" %s - entry", name);
gnc_prefs_connect_entry(GTK_ENTRY(widget));
}
else if (GTK_IS_HBOX(widget))
else if (GTK_IS_BOX(widget))
{
/* Test custom widgets are all children of a hbox */
GtkWidget *widget_child;
@ -1228,9 +1263,12 @@ gnc_preferences_dialog_create(void)
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "retain_days_adj");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "tab_width_adj");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "date_formats");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "GnuCash Preferences");
gnc_builder_add_from_file (builder, "dialog-preferences.glade", "gnucash_preferences_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "GnuCash Preferences"));
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "gnucash_preferences_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncPreferenceDialog");
#ifndef REGISTER2_ENABLED
/* Hide preferences that are related to register2 */

11
src/gnome-utils/dialog-query-view.c
View File

@ -186,12 +186,15 @@ gnc_dialog_query_view_new (GList *param_list, Query *q)
dqv = g_new0 (DialogQueryView, 1);
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-query-view.glade", "Query View Dialog");
gnc_builder_add_from_file (builder, "dialog-query-view.glade", "query_view_dialog");
/* Grab the dialog, save the dialog info */
dqv->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Query View Dialog"));
dqv->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "query_view_dialog"));
g_object_set_data (G_OBJECT (dqv->dialog), "dialog-info", dqv);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dqv->dialog), "GncQueryViewDialog");
/* grab the widgets */
dqv->label = GTK_WIDGET(gtk_builder_get_object (builder, "dialog_label"));
result_hbox = GTK_WIDGET(gtk_builder_get_object (builder, "result_hbox"));
@ -214,7 +217,9 @@ gnc_dialog_query_view_new (GList *param_list, Query *q)
gtk_box_pack_start (GTK_BOX (result_hbox), frame, TRUE, TRUE, 3);
/* Create the button_box */
dqv->button_box = gtk_vbox_new (FALSE, 2);
dqv->button_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_box_set_homogeneous (GTK_BOX (dqv->button_box), FALSE);
gtk_box_pack_start (GTK_BOX (result_hbox), dqv->button_box, FALSE, FALSE, 3);
/* connect the double-click signal of the qview */

7
src/gnome-utils/dialog-reset-warnings.c
View File

@ -378,8 +378,11 @@ gnc_reset_warnings_dialog (GtkWindow *parent)
DEBUG("Opening dialog-reset-warnings.glade:");
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-reset-warnings.glade", "Reset Warnings");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Reset Warnings"));
gnc_builder_add_from_file (builder, "dialog-reset-warnings.glade", "reset_warnings_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "reset_warnings_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncResetWarningsDialog");
gtk_window_set_transient_for(GTK_WINDOW (dialog), parent);

18
src/gnome-utils/dialog-tax-table.c
View File

@ -230,9 +230,13 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table,
/* Open and read the Glade File */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "type_liststore");
gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "New Tax Table Dialog");
gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "new_tax_table_dialog");
ntt->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "new_tax_table_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ntt->dialog), "GncTaxTableDialog");
ntt->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "New Tax Table Dialog"));
ntt->name_entry = GTK_WIDGET(gtk_builder_get_object (builder, "name_entry"));
if (name)
gtk_entry_set_text (GTK_ENTRY (ntt->name_entry), name);
@ -291,9 +295,6 @@ new_tax_table_dialog (TaxTableWindow *ttw, gboolean new_table,
gtk_widget_hide (ntt->name_entry);
/* Tables are great for layout, but a pain when you hide widgets */
widget = GTK_WIDGET(gtk_builder_get_object (builder, "ttd_table"));
gtk_table_set_row_spacing (GTK_TABLE(widget), 0, 0);
gtk_table_set_row_spacing (GTK_TABLE(widget), 1, 0);
gtk_table_set_row_spacing (GTK_TABLE(widget), 2, 0);
gtk_widget_grab_focus (gnc_amount_edit_gtk_entry
(GNC_AMOUNT_EDIT (ntt->amount_entry)));
}
@ -710,11 +711,14 @@ gnc_ui_tax_table_window_new (QofBook *book)
/* Open and read the Glade File */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "Tax Table Window");
ttw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Tax Table Window"));
gnc_builder_add_from_file (builder, "dialog-tax-table.glade", "tax_table_window_dialog");
ttw->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "tax_table_window_dialog"));
ttw->names_view = GTK_WIDGET(gtk_builder_get_object (builder, "tax_tables_view"));
ttw->entries_view = GTK_WIDGET(gtk_builder_get_object (builder, "tax_table_entries"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(ttw->dialog), "GncTaxTableDialog");
/* Create the tax tables view */
view = GTK_TREE_VIEW(ttw->names_view);
store = gtk_list_store_new (NUM_TAX_TABLE_COLS, G_TYPE_STRING,

3
src/gnome-utils/dialog-totd.c
View File

@ -345,6 +345,9 @@ gnc_totd_dialog (GtkWindow *parent, gboolean startup)
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "totd_dialog"));
gtk_window_set_transient_for(GTK_WINDOW (dialog), parent);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncTotdDialog");
totd_dialog->dialog = dialog;
ENTER("totd_dialog %p, dialog %p", totd_dialog, dialog);

7
src/gnome-utils/dialog-transfer.c
View File

@ -1864,11 +1864,14 @@ gnc_xfer_dialog_create(GtkWidget *parent, XferDialog *xferData)
ENTER(" ");
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-transfer.glade", "Transfer Dialog");
gnc_builder_add_from_file (builder, "dialog-transfer.glade", "transfer_dialog");
xferData->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Transfer Dialog"));
xferData->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "transfer_dialog"));
g_object_set_data_full (G_OBJECT (xferData->dialog), "builder", builder, g_object_unref);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(xferData->dialog), "GncTransferDialog");
/* parent */
if (parent != NULL)
gtk_window_set_transient_for (GTK_WINDOW (xferData->dialog), GTK_WINDOW (parent));

7
src/gnome-utils/dialog-userpass.c
View File

@ -47,9 +47,12 @@ gnc_get_username_password (GtkWidget *parent,
g_return_val_if_fail (password != NULL, FALSE);
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "dialog-userpass.glade", "Username Password Dialog");
gnc_builder_add_from_file (builder, "dialog-userpass.glade", "username_password_dialog");
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "Username Password Dialog"));
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "username_password_dialog"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncUserPassDialog");
if (parent)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));

117
src/gnome-utils/dialog-utils.c
View File

@ -50,22 +50,8 @@ static QofLogModule log_module = GNC_MOD_GUI;
#define GNC_PREF_LAST_GEOMETRY "last-geometry"
/********************************************************************\
* gnc_get_deficit_color *
* fill in the 3 color values for the color of deficit values *
* *
* Args: color - color structure *
* Returns: none *
\*******************************************************************/
void
gnc_get_deficit_color(GdkColor *color)
{
color->red = 50000;
color->green = 0;
color->blue = 0;
}
const gchar *css_default_color = "* { color: currentColor }";
const gchar *css_red_color = "* { color: rgb(75%, 0%, 0%) }";
/********************************************************************\
* gnc_set_label_color *
@ -79,31 +65,30 @@ void
gnc_set_label_color(GtkWidget *label, gnc_numeric value)
{
gboolean deficit;
GdkColormap *cm;
GtkStyle *style;
GtkStyleContext *stylecontext;
GtkCssProvider *provider;
if (!gnc_prefs_get_bool(GNC_PREFS_GROUP_GENERAL, GNC_PREF_NEGATIVE_IN_RED))
return;
cm = gtk_widget_get_colormap(GTK_WIDGET(label));
gtk_widget_ensure_style(GTK_WIDGET(label));
style = gtk_widget_get_style(GTK_WIDGET(label));
provider = GTK_CSS_PROVIDER(g_object_get_data (G_OBJECT (label), "custom-provider"));
style = gtk_style_copy(style);
if (!provider)
{
provider = gtk_css_provider_new();
gtk_css_provider_load_from_data (provider, css_default_color, -1, NULL);
stylecontext = gtk_widget_get_style_context (label);
gtk_style_context_add_provider (stylecontext, GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_set_data (G_OBJECT (label), "custom-provider", provider);
}
deficit = gnc_numeric_negative_p (value);
if (deficit)
{
gnc_get_deficit_color(&style->fg[GTK_STATE_NORMAL]);
gdk_colormap_alloc_color(cm, &style->fg[GTK_STATE_NORMAL], FALSE, TRUE);
}
gtk_css_provider_load_from_data (provider, css_red_color, -1, NULL);
else
style->fg[GTK_STATE_NORMAL] = style->black;
gtk_widget_set_style(label, style);
g_object_unref(style);
gtk_css_provider_load_from_data (provider, css_default_color, -1, NULL);
}
@ -239,6 +224,66 @@ gnc_window_adjust_for_screen(GtkWindow * window)
gtk_widget_queue_resize(GTK_WIDGET(window));
}
/********************************************************************\
* Sets the alignament of a Label Widget, GTK3 version specific. *
* *
* Args: widget - the label widget to set alignment on *
* xalign - x alignment *
* yalign - y alignment *
* Returns: nothing *
\********************************************************************/
void
gnc_label_set_alignment (GtkWidget *widget, gfloat xalign, gfloat yalign)
{
#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign (GTK_LABEL (widget), xalign);
gtk_label_set_yalign (GTK_LABEL (widget), yalign);
#else
gtk_misc_set_alignment (GTK_MISC (widget), xalign, yalign);
#endif
}
/********************************************************************\
* Get the preference for showing tree view grid lines *
* *
* Args: none *
* Returns: GtkTreeViewGridLines setting *
\********************************************************************/
GtkTreeViewGridLines
gnc_tree_view_get_grid_lines_pref (void)
{
GtkTreeViewGridLines grid_lines;
gboolean h_lines = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, "grid-lines-horizontal");
gboolean v_lines = gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, "grid-lines-vertical");
if (h_lines)
{
if (v_lines)
grid_lines = GTK_TREE_VIEW_GRID_LINES_BOTH;
else
grid_lines = GTK_TREE_VIEW_GRID_LINES_HORIZONTAL;
}
else if (v_lines)
grid_lines = GTK_TREE_VIEW_GRID_LINES_VERTICAL;
else
grid_lines = GTK_TREE_VIEW_GRID_LINES_NONE;
return grid_lines;
}
/********************************************************************\
* Add a style context to a Widget so it can be altered with css *
* *
* Args: widget - widget to add css style too *
* gnc_class - character string for css class name *
* Returns: nothing *
\********************************************************************/
void
gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class)
{
GtkStyleContext *context = gtk_widget_get_style_context (widget);
gtk_style_context_add_class (context, gnc_class);
}
gboolean
gnc_handle_date_accelerator (GdkEventKey *event,
struct tm *tm,
@ -488,17 +533,19 @@ gnc_builder_connect_full_func(GtkBuilder *builder,
void
gnc_gtk_dialog_add_button (GtkWidget *dialog, const gchar *label, const gchar *stock_id, guint response)
gnc_gtk_dialog_add_button (GtkWidget *dialog, const gchar *label, const gchar *icon_name, guint response)
{
GtkWidget *button;
button = gtk_button_new_with_mnemonic(label);
if (stock_id)
if (icon_name)
{
GtkWidget *image;
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(button), image);
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON(button), image);
if (gnc_prefs_get_bool (GNC_PREFS_GROUP_GENERAL, "buttons-with-icons-and-labels"))
g_object_set (button, "always-show-image", TRUE, NULL);
}
g_object_set (button, "can-default", TRUE, NULL);
gtk_widget_show_all(button);

32
src/gnome-utils/dialog-utils.h
View File

@ -29,7 +29,6 @@
#include <gtk/gtk.h>
#include "qof.h"
void gnc_get_deficit_color (GdkColor *color);
void gnc_set_label_color (GtkWidget *label, gnc_numeric value);
/********************************************************************\
@ -62,6 +61,33 @@ void gnc_save_window_size (const char *section, GtkWindow *window);
\********************************************************************/
void gnc_window_adjust_for_screen (GtkWindow * window);
/********************************************************************\
* Sets the alignament of a Label Widget, GTK3 version specific. *
* *
* Args: widget - the label widget to set alignment on *
* xalign - x alignment *
* yalign - y alignment *
* Returns: nothing *
\********************************************************************/
void gnc_label_set_alignment (GtkWidget *widget, gfloat xalign, gfloat yalign);
/********************************************************************\
* Get the preference for showing tree view grid lines *
* *
* Args: none *
* Returns: GtkTreeViewGridLines setting *
\********************************************************************/
GtkTreeViewGridLines gnc_tree_view_get_grid_lines_pref (void);
/********************************************************************\
* Add a style context to a Widget so it can be altered with css *
* *
* Args: widget - widget to add css style too *
* gnc_class - character string for css class name *
* Returns: nothing *
\********************************************************************/
void gnc_widget_set_style_context (GtkWidget *widget, const char *gnc_class);
gboolean gnc_handle_date_accelerator (GdkEventKey *event,
struct tm *tm,
const char *date_str);
@ -85,13 +111,13 @@ void gnc_builder_connect_full_func (GtkBuilder *builder,
*
* @param label The text of the button.
*
* @param stock_id The name of the stock button to use.
* @param icon_name The name of the icon button to use.
*
* @param response The response id to return if this button is
* clicked.*/
void gnc_gtk_dialog_add_button (GtkWidget *dialog,
const gchar *label,
const gchar *stock_id,
const gchar *icon_name,
guint response);
/** Note: This dialog is modal! (It calls gtk_dialog_run() which is modal.)

10
src/gnome-utils/gnc-account-sel.c
View File

@ -35,6 +35,7 @@
#include "gnc-ui-util.h"
#include "qof.h"
#include "gnc-session.h"
#include "dialog-utils.h"
#define ACCT_DATA_TAG "gnc-account-sel_acct"
@ -65,7 +66,7 @@ static void gas_populate_list (GNCAccountSel *gas);
static void gas_new_account_click (GtkButton *b, gpointer ud);
static GtkHBox *parent_class;
static GtkBox *parent_class;
GType
gnc_account_sel_get_type (void)
@ -87,7 +88,7 @@ gnc_account_sel_get_type (void)
(GInstanceInitFunc) gnc_account_sel_init
};
account_sel_type = g_type_register_static (GTK_TYPE_HBOX,
account_sel_type = g_type_register_static (GTK_TYPE_BOX,
"GNCAccountSel",
&account_sel_info, 0);
}
@ -146,12 +147,17 @@ gnc_account_sel_init (GNCAccountSel *gas)
{
GtkWidget *widget;
gtk_orientable_set_orientation (GTK_ORIENTABLE(gas), GTK_ORIENTATION_HORIZONTAL);
gas->initDone = FALSE;
gas->acctTypeFilters = FALSE;
gas->newAccountButton = NULL;
g_object_set(gas, "spacing", 2, (gchar*)NULL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gas), "GncAccountSel");
gas->store = gtk_list_store_new(NUM_ACCT_COLS, G_TYPE_STRING, G_TYPE_POINTER);
widget = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(gas->store));
gas->combo = GTK_COMBO_BOX(widget);

6
src/gnome-utils/gnc-account-sel.h
View File

@ -40,7 +40,7 @@
typedef struct
{
GtkHBox hbox;
GtkBox hbox;
gboolean initDone;
gboolean isModal;
GtkListStore *store;
@ -59,7 +59,7 @@ typedef struct
typedef struct
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
/* Signals for notification/filtering of changes */
void (*account_sel_changed) (GNCAccountSel *gas);
@ -106,4 +106,4 @@ void gnc_account_sel_set_new_account_modal( GNCAccountSel *gas,
gint gnc_account_sel_get_num_account( GNCAccountSel *gas );
void gnc_account_sel_purge_account( GNCAccountSel *gas, Account *acc, gboolean recursive);
#endif /* !ndef GNC_ACCOUNT_SEL_H */
#endif /* GNC_ACCOUNT_SEL_H */

4
src/gnome-utils/gnc-amount-edit.c
View File

@ -42,6 +42,7 @@
#include "gnc-locale-utils.h"
#include "gnc-ui-util.h"
#include "qof.h"
#include "dialog-utils.h"
#ifdef G_OS_WIN32
# include <gdk/gdkwin32.h>
@ -139,6 +140,9 @@ gnc_amount_edit_init (GNCAmountEdit *gae)
gae->fraction = 0;
gae->evaluate_on_enter = FALSE;
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gae), "GncAmountEdit");
g_signal_connect (G_OBJECT (gae), "changed",
G_CALLBACK (gnc_amount_edit_changed), NULL);
}

5
src/gnome-utils/gnc-autosave.c
View File

@ -34,6 +34,7 @@
#include "gnc-prefs.h"
#include "gnc-main-window.h"
#include "gnc-gui-query.h"
#include "dialog-utils.h"
#define GNC_PREF_AUTOSAVE_SHOW_EXPLANATION "autosave-show-explanation"
#define GNC_PREF_AUTOSAVE_INTERVAL "autosave-interval-minutes"
@ -96,6 +97,10 @@ static gboolean autosave_confirm(GtkWidget *toplevel)
GTK_BUTTONS_NONE,
"%s",
_("Save file automatically?"));
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dialog), "GncAutoSaveDialog");
gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG(dialog),
ngettext("Your data file needs to be saved to your hard disk to save your changes. "

39
src/gnome-utils/gnc-cell-renderer-date.c
View File

@ -77,8 +77,8 @@ GtkCellEditable *gcrd_start_editing (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags);
static void gcrd_show (GncCellRendererPopup *cell,
@ -143,7 +143,9 @@ gcrd_init (GncCellRendererDate *date)
gtk_container_add (GTK_CONTAINER (popup->popup_window), frame);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
vbox = gtk_vbox_new (FALSE, 6);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
@ -151,7 +153,7 @@ gcrd_init (GncCellRendererDate *date)
popup->focus_window = date->calendar;
gtk_box_pack_start (GTK_BOX (vbox), date->calendar, TRUE, TRUE, 0);
date->button_box = gtk_hbutton_box_new ();
date->button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_set_spacing (GTK_BOX (date->button_box), 6);
gtk_box_pack_start (GTK_BOX (vbox), date->button_box, FALSE, FALSE, 0);
@ -269,8 +271,8 @@ gcrd_start_editing (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
GNC_CELL_RENDERER_POPUP (cell)->editing_canceled = FALSE;
@ -431,27 +433,6 @@ gcrd_day_selected (GtkWidget *popup_window, GncCellRendererDate *cell)
}
static gboolean
gcrd_grab_on_window (GdkWindow *window,
guint32 activate_time)
{
if ((gdk_pointer_grab (window, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, NULL, activate_time) == 0)) {
if (gdk_keyboard_grab (window, TRUE,
activate_time) == 0)
return TRUE;
else {
gdk_pointer_ungrab (activate_time);
return FALSE;
}
}
return FALSE;
}
/* This function converts a time64 value date to separate entities */
gboolean
gcrd_time2dmy (time64 raw_time, gint *day, gint *month, gint *year)
@ -512,7 +493,3 @@ gcrd_string_dmy2time (const gchar *date_string)
}
}

15
src/gnome-utils/gnc-cell-renderer-popup-entry.c
View File

@ -97,17 +97,22 @@ gnc_popup_entry_init (GncPopupEntry *widget)
{
GtkWidget *arrow;
widget->hbox = gtk_hbox_new (FALSE, 0);
widget->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (widget->hbox), FALSE);
gtk_widget_show (widget->hbox);
widget->entry = g_object_new (GTK_TYPE_ENTRY, "has_frame", FALSE, NULL);
GTK_ENTRY (widget->entry)->is_cell_renderer = TRUE;
gtk_entry_set_visibility (GTK_ENTRY (widget->entry), TRUE);
gtk_widget_show (widget->entry);
widget->button = gtk_button_new ();
gtk_widget_show (widget->button);
#if GTK_CHECK_VERSION(3,14,0)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
#else
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
#endif
gtk_widget_show (arrow);
gtk_container_add (GTK_CONTAINER (widget->button), arrow);
@ -297,14 +302,18 @@ gnc_popup_get_button_width (void)
gtk_widget_show (button);
gtk_container_add (GTK_CONTAINER (window), button);
#if GTK_CHECK_VERSION(3,14,0)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
#else
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
#endif
gtk_widget_show (arrow);
gtk_container_add (GTK_CONTAINER (button), arrow);
gtk_window_move (GTK_WINDOW (window), -500, -500);
gtk_widget_show (window);
gtk_widget_size_request (window, &req);
gtk_widget_get_preferred_size (window, &req, NULL);
width = req.width;

58
src/gnome-utils/gnc-cell-renderer-popup.c
View File

@ -49,8 +49,8 @@ gcrp_start_editing (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags);
static void gcrp_show_popup (GncCellRendererPopup *cell,
const gchar *path,
@ -61,7 +61,7 @@ static void gcrp_show_popup (GncCellRendererPopup *cell,
static void gcrp_hide_popup (GncCellRendererPopup *cell);
static void gcrp_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
@ -215,21 +215,25 @@ static gboolean
gcrp_grab_on_window (GdkWindow *window,
guint32 activate_time)
{
if ((gdk_pointer_grab (window, TRUE,
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, NULL, activate_time) == 0)) {
if (gdk_keyboard_grab (window, TRUE,
activate_time) == 0)
return TRUE;
else {
gdk_pointer_ungrab (activate_time);
return FALSE;
}
}
GdkDisplay *display = gdk_display_get_default ();
GdkDeviceManager *dm = gdk_display_get_device_manager (display);
GdkDevice *device = gdk_device_manager_get_client_pointer (dm);
return FALSE;
if ((gdk_device_grab (device, window, GDK_OWNERSHIP_WINDOW, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, activate_time) == 0)) {
if (gdk_device_grab (device, window, GDK_OWNERSHIP_WINDOW, TRUE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, activate_time) == 0)
return TRUE;
else {
gdk_device_ungrab (device, activate_time);
return FALSE;
}
}
return FALSE;
}
static void
@ -336,7 +340,7 @@ gcrp_arrow_clicked (GtkCellEditable *entry,
gnc_cell_renderer_popup_hide (cell);
return;
}
path = g_object_get_data (G_OBJECT (entry),
GNC_CELL_RENDERER_POPUP_PATH);
@ -369,8 +373,8 @@ gcrp_start_editing (GtkCellRenderer *cell,
GdkEvent *event,
GtkWidget *widget,
const gchar *path,
GdkRectangle *background_area,
GdkRectangle *cell_area,
const GdkRectangle *background_area,
const GdkRectangle *cell_area,
GtkCellRendererState flags)
{
GncCellRendererPopup *popup;
@ -434,13 +438,13 @@ gnc_cell_renderer_popup_hide (GncCellRendererPopup *cell)
}
static void
gcrp_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height)
gcrp_get_size (GtkCellRenderer *cell,
GtkWidget *widget,
const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height)
{
GncCellRendererPopup *popup;

40
src/gnome-utils/gnc-combott.c
View File

@ -27,10 +27,12 @@
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
\********************************************************************/
#include "config.h"
#include <gtk/gtk.h>
#include "gnc-combott.h"
#include <strings.h>
#include <string.h>
#include "dialog-utils.h"
enum
{
@ -134,7 +136,7 @@ gnc_combott_get_type (void)
(GInstanceInitFunc) gctt_init,
};
combott_type = g_type_register_static (GTK_TYPE_HBOX,
combott_type = g_type_register_static (GTK_TYPE_BOX,
"GncCombott",
&combott_info, 0);
}
@ -211,16 +213,31 @@ gctt_init (GncCombott *combott)
GncCombottPrivate *priv = GNC_COMBOTT_GET_PRIVATE (combott);
gtk_orientable_set_orientation (GTK_ORIENTABLE(combott), GTK_ORIENTATION_HORIZONTAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(combott), "GncCombott");
priv->active = 0;
priv->text_col = 0;
priv->tip_col = 1;
hbox = gtk_hbox_new(FALSE, 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE);
arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
#if GTK_CHECK_VERSION(3,14,0)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
#else
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
#endif
#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_start (GTK_WIDGET(arrow), 5);
#else
gtk_widget_set_margin_left (GTK_WIDGET(arrow), 5);
#endif
gtk_box_pack_end (GTK_BOX (hbox), arrow, FALSE, FALSE, 0);
sep = gtk_vseparator_new();
sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
gtk_box_pack_end (GTK_BOX (hbox), sep, FALSE, FALSE, 0);
label = gtk_label_new(NULL);
@ -407,7 +424,7 @@ gctt_rebuild_menu (GncCombott *combott, GtkTreeModel *model)
/* Add the tooltip to the child label */
label = gtk_bin_get_child(GTK_BIN(menu_items));
gtk_widget_set_tooltip_text (label, tip_data);
gtk_misc_set_alignment (GTK_MISC(label), 0, 0.5);
gnc_label_set_alignment (label, 0, 0.5);
/* ...and add it to the menu. */
gtk_menu_shell_append (GTK_MENU_SHELL (priv->menu), menu_items);
@ -470,6 +487,9 @@ gctt_combott_menu_position (GtkMenu *menu,
GtkWidget *child;
GtkRequisition req;
GtkAllocation alloc;
GtkBorder padding;
GtkStyleContext *sc = gtk_widget_get_style_context (GTK_WIDGET (priv->button));
GtkStateFlags state_flags = gtk_style_context_get_state (sc);
child = gtk_bin_get_child (GTK_BIN (priv->button));
@ -484,9 +504,11 @@ gctt_combott_menu_position (GtkMenu *menu,
gdk_window_get_root_coords (gtk_widget_get_window (child), sx, sy, &sx, &sy);
sx -= gtk_widget_get_style (GTK_WIDGET (priv->button))->xthickness;
gtk_style_context_get_padding (sc, state_flags, &padding);
gtk_widget_size_request (GTK_WIDGET (menu), &req);
sx -= padding.left;
gtk_widget_get_preferred_size (GTK_WIDGET (menu), &req, NULL);
if (gtk_widget_get_direction (GTK_WIDGET (priv->button)) == GTK_TEXT_DIR_LTR)
*x = sx;
@ -600,7 +622,7 @@ menuitem_response_cb (GtkMenuItem *item, gpointer *user_data )
/* Set the button Label */
gtk_label_set_text(GTK_LABEL(priv->label), label_text);
gtk_misc_set_alignment (GTK_MISC(priv->label), 0, 0.5);
gnc_label_set_alignment (priv->label, 0, 0.5);
/* Get the corresponding entry in the list store */
valid = gtk_tree_model_get_iter_first (priv->model, &iter);
@ -709,7 +731,7 @@ gnc_combott_set_active (GncCombott *combott, gint index)
priv->active = index + 1;
priv->active_iter = iter;
gtk_label_set_text(GTK_LABEL(priv->label), str_data);
gtk_misc_set_alignment (GTK_MISC(priv->label), 0, 0.5);
gnc_label_set_alignment (priv->label, 0, 0.5);
g_signal_emit (combott, combott_signals[CHANGED], 0);
}

2
src/gnome-utils/gnc-combott.h
View File

@ -46,7 +46,7 @@ typedef struct _GncCombottClass GncCombottClass;
struct _GncCombott
{
GtkHBox hbox;
GtkBox hbox;
};
struct _GncCombottClass

4
src/gnome-utils/gnc-currency-edit.c
View File

@ -68,6 +68,7 @@
#include "gnc-gtk-utils.h"
#include "gnc-ui-util.h"
#include "gnc-engine.h"
#include "dialog-utils.h"
/** The debugging module used by this file. */
static QofLogModule log_module = GNC_MOD_GUI;
@ -226,6 +227,9 @@ gnc_currency_edit_class_init (GNCCurrencyEditClass *klass)
static void
gnc_currency_edit_init (GNCCurrencyEdit *gce)
{
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gce), "GncCurrencyEdit");
g_signal_connect (gce, "notify::mnemonic",
G_CALLBACK (gnc_currency_edit_mnemonic_changed), gce);
g_signal_connect (gce, "changed",

10
src/gnome-utils/gnc-date-delta.c
View File

@ -43,6 +43,7 @@
#include "gnc-date.h"
#include "gnc-date-delta.h"
#include "dialog-utils.h"
#define GDD_LABEL "gdd"
@ -65,7 +66,7 @@ static void gnc_date_delta_forall (GtkContainer *container,
GtkCallback callback,
gpointer callbabck_data);
static GtkHBoxClass *parent_class;
static GtkBoxClass *parent_class;
/**
* gnc_date_delta_get_type:
@ -92,7 +93,7 @@ gnc_date_delta_get_type (void)
(GInstanceInitFunc) gnc_date_delta_init
};
date_delta_type = g_type_register_static (gtk_hbox_get_type (),
date_delta_type = g_type_register_static (gtk_box_get_type (),
"GNCDateDelta",
&date_delta_info,
0);
@ -159,6 +160,11 @@ gnc_date_delta_class_init (GNCDateDeltaClass *klass)
static void
gnc_date_delta_init (GNCDateDelta *gdd)
{
gtk_orientable_set_orientation (GTK_ORIENTABLE(gdd), GTK_ORIENTATION_HORIZONTAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gdd), "GncDateDelta");
gdd->value_spin = NULL;
gdd->units_combo = NULL;
gdd->polarity_combo = NULL;

4
src/gnome-utils/gnc-date-delta.h
View File

@ -54,7 +54,7 @@ typedef enum
typedef struct
{
GtkHBox hbox;
GtkBox hbox;
GtkWidget *value_spin;
GtkWidget *units_combo;
@ -68,7 +68,7 @@ typedef struct
typedef struct
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
void (*value_changed) (GNCDateDelta *gdd);
void (*units_changed) (GNCDateDelta *gdd);
void (*polarity_changed) (GNCDateDelta *gdd);

86
src/gnome-utils/gnc-date-edit.c
View File

@ -80,7 +80,7 @@ static int date_accel_key_press(GtkWidget *widget,
gpointer data);
static GtkHBoxClass *parent_class;
static GtkBoxClass *parent_class;
/**
* gnc_date_edit_get_type:
@ -108,7 +108,7 @@ gnc_date_edit_get_type (void)
NULL,
};
date_edit_type = g_type_register_static (GTK_TYPE_HBOX,
date_edit_type = g_type_register_static (GTK_TYPE_BOX,
"GNCDateEdit",
&date_edit_info, 0);
}
@ -148,13 +148,20 @@ gnc_strtok_r (char *s, const char *delim, char **save_ptr)
static void
gnc_date_edit_popdown(GNCDateEdit *gde)
{
GdkDeviceManager *manager;
GdkDevice *pointer;
g_return_if_fail (GNC_IS_DATE_EDIT (gde));
ENTER("gde %p", gde);
manager = gdk_display_get_device_manager (gdk_display_get_default());
pointer = gdk_device_manager_get_client_pointer (manager);
gtk_grab_remove (gde->cal_popup);
gtk_widget_hide (gde->cal_popup);
gdk_pointer_ungrab (GDK_CURRENT_TIME);
if (pointer)
gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gde->date_button),
FALSE);
@ -217,7 +224,7 @@ position_popup (GNCDateEdit *gde)
GtkRequisition req;
GtkAllocation alloc;
gtk_widget_size_request (gde->cal_popup, &req);
gtk_widget_get_preferred_size (gde->cal_popup, &req, NULL);
gdk_window_get_origin (gtk_widget_get_window (gde->date_button), &x, &y);
@ -242,40 +249,48 @@ position_popup (GNCDateEdit *gde)
/* Pulled from gtkcombobox.c */
static gboolean
popup_grab_on_window (GdkWindow *window,
guint32 activate_time,
gboolean grab_keyboard)
GdkDevice *keyboard,
GdkDevice *pointer,
guint32 activate_time)
{
if ((gdk_pointer_grab (window, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, NULL, activate_time) == 0))
if (keyboard &&
gdk_device_grab (keyboard, window,
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, activate_time) != GDK_GRAB_SUCCESS)
return FALSE;
if (pointer &&
gdk_device_grab (pointer, window,
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, activate_time) != GDK_GRAB_SUCCESS)
{
if (!grab_keyboard ||
gdk_keyboard_grab (window, TRUE,
activate_time) == 0)
return TRUE;
else
{
gdk_display_pointer_ungrab (gdk_window_get_display (window),
activate_time);
return FALSE;
}
if (keyboard)
gdk_device_ungrab (keyboard, activate_time);
return FALSE;
}
return FALSE;
return TRUE;
}
static void
gnc_date_edit_popup (GNCDateEdit *gde)
{
GtkWidget *toplevel;
struct tm mtm;
gboolean date_was_valid;
GdkDevice *device, *keyboard, *pointer;
g_return_if_fail (GNC_IS_DATE_EDIT (gde));
ENTER("gde %p", gde);
device = gtk_get_current_event_device ();
/* This code is pretty much just copied from gtk_date_edit_get_date */
date_was_valid = qof_scan_date (gtk_entry_get_text (GTK_ENTRY (gde->date_entry)),
&mtm.tm_mday, &mtm.tm_mon, &mtm.tm_year);
@ -321,11 +336,22 @@ gnc_date_edit_popup (GNCDateEdit *gde)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gde->date_button),
TRUE);
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
{
keyboard = device;
pointer = gdk_device_get_associated_device (device);
}
else
{
pointer = device;
keyboard = gdk_device_get_associated_device (device);
}
if (!gtk_widget_has_focus (gde->calendar))
gtk_widget_grab_focus (gde->calendar);
if (!popup_grab_on_window (gtk_widget_get_window ((GTK_WIDGET(gde->cal_popup))),
GDK_CURRENT_TIME, TRUE))
keyboard, pointer, GDK_CURRENT_TIME))
{
gtk_widget_hide (gde->cal_popup);
LEAVE("Failed to grab window");
@ -606,7 +632,7 @@ gnc_date_edit_class_init (GNCDateEditClass *klass)
object_class->dispose = gnc_date_edit_dispose;
object_class->finalize = gnc_date_edit_finalize;
parent_class = g_type_class_ref(GTK_TYPE_HBOX);
parent_class = g_type_class_ref(GTK_TYPE_BOX);
date_edit_signals [TIME_CHANGED] =
g_signal_new ("time_changed",
@ -643,6 +669,11 @@ gnc_date_edit_class_init (GNCDateEditClass *klass)
static void
gnc_date_edit_init (GNCDateEdit *gde)
{
gtk_orientable_set_orientation (GTK_ORIENTABLE(gde), GTK_ORIENTATION_HORIZONTAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gde), "GncDateEdit");
gde->disposed = FALSE;
gde->popup_in_progress = FALSE;
gde->lower_hour = 7;
@ -856,19 +887,24 @@ create_children (GNCDateEdit *gde)
G_CALLBACK (gnc_date_edit_button_toggled), gde);
gtk_box_pack_start (GTK_BOX (gde), gde->date_button, FALSE, FALSE, 0);
hbox = gtk_hbox_new (FALSE, 3);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
gtk_container_add (GTK_CONTAINER (gde->date_button), hbox);
gtk_widget_show (GTK_WIDGET(hbox));
/* Calendar label, only shown if the date editor has a time field */
gde->cal_label = gtk_label_new (_("Calendar"));
gtk_misc_set_alignment (GTK_MISC (gde->cal_label), 0.0, 0.5);
gnc_label_set_alignment (gde->cal_label, 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), gde->cal_label, TRUE, TRUE, 0);
if (gde->flags & GNC_DATE_EDIT_SHOW_TIME)
gtk_widget_show (GTK_WIDGET(gde->cal_label));
/* Graphic for the popup button. */
#if GTK_CHECK_VERSION(3,14,0)
arrow = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_BUTTON);
#else
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
#endif
gtk_box_pack_start (GTK_BOX (hbox), arrow, TRUE, FALSE, 0);
gtk_widget_show (GTK_WIDGET(arrow));

4
src/gnome-utils/gnc-date-edit.h
View File

@ -57,7 +57,7 @@ typedef enum
**/
typedef struct
{
GtkHBox hbox;
GtkBox hbox;
GtkWidget *date_entry;
GtkWidget *date_button;
@ -84,7 +84,7 @@ typedef struct
typedef struct
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
void (*date_changed) (GNCDateEdit *gde);
void (*time_changed) (GNCDateEdit *gde);
} GNCDateEditClass;

13
src/gnome-utils/gnc-date-format.c
View File

@ -87,7 +87,7 @@ static void gnc_date_format_compute_format(GNCDateFormat *gdf);
void gnc_ui_date_format_changed_cb(GtkWidget *unused, gpointer user_data);
static GtkHBoxClass *parent_class;
static GtkBoxClass *parent_class;
/**
* gnc_date_format_get_type:
@ -115,7 +115,7 @@ gnc_date_format_get_type (void)
NULL,
};
date_format_type = g_type_register_static(GTK_TYPE_HBOX,
date_format_type = g_type_register_static(GTK_TYPE_BOX,
"GNCDateFormat",
&date_format_info, 0);
}
@ -158,10 +158,15 @@ gnc_date_format_init (GNCDateFormat *gdf)
g_return_if_fail(gdf);
g_return_if_fail(GNC_IS_DATE_FORMAT(gdf));
gtk_orientable_set_orientation (GTK_ORIENTABLE(gdf), GTK_ORIENTATION_HORIZONTAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gdf), "GncDateFormat");
/* Open up the Glade and set the signals */
builder = gtk_builder_new();
gnc_builder_add_from_file (builder, "gnc-date-format.glade", "format-liststore");
gnc_builder_add_from_file (builder, "gnc-date-format.glade", "GNC Date Format");
gnc_builder_add_from_file (builder, "gnc-date-format.glade", "gnc_date_format_window");
gtk_builder_connect_signals_full (builder, gnc_builder_connect_full_func, gdf);
@ -187,7 +192,7 @@ gnc_date_format_init (GNCDateFormat *gdf)
gnc_date_format_set_format(gdf, QOF_DATE_FORMAT_UNSET);
/* pull in the dialog and table widgets and play the reconnect game */
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "GNC Date Format"));
dialog = GTK_WIDGET(gtk_builder_get_object (builder, "gnc_date_format_window"));
table = GTK_WIDGET(gtk_builder_get_object (builder, "date_format_table"));
g_object_ref(G_OBJECT(table));

4
src/gnome-utils/gnc-date-format.h
View File

@ -40,12 +40,12 @@
**/
typedef struct
{
GtkHBox hbox;
GtkBox hbox;
} GNCDateFormat;
typedef struct
{
GtkHBoxClass hbox_class;
GtkBoxClass hbox_class;
void (*format_changed) (GNCDateFormat *gdf);
} GNCDateFormatClass;

197
src/gnome-utils/gnc-dense-cal.c
View File

@ -31,6 +31,7 @@
#include <math.h>
#include <stdlib.h>
#include <gnc-gdate-utils.h>
#include "dialog-utils.h"
/**
* Marking ...
@ -83,7 +84,7 @@ static void gnc_dense_cal_dispose(GObject *object);
static void gnc_dense_cal_realize(GtkWidget *widget, gpointer user_data);
static void gnc_dense_cal_configure(GtkWidget *widget, GdkEventConfigure *event, gpointer user_data);
static void gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal);
static gboolean gnc_dense_cal_expose(GtkWidget *widget, GdkEventExpose *event, gpointer user_data);
static gboolean gnc_dense_cal_draw(GtkWidget *widget, cairo_t *cr, gpointer user_data);
static void gdc_reconfig(GncDenseCal *dcal);
@ -208,7 +209,7 @@ gnc_dense_cal_get_type()
NULL
};
dense_cal_type = g_type_register_static(GTK_TYPE_VBOX,
dense_cal_type = g_type_register_static(GTK_TYPE_BOX,
"GncDenseCal",
&dense_cal_info, 0);
}
@ -263,7 +264,10 @@ gnc_dense_cal_init(GncDenseCal *dcal)
{
gboolean colorAllocSuccess[MAX_COLORS];
gtk_widget_push_composite_child();
gtk_orientable_set_orientation (GTK_ORIENTABLE(dcal), GTK_ORIENTATION_VERTICAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(dcal), "GncDenseCal");
{
GtkTreeModel *options;
@ -280,15 +284,17 @@ gnc_dense_cal_init(GncDenseCal *dcal)
}
{
GtkHBox *hbox = GTK_HBOX(gtk_hbox_new(FALSE, 0));
GtkAlignment *label_align;
GtkLabel *label;
float right_align = 1.0, mid_align = 0.5, fill_x = 0.0, fill_y = 1.0;
GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
GtkWidget *label = gtk_label_new (_("View:"));
label = GTK_LABEL(gtk_label_new(_("View:")));
label_align = GTK_ALIGNMENT(gtk_alignment_new(right_align, mid_align, fill_x, fill_y));
gtk_container_add(GTK_CONTAINER(label_align), GTK_WIDGET(label));
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label_align), TRUE, TRUE, 0);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
gtk_widget_set_halign (label, GTK_ALIGN_END);
#if GTK_CHECK_VERSION(3,12,0)
gtk_widget_set_margin_end (label, 5);
#else
gtk_widget_set_margin_right (label, 5);
#endif
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(dcal->view_options), FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(dcal), GTK_WIDGET(hbox), FALSE, FALSE, 0);
@ -300,7 +306,7 @@ gnc_dense_cal_init(GncDenseCal *dcal)
| GDK_POINTER_MOTION_MASK
| GDK_POINTER_MOTION_HINT_MASK));
gtk_box_pack_start(GTK_BOX(dcal), GTK_WIDGET(dcal->cal_drawing_area), TRUE, TRUE, 0);
g_signal_connect(G_OBJECT(dcal->cal_drawing_area), "expose_event", G_CALLBACK(gnc_dense_cal_expose), (gpointer)dcal);
g_signal_connect(G_OBJECT(dcal->cal_drawing_area), "draw", G_CALLBACK(gnc_dense_cal_draw), (gpointer)dcal);
g_signal_connect(G_OBJECT(dcal->cal_drawing_area), "realize", G_CALLBACK(gnc_dense_cal_realize), (gpointer)dcal);
g_signal_connect(G_OBJECT(dcal->cal_drawing_area), "configure_event", G_CALLBACK(gnc_dense_cal_configure), (gpointer)dcal);
@ -320,8 +326,10 @@ gnc_dense_cal_init(GncDenseCal *dcal)
GtkListStore *tree_data;
GtkTreeView *tree_view;
vbox = gtk_vbox_new(FALSE, 5);
hbox = gtk_hbox_new(FALSE, 5);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_set_homogeneous (GTK_BOX (vbox), FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
l = gtk_label_new(_("Date: "));
gtk_container_add(GTK_CONTAINER(hbox), l);
@ -330,7 +338,7 @@ gnc_dense_cal_init(GncDenseCal *dcal)
gtk_container_add(GTK_CONTAINER(hbox), l);
gtk_container_add(GTK_CONTAINER(vbox), hbox);
gtk_container_add(GTK_CONTAINER(vbox), gtk_hseparator_new());
gtk_container_add(GTK_CONTAINER(vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
tree_data = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
tree_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_data)));
@ -346,40 +354,49 @@ gnc_dense_cal_init(GncDenseCal *dcal)
gtk_widget_realize(GTK_WIDGET(dcal->transPopup));
}
gdk_color_parse(MONTH_THIS_COLOR, &dcal->weekColors[MONTH_THIS]);
gdk_color_parse(MONTH_THAT_COLOR, &dcal->weekColors[MONTH_THAT]);
gdk_rgba_parse(&dcal->weekColors[MONTH_THIS], MONTH_THIS_COLOR);
gdk_rgba_parse(&dcal->weekColors[MONTH_THAT], MONTH_THAT_COLOR);
/* success array must be as big as number of colors */
g_assert(MAX_COLORS == (sizeof(colorAllocSuccess)/sizeof(gboolean)));
if (gdk_colormap_alloc_colors(gdk_colormap_get_system(),
dcal->weekColors,
MAX_COLORS, TRUE, TRUE,
colorAllocSuccess) > 0)
{
g_error("error allocating colors");
}
/* Deal with the various label sizes. */
{
PangoLayout *layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
GtkStyleContext *stylectxt = gtk_widget_get_style_context (GTK_WIDGET(dcal));
GtkStateFlags state_flags = gtk_style_context_get_state (stylectxt);
gint font_size_reduction_units = 1;
PangoFontDescription *font_desc;
GtkCssProvider *provider;
gint font_size, px_size;
gint i;
gint maxWidth, maxHeight;
GtkStyle *style;
PangoLayout *layout;
PangoFontDescription *font_desc;
gint font_size;
gint font_size_reduction_units = 1;
gchar *px_str, *widget_css;
gdouble dpi;
layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
style = gtk_widget_get_style(GTK_WIDGET(dcal));
font_desc = pango_font_description_copy(style->font_desc);
gtk_style_context_get (stylectxt, state_flags,
GTK_STYLE_PROPERTY_FONT, &font_desc, NULL);
font_size = pango_font_description_get_size(font_desc);
#if GTK_CHECK_VERSION(3,16,0)
provider = gtk_css_provider_new();
dpi = gdk_screen_get_resolution (gdk_screen_get_default ());
px_size = ((font_size / PANGO_SCALE) - font_size_reduction_units) * (dpi / 72.);
px_str = g_strdup_printf("%i", px_size);
widget_css = g_strconcat ("*{\n font-size:", px_str, "px;\n}\n", NULL);
gtk_css_provider_load_from_data (provider, widget_css, -1, NULL);
gtk_style_context_add_provider (stylectxt, GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_object_unref (provider);
g_free (px_str);
g_free (widget_css);
#else
font_size -= font_size_reduction_units * PANGO_SCALE;
pango_font_description_set_size(font_desc, font_size);
gtk_widget_modify_font(GTK_WIDGET(dcal), font_desc);
pango_font_description_free(font_desc);
gtk_widget_override_font(GTK_WIDGET(dcal), font_desc);
#endif
pango_font_description_free (font_desc);
maxWidth = maxHeight = 0;
for (i = 0; i < 12; i++)
@ -468,8 +485,6 @@ gnc_dense_cal_init(GncDenseCal *dcal)
g_strfreev(parts);
}
gtk_widget_pop_composite_child();
gtk_widget_show_all(GTK_WIDGET(dcal));
}
@ -707,10 +722,6 @@ gnc_dense_cal_realize (GtkWidget *widget, gpointer user_data)
recompute_x_y_scales(dcal);
gdc_reconfig(dcal);
gtk_style_set_background(gtk_widget_get_style (widget),
gtk_widget_get_window (widget),
GTK_STATE_ACTIVE);
}
static void
@ -865,37 +876,68 @@ free_rect(gpointer data, gpointer ud)
}
static gboolean
gnc_dense_cal_expose(GtkWidget *widget,
GdkEventExpose *event,
gpointer user_data)
gnc_dense_cal_draw(GtkWidget *widget, cairo_t *cr, gpointer user_data)
{
GncDenseCal *dcal;
cairo_t *cr;
g_return_val_if_fail(widget != NULL, FALSE);
g_return_val_if_fail(GNC_IS_DENSE_CAL(user_data), FALSE);
g_return_val_if_fail(event != NULL, FALSE);
if (event->count > 0)
return FALSE;
dcal = GNC_DENSE_CAL(user_data);
cr = gdk_cairo_create (gtk_widget_get_window (GTK_WIDGET(dcal->cal_drawing_area)));
cairo_save (cr);;
cairo_set_source_surface (cr, dcal->surface, 0, 0);
cairo_paint (cr);
cairo_destroy (cr);
cairo_restore (cr);
return TRUE;
}
#define LOG_AND_RESET(timer, msg) do { g_debug("%s: %f", msg, g_timer_elapsed(timer, NULL) * 1000.); g_timer_reset(timer); } while (0);
static void
gnc_style_context_get_background_color (GtkStyleContext *context,
GtkStateFlags state,
GdkRGBA *color)
{
GdkRGBA *c;
g_return_if_fail (color != NULL);
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
gtk_style_context_get (context,
state,
"background-color", &c,
NULL);
*color = *c;
gdk_rgba_free (c);
}
static void
gnc_style_context_get_border_color (GtkStyleContext *context,
GtkStateFlags state,
GdkRGBA *color)
{
GdkRGBA *c;
g_return_if_fail (color != NULL);
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
gtk_style_context_get (context,
state,
"border-color", &c,
NULL);
*color = *c;
gdk_rgba_free (c);
}
static void
gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
{
GtkWidget *widget;
GtkStyleContext *stylectxt;
GtkStateFlags state_flags;
GtkAllocation alloc;
GdkColor color;
GdkRGBA color, test_color;
gint i;
int maxWidth;
PangoLayout *layout;
@ -914,11 +956,18 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
layout = gtk_widget_create_pango_layout(GTK_WIDGET(dcal), NULL);
LOG_AND_RESET(timer, "create_pango_layout");
gdk_rgba_parse (&test_color, "rgba(0, 0, 0, 0)");
gtk_widget_get_allocation (GTK_WIDGET(dcal->cal_drawing_area), &alloc);
color = gtk_widget_get_style (widget)->white;
cairo_set_source_rgb (cr, color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
stylectxt = gtk_widget_get_style_context (widget);
state_flags = gtk_style_context_get_state (stylectxt);
gnc_style_context_get_background_color (stylectxt, state_flags, &color);
// test for no color set
if (gdk_rgba_equal (&color, &test_color))
gdk_rgba_parse (&color, "white");
cairo_set_source_rgb (cr, color.red, color.green, color.blue);
cairo_rectangle (cr, 0, 0,
cairo_image_surface_get_width (dcal->surface),
cairo_image_surface_get_height (dcal->surface));
@ -949,9 +998,7 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
{
rect = (GdkRectangle*)mcListIter->data;
color = dcal->weekColors[ i % 2 ];
cairo_set_source_rgb (cr, color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
cairo_set_source_rgb (cr, color.red, color.green, color.blue);
cairo_rectangle (cr, rect->x, rect->y,
rect->width, rect->height);
cairo_fill (cr);
@ -967,11 +1014,8 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
int i;
int x1, x2, y1, y2;
gdk_color_parse(MARK_COLOR, &color);
gdk_colormap_alloc_color(gdk_colormap_get_system(), &color, TRUE, TRUE);
cairo_set_source_rgb (cr, color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
gdk_rgba_parse(&color, MARK_COLOR);
cairo_set_source_rgb (cr, color.red, color.green, color.blue);
for (i = 0; i < dcal->numMarks; i++)
{
@ -1007,11 +1051,9 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
h = col_height(dcal);
/* draw the outside border [inside the month labels] */
color = gtk_widget_get_style (widget)->fg[gtk_widget_get_state (widget)];
gnc_style_context_get_border_color (stylectxt, state_flags, &color);
cairo_set_source_rgb (cr, color.red, color.green, color.blue);
cairo_set_line_width (cr, 1);
cairo_set_source_rgb (cr, color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
cairo_rectangle (cr, x + 0.5, y + 0.5, w, h);
cairo_stroke (cr);
@ -1055,10 +1097,8 @@ gnc_dense_cal_draw_to_buffer(GncDenseCal *dcal)
- (day_label_width / 2);
label_y_offset = y - dcal->dayLabelHeight;
pango_layout_set_text(layout, day_label_str, -1);
color = gtk_widget_get_style (widget)->text[gtk_widget_get_state (widget)];
cairo_set_source_rgb (cr, color.red / 65535.0,
color.green / 65535.0,
color.blue / 65535.0);
gtk_style_context_get_color (stylectxt, state_flags, &color);
cairo_set_source_rgb (cr, color.red, color.green, color.blue);
cairo_move_to (cr, label_x_offset, label_y_offset);
pango_cairo_show_layout (cr, layout);
}
@ -1234,7 +1274,14 @@ gnc_dense_cal_motion_notify(GtkWidget *widget,
/* As per http://www.gtk.org/tutorial/sec-eventhandling.html */
if (event->is_hint)
gdk_window_get_pointer(event->window, &unused, &unused, &unused2);
{
GdkDeviceManager *device_manager;
GdkDevice *pointer;
device_manager = gdk_display_get_device_manager (gdk_window_get_display (event->window));
pointer = gdk_device_manager_get_client_pointer (device_manager);
gdk_window_get_device_position (event->window, pointer, &unused, &unused, &unused2);
}
doc = wheres_this(dcal, event->x, event->y);
if (doc >= 0)

4
src/gnome-utils/gnc-dense-cal.h
View File

@ -53,7 +53,7 @@ enum GDC_COLORS
struct _GncDenseCal
{
GtkVBox widget;
GtkBox widget;
GtkComboBox *view_options;
GtkDrawingArea *cal_drawing_area;
@ -84,7 +84,7 @@ struct _GncDenseCal
gdc_month_coords monthPositions[12];
GdkColor weekColors[MAX_COLORS];
GdkRGBA weekColors[MAX_COLORS];
guint label_width;
guint label_height;

12
src/gnome-utils/gnc-embedded-window.c
View File

@ -38,6 +38,7 @@
#include "gnc-plugin-manager.h"
#include "gnc-ui.h"
#include "gnc-window.h"
#include "dialog-utils.h"
/* Static Globals *******************************************************/
@ -119,7 +120,7 @@ gnc_embedded_window_get_type (void)
NULL
};
gnc_embedded_window_type = g_type_register_static (GTK_TYPE_VBOX,
gnc_embedded_window_type = g_type_register_static (GTK_TYPE_BOX,
"GncEmbeddedWindow",
&our_info, 0);
g_type_add_interface_static (gnc_embedded_window_type,
@ -237,6 +238,11 @@ gnc_embedded_window_init (GncEmbeddedWindow *window,
{
ENTER("window %p", window);
gtk_orientable_set_orientation (GTK_ORIENTABLE(window), GTK_ORIENTATION_VERTICAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(window), "GncEmbededWindow");
gnc_embedded_window_setup_window (window);
gnc_gobject_tracking_remember(G_OBJECT(window),
@ -324,12 +330,12 @@ gnc_embedded_window_setup_window (GncEmbeddedWindow *window)
/* Create widgets and add them to the window */
gtk_widget_show (GTK_WIDGET(window));
priv->menu_dock = gtk_vbox_new (FALSE, 0);
priv->menu_dock = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_box_set_homogeneous (GTK_BOX (priv->menu_dock), FALSE);
gtk_widget_show (priv->menu_dock);
gtk_box_pack_start (GTK_BOX (window), priv->menu_dock, FALSE, TRUE, 0);
priv->statusbar = gtk_statusbar_new ();
gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR(priv->statusbar), FALSE);
gtk_widget_show (priv->statusbar);
gtk_box_pack_end (GTK_BOX (window), priv->statusbar, FALSE, TRUE, 0);

4
src/gnome-utils/gnc-embedded-window.h
View File

@ -56,7 +56,7 @@ G_BEGIN_DECLS
typedef struct
{
/** The parent object for an embedded window. */
GtkVBox vbox;
GtkBox vbox;
/** A pointer to the UI Manager data structure for the whole
* window. */
GtkUIManager *ui_merge;
@ -67,7 +67,7 @@ typedef struct
typedef struct
{
/** The parent class for an embedded window. */
GtkVBoxClass vbox;
GtkBoxClass vbox;
} GncEmbeddedWindowClass;

31
src/gnome-utils/gnc-file.c
View File

@ -85,7 +85,7 @@ gnc_file_dialog (const char * title,
GtkWidget *file_box;
const char *internal_name;
char *file_name = NULL;
gchar * okbutton = GTK_STOCK_OPEN;
gchar * okbutton = _("Open");
const gchar *ok_icon = NULL;
GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
gint response;
@ -96,7 +96,7 @@ gnc_file_dialog (const char * title,
{
case GNC_FILE_DIALOG_OPEN:
action = GTK_FILE_CHOOSER_ACTION_OPEN;
okbutton = GTK_STOCK_OPEN;
okbutton = _("Open");
if (title == NULL)
title = _("Open");
break;
@ -108,14 +108,14 @@ gnc_file_dialog (const char * title,
break;
case GNC_FILE_DIALOG_SAVE:
action = GTK_FILE_CHOOSER_ACTION_SAVE;
okbutton = GTK_STOCK_SAVE;
okbutton = _("Save");
if (title == NULL)
title = _("Save");
break;
case GNC_FILE_DIALOG_EXPORT:
action = GTK_FILE_CHOOSER_ACTION_SAVE;
okbutton = _("_Export");
ok_icon = GTK_STOCK_CONVERT;
ok_icon = "go-next";
if (title == NULL)
title = _("Export");
break;
@ -126,7 +126,7 @@ gnc_file_dialog (const char * title,
title,
NULL,
action,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Cancel"), GTK_RESPONSE_CANCEL,
NULL);
if (ok_icon)
gnc_gtk_dialog_add_button(file_box, okbutton, ok_icon, GTK_RESPONSE_ACCEPT);
@ -171,6 +171,9 @@ gnc_file_dialog (const char * title,
response = gtk_dialog_run(GTK_DIALOG(file_box));
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(file_box), "GncFileDialog");
if (response == GTK_RESPONSE_ACCEPT)
{
/* look for constructs like postgres://foo */
@ -271,7 +274,7 @@ show_session_error (QofBackendError io_error,
{
case GNC_FILE_DIALOG_OPEN:
default:
label = GTK_STOCK_OPEN;
label = _("Open");
fmt = _("GnuCash could not obtain the lock for %s. "
"That database may be in use by another user, "
"in which case you should not open the database. "
@ -287,7 +290,7 @@ show_session_error (QofBackendError io_error,
break;
case GNC_FILE_DIALOG_SAVE:
label = GTK_STOCK_SAVE;
label = _("Save");
fmt = _("GnuCash could not obtain the lock for %s. "
"That database may be in use by another user, "
"in which case you should not save the database. "
@ -310,7 +313,7 @@ show_session_error (QofBackendError io_error,
fmt,
displayname);
gtk_dialog_add_buttons(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
_("Cancel"), GTK_RESPONSE_CANCEL,
label, GTK_RESPONSE_YES,
NULL);
if (parent == NULL)
@ -608,9 +611,9 @@ gnc_file_query_save (gboolean can_cancel)
if (can_cancel)
gtk_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
_("Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_SAVE, GTK_RESPONSE_YES);
_("Save"), GTK_RESPONSE_YES);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
@ -792,14 +795,14 @@ RESTART:
gtk_window_set_skip_taskbar_hint(GTK_WINDOW(dialog), FALSE);
gnc_gtk_dialog_add_button(dialog, _("_Open Read-Only"),
GTK_STOCK_REVERT_TO_SAVED, RESPONSE_READONLY);
"document-revert", RESPONSE_READONLY);
gnc_gtk_dialog_add_button(dialog, _("_Create New File"),
GTK_STOCK_NEW, RESPONSE_NEW);
"document-new", RESPONSE_NEW);
gnc_gtk_dialog_add_button(dialog, _("Open _Anyway"),
GTK_STOCK_OPEN, RESPONSE_OPEN);
"document-open", RESPONSE_OPEN);
if (shutdown_cb)
gtk_dialog_add_button(GTK_DIALOG(dialog),
GTK_STOCK_QUIT, RESPONSE_QUIT);
_("Quit"), RESPONSE_QUIT);
rc = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
g_free (displayname);

50
src/gnome-utils/gnc-frequency.c
View File

@ -58,7 +58,7 @@ static guint gnc_frequency_signals[LAST_SIGNAL] = { 0 };
/** Private Prototypes ********************/
static void gnc_frequency_class_init( GncFrequencyClass *klass );
static void gnc_frequency_class_destroy( GtkObject *object );
static void gnc_frequency_class_destroy( GtkWidget *widget );
static void freq_combo_changed( GtkComboBox *b, gpointer d );
static void start_date_changed( GNCDateEdit *gde, gpointer d );
@ -127,7 +127,7 @@ gnc_frequency_get_type()
(GInstanceInitFunc)gnc_frequency_init
};
gncfreq_type = g_type_register_static (GTK_TYPE_VBOX,
gncfreq_type = g_type_register_static (GTK_TYPE_BOX,
"GncFrequency",
&gncfreq_info, 0);
}
@ -140,12 +140,12 @@ static void
gnc_frequency_class_init( GncFrequencyClass *klass )
{
GObjectClass *object_class;
GtkObjectClass *gtkobject_class;
GtkWidgetClass *gtkwidget_class;
parent_class = g_type_class_peek_parent (klass);
object_class = G_OBJECT_CLASS (klass);
gtkobject_class = GTK_OBJECT_CLASS (klass);
gtkwidget_class = GTK_WIDGET_CLASS (klass);
gnc_frequency_signals[GNCFREQ_CHANGED] =
g_signal_new ("changed",
@ -158,8 +158,8 @@ gnc_frequency_class_init( GncFrequencyClass *klass )
G_TYPE_NONE,
0);
/* GtkObject signals */
gtkobject_class->destroy = gnc_frequency_class_destroy;
/* GtkWidget signals */
gtkwidget_class->destroy = gnc_frequency_class_destroy;
}
@ -167,7 +167,7 @@ void
gnc_frequency_init(GncFrequency *gf)
{
int i;
GtkVBox* vb;
GtkBox* vb;
GtkWidget* o;
GtkAdjustment* adj;
GtkBuilder *builder;
@ -201,6 +201,11 @@ gnc_frequency_init(GncFrequency *gf)
{ NULL, NULL }
};
gtk_orientable_set_orientation (GTK_ORIENTABLE(gf), GTK_ORIENTATION_VERTICAL);
// Set the style context for this widget so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gf), "GncFrequency");
builder = gtk_builder_new();
gnc_builder_add_from_file (builder , "gnc-frequency.glade", "adjustment1");
gnc_builder_add_from_file (builder , "gnc-frequency.glade", "adjustment2");
@ -225,11 +230,14 @@ gnc_frequency_init(GncFrequency *gf)
{
gint dont_expand_or_fill = 0;
GtkWidget *table = GTK_WIDGET(gtk_builder_get_object (builder, "gncfreq_table"));
gtk_table_attach(GTK_TABLE(table), GTK_WIDGET(gf->startDate),
4, 5, 0, 1, dont_expand_or_fill, 0,
0, 0);
gtk_grid_attach(GTK_GRID(table), GTK_WIDGET(gf->startDate), 4, 0, 1, 1);
gtk_widget_set_vexpand (GTK_WIDGET(gf->startDate), FALSE);
gtk_widget_set_hexpand (GTK_WIDGET(gf->startDate), FALSE);
gtk_widget_set_valign (GTK_WIDGET(gf->startDate), GTK_ALIGN_CENTER);
gtk_widget_set_halign (GTK_WIDGET(gf->startDate), GTK_ALIGN_CENTER);
g_object_set (GTK_WIDGET(gf->startDate), "margin", 0, NULL);
}
vb = GTK_VBOX(gtk_builder_get_object (builder, "gncfreq_vbox"));
vb = GTK_BOX(gtk_builder_get_object (builder, "gncfreq_vbox"));
gf->vb = vb;
gtk_container_add(GTK_CONTAINER(&gf->widget), GTK_WIDGET(gf->vb));
@ -273,23 +281,23 @@ gnc_frequency_init(GncFrequency *gf)
}
/** Destroy the GncFrequency object. This function is called (possibly
* multiple times) from the Gtk_Object level to destroy the object.
/** Destroy the GncFrequency widget. This function is called (possibly
* multiple times) from the Gtk_Object level to destroy the widget.
*
* @param object The object being destroyed.
* @param widget The widget being destroyed.
*
* @internal
*/
static void
gnc_frequency_class_destroy (GtkObject *object)
gnc_frequency_class_destroy (GtkWidget *widget)
{
GncFrequency *gf;
ENTER("frequency %p", object);
g_return_if_fail (object != NULL);
g_return_if_fail (GNC_IS_FREQUENCY (object));
ENTER("frequency %p", widget);
g_return_if_fail (widget != NULL);
g_return_if_fail (GNC_IS_FREQUENCY (widget));
gf = GNC_FREQUENCY (object);
gf = GNC_FREQUENCY (widget);
if (gf->builder)
{
@ -298,8 +306,8 @@ gnc_frequency_class_destroy (GtkObject *object)
gf->builder = NULL;
}
if (GTK_OBJECT_CLASS (parent_class)->destroy)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
if (GTK_WIDGET_CLASS (parent_class)->destroy)
GTK_WIDGET_CLASS (parent_class)->destroy (widget);
LEAVE(" ");
}

6
src/gnome-utils/gnc-frequency.h
View File

@ -42,8 +42,8 @@
**/
typedef struct _GncFrequency
{
GtkVBox widget;
GtkVBox *vb;
GtkBox widget;
GtkBox *vb;
GtkNotebook *nb;
GtkComboBox *freqComboBox;
GNCDateEdit *startDate;
@ -52,7 +52,7 @@ typedef struct _GncFrequency
typedef struct _GncFrequencyClass
{
GtkVBoxClass parent_class;
GtkBoxClass parent_class;
void (*changed) (GncFrequency *gf);
} GncFrequencyClass;

12
src/gnome-utils/gnc-general-select.c
View File

@ -37,6 +37,7 @@
#include <stdio.h>
#include "gnc-general-select.h"
#include "dialog-utils.h"
/* Signal codes */
enum
@ -51,7 +52,7 @@ static void gnc_general_select_class_init (GNCGeneralSelectClass *klass);
static void gnc_general_select_dispose (GObject *object);
static void gnc_general_select_finalize (GObject *object);
static GtkHBoxClass *parent_class;
static GtkBoxClass *parent_class;
static guint general_select_signals[LAST_SIGNAL];
@ -81,7 +82,7 @@ gnc_general_select_get_type (void)
NULL,
};
general_select_type = g_type_register_static(GTK_TYPE_HBOX,
general_select_type = g_type_register_static(GTK_TYPE_BOX,
"GNCGeneralSelect",
&general_select_info, 0);
}
@ -119,7 +120,7 @@ gnc_general_select_class_init (GNCGeneralSelectClass *klass)
object_class = (GObjectClass*) klass;
parent_class = g_type_class_ref(GTK_TYPE_HBOX);
parent_class = g_type_class_ref(GTK_TYPE_BOX);
general_select_signals[SELECTION_CHANGED] =
g_signal_new("changed",
@ -142,6 +143,11 @@ gnc_general_select_class_init (GNCGeneralSelectClass *klass)
static void
gnc_general_select_init (GNCGeneralSelect *gsl)
{
gtk_orientable_set_orientation (GTK_ORIENTABLE(gsl), GTK_ORIENTATION_HORIZONTAL);
// Set the style context for this dialog so it can be easily manipulated with css
gnc_widget_set_style_context (GTK_WIDGET(gsl), "GncGeneralSelect");
gsl->disposed = FALSE;
gsl->selected_item = NULL;
}

4
src/gnome-utils/gnc-general-select.h
View File

@ -48,7 +48,7 @@ typedef enum
typedef struct
{
GtkHBox hbox;
GtkBox hbox;
GtkWidget *entry; /* display of selection name */
GtkWidget *button; /* button for popping up selection window */
@ -64,7 +64,7 @@ typedef struct
typedef struct
{
GtkHBoxClass parent_class;
GtkBoxClass parent_class;
void (*changed) (GNCGeneralSelect *edit);
} GNCGeneralSelectClass;

21
src/gnome-utils/gnc-gnome-utils.c
View File

@ -170,18 +170,28 @@ gnc_configure_date_completion (void)
}
void
gnc_gtk_add_rc_file (void)
gnc_add_css_file (void)
{
GtkCssProvider *provider;
GdkDisplay *display;
GdkScreen *screen;
const gchar *var;
gchar *str;
GError *error = 0;
provider = gtk_css_provider_new ();
display = gdk_display_get_default ();
screen = gdk_display_get_default_screen (display);
gtk_style_context_add_provider_for_screen (screen, GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_USER);
var = g_get_home_dir ();
if (var)
{
str = g_build_filename (var, ".gtkrc-2.0.gnucash", (char *)NULL);
gtk_rc_add_default_file (str);
str = g_build_filename (var, ".gtk-3.0-gnucash.css", (char *)NULL);
gtk_css_provider_load_from_path (provider, str, &error);
g_free (str);
}
g_object_unref (provider);
}
#ifdef MAC_INTEGRATION
@ -734,7 +744,10 @@ gnc_gui_init(void)
gtk_accel_map_load(map);
g_free(map);
gnc_load_stock_icons();
/* Load css configuration file */
gnc_add_css_file ();
gnc_load_app_icons();
gnc_totd_dialog(GTK_WINDOW(main_window), TRUE);
LEAVE ("");

Some files were not shown because too many files have changed in this diff Show More