[Gnucash-changes] r13034 - gnucash/trunk - HIG changes for the
"radio option" query dialog.
David Hampton
hampton at cvs.gnucash.org
Sun Jan 29 14:23:27 EST 2006
Author: hampton
Date: 2006-01-29 14:23:25 -0500 (Sun, 29 Jan 2006)
New Revision: 13034
Trac: http://svn.gnucash.org/trac/changeset/13034
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/gnc-ui.h
gnucash/trunk/src/gnome-utils/gnc-gui-query.c
gnucash/trunk/src/gnome-utils/gw-gnome-utils-spec.scm
gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c
gnucash/trunk/src/register/ledger-core/split-register-control.c
gnucash/trunk/src/register/ledger-core/split-register.c
gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
Log:
HIG changes for the "radio option" query dialog.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/ChangeLog 2006-01-29 19:23:25 UTC (rev 13034)
@@ -1,5 +1,16 @@
2006-01-29 David Hampton <hampton at employees.org>
+ * src/register/ledger-core/split-register.c:
+ * src/register/ledger-core/split-register-control.c:
+ * src/import-export/hbci/druid-hbci-initial.c:
+ * src/report/report-gnome/gnc-plugin-page-report.c:
+ * src/gnome-utils/gw-gnome-utils-spec.scm:
+ * src/gnome-utils/gnc-gui-query.c:
+ * src/gnc-ui.h: HIG changes for the "radio option" query dialog.
+
+ * src/engine/gnc-engine.c: Restore reasonable default logging
+ levels.
+
* README: Michael Wahlbrink's cvs to svn changes.
* src/import-export/qif-import/dialog-account-picker.c:
Modified: gnucash/trunk/src/gnc-ui.h
===================================================================
--- gnucash/trunk/src/gnc-ui.h 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/gnc-ui.h 2006-01-29 19:23:25 UTC (rev 13034)
@@ -92,6 +92,7 @@
int gnc_choose_radio_option_dialog (gncUIWidget parent,
const char *title,
const char *msg,
+ const char *button_name,
int default_value,
GList *radio_list);
Modified: gnucash/trunk/src/gnome-utils/gnc-gui-query.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/gnome-utils/gnc-gui-query.c 2006-01-29 19:23:25 UTC (rev 13034)
@@ -272,6 +272,7 @@
gnc_choose_radio_option_dialog(gncUIWidget parent,
const char *title,
const char *msg,
+ const char *button_name,
int default_value,
GList *radio_list)
{
@@ -279,7 +280,7 @@
GtkWidget *vbox;
GtkWidget *main_vbox;
GtkWidget *label;
- GtkWidget *frame;
+ GtkWidget *alignment;
GtkWidget *radio_button;
GtkWidget *dialog;
GtkWidget *dvbox;
@@ -288,7 +289,7 @@
int i;
main_vbox = gtk_vbox_new(FALSE, 3);
- gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 5);
+ gtk_container_set_border_width(GTK_CONTAINER(main_vbox), 6);
gtk_widget_show(main_vbox);
label = gtk_label_new(msg);
@@ -296,19 +297,19 @@
gtk_box_pack_start(GTK_BOX(main_vbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
- frame = gtk_frame_new(NULL);
- gtk_container_set_border_width(GTK_CONTAINER(frame), 5);
- gtk_box_pack_start(GTK_BOX(main_vbox), frame, FALSE, FALSE, 0);
- gtk_widget_show(frame);
+ alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT(alignment), 0, 0, 12, 0);
+ gtk_box_pack_start(GTK_BOX(main_vbox), alignment, FALSE, FALSE, 0);
+ gtk_widget_show(alignment);
vbox = gtk_vbox_new(TRUE, 3);
- gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
- gtk_container_add(GTK_CONTAINER(frame), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
+ gtk_container_add(GTK_CONTAINER(alignment), vbox);
gtk_widget_show(vbox);
for (node = radio_list, i = 0; node; node = node->next, i++)
{
- radio_button = gtk_radio_button_new_with_label(group, node->data);
+ radio_button = gtk_radio_button_new_with_mnemonic(group, node->data);
group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio_button));
if (i == default_value) /* default is first radio button */
@@ -325,11 +326,14 @@
&radio_result);
}
+ if (!button_name)
+ button_name = GTK_STOCK_OK;
dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW(parent),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ button_name, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator (GTK_DIALOG(dialog), FALSE);
/* default to ok */
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
Modified: gnucash/trunk/src/gnome-utils/gw-gnome-utils-spec.scm
===================================================================
--- gnucash/trunk/src/gnome-utils/gw-gnome-utils-spec.scm 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/gnome-utils/gw-gnome-utils-spec.scm 2006-01-29 19:23:25 UTC (rev 13034)
@@ -238,6 +238,7 @@
'((<gnc:UIWidget> parent)
((<gw:mchars> caller-owned const) title)
((<gw:mchars> caller-owned const) msg)
+ ((<gw:mchars> caller-owned const) button-name)
(<gw:int> default-choice)
((gw:glist-of (<gw:mchars> callee-owned) callee-owned) choices))
"Show a dialog offering different mutually exclusive choices
Modified: gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/import-export/hbci/druid-hbci-initial.c 2006-01-29 19:23:25 UTC (rev 13034)
@@ -505,6 +505,7 @@
(GTK_WIDGET(info->window),
_("Choose AqBanking Backend"),
_("Please choose an AqBanking backend to be configured"),
+ _("Co_nfigure"),
0,
radio_list);
g_list_free(radio_list);
Modified: gnucash/trunk/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-control.c 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/register/ledger-core/split-register-control.c 2006-01-29 19:23:25 UTC (rev 13034)
@@ -29,6 +29,7 @@
#include "Scrub.h"
#include "combocell.h"
#include "gnc-component-manager.h"
+#include "gnc-gconf-utils.h"
#include "gnc-ui.h"
#include "pricecell.h"
#include "datecell.h"
@@ -101,20 +102,20 @@
two_accounts = FALSE;
radio_list = g_list_append (radio_list,
- _("Balance it manually"));
+ _("Balance it _manually"));
radio_list = g_list_append (radio_list,
- _("Let GnuCash add an adjusting split"));
+ _("Let GnuCash _add an adjusting split"));
if (reg->type < NUM_SINGLE_REGISTER_TYPES)
{
radio_list = g_list_append (radio_list,
- _("Adjust current account split total"));
+ _("Adjust current account _split total"));
default_value = 2;
if (two_accounts)
{
radio_list = g_list_append (radio_list,
- _("Adjust other account split total"));
+ _("Adjust _other account split total"));
default_value = 3;
}
}
@@ -125,6 +126,7 @@
(gnc_split_register_get_parent (reg),
title,
message,
+ _("_Rebalance"),
default_value,
radio_list);
Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/register/ledger-core/split-register.c 2006-01-29 19:23:25 UTC (rev 13034)
@@ -1735,23 +1735,23 @@
if (shares_changed)
radio_list = g_list_append (radio_list,
g_strdup_printf ("%s (%s)",
- _("Shares"), _("Changed")));
+ _("_Shares"), _("Changed")));
else
- radio_list = g_list_append (radio_list, g_strdup (_("Shares")));
+ radio_list = g_list_append (radio_list, g_strdup (_("_Shares")));
if (price_changed)
radio_list = g_list_append (radio_list,
g_strdup_printf ("%s (%s)",
- _("Price"), _("Changed")));
+ _("_Price"), _("Changed")));
else
- radio_list = g_list_append (radio_list, g_strdup (_("Price")));
+ radio_list = g_list_append (radio_list, g_strdup (_("_Price")));
if (amount_changed)
radio_list = g_list_append (radio_list,
g_strdup_printf ("%s (%s)",
- _("Value"), _("Changed")));
+ _("_Value"), _("Changed")));
else
- radio_list = g_list_append (radio_list, g_strdup (_("Value")));
+ radio_list = g_list_append (radio_list, g_strdup (_("_Value")));
if (price_changed) default_value = 2; /* change the value */
else default_value = 1; /* change the value */
@@ -1760,6 +1760,7 @@
(gnc_split_register_get_parent (reg),
title,
message,
+ _("_Recalculate"),
default_value,
radio_list);
Modified: gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c
===================================================================
--- gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2006-01-29 19:21:25 UTC (rev 13033)
+++ gnucash/trunk/src/report/report-gnome/gnc-plugin-page-report.c 2006-01-29 19:23:25 UTC (rev 13034)
@@ -1132,7 +1132,8 @@
choice = gnc_choose_radio_option_dialog
(NULL, _("Choose export format"),
- _("Choose the export format for this report:"), 0, choices);
+ _("Choose the export format for this report:"),
+ NULL, 0, choices);
}
else
choice = -1;
More information about the gnucash-changes
mailing list