* src/gnome/new-user.glade: tweak layout, strings

* src/gnome/new-user-funs.h: add gpl header

	* src/gnome/new-user-funs.{ch}: add gpl header

	* src/gnome/new-user-callbacks.c: tweak layout, add gpl header


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3735 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2001-03-03 02:14:18 +00:00
parent 0cb882098c
commit 01a15a1658
7 changed files with 151 additions and 54 deletions

View File

@ -1,5 +1,13 @@
2001-03-02 Dave Peticolas <dave@krondo.com>
* src/gnome/new-user.glade: tweak layout, strings
* src/gnome/new-user-funs.h: add gpl header
* src/gnome/new-user-funs.{ch}: add gpl header
* src/gnome/new-user-callbacks.c: tweak layout, add gpl header
* src/gnome/gnc-dialogs.glade: add title to transfer dialog
* src/engine/gnc-pricedb.c (gnc_pricedb_destroy): fix mem leak

View File

@ -1,3 +1,25 @@
/********************************************************************\
* new-user-callbacks.c - new user functionality for GnuCash *
* Copyright (C) 2001 Gnumatic, Inc. *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
@ -109,10 +131,9 @@ on_newAccountCancelDialog_OKButton_clicked
void
on_newAccountCurrencyChoosePage_prepare
(GnomeDruidPage *gnomedruidpage,
gpointer arg1,
gpointer user_data)
on_newAccountCurrencyChoosePage_prepare (GnomeDruidPage *gnomedruidpage,
gpointer arg1,
gpointer user_data)
{
/* need to load currency info here. In fact drop a
gnc-commodity-edit widget here */
@ -130,7 +151,7 @@ on_newAccountCurrencyChoosePage_prepare
vbox = lookup_widget(GTK_WIDGET(gnomedruidpage),
"newAccountCurrencyChooser_vbox");
gtk_box_pack_end(GTK_BOX(vbox), commodityWid, 1, 1, 1);
gtk_box_pack_start(GTK_BOX(vbox), commodityWid, FALSE, FALSE, 0);
}
}

View File

@ -1,3 +1,25 @@
/********************************************************************\
* new-user-callbacks.h - new user functionality for GnuCash *
* Copyright (C) 2001 Gnumatic, Inc. *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef _NEW_USER_CALLBACKS_H_
#define _NEW_USER_CALLBACKS_H_

View File

@ -1,3 +1,25 @@
/********************************************************************\
* new-user-funs.c -- new user functionality for GnuCash *
* Copyright (C) 2001 Gnumatic, Inc. *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif

View File

@ -1,3 +1,24 @@
/********************************************************************\
* new-user-funs.h -- new user functionality for GnuCash *
* Copyright (C) 2001 Gnumatic, Inc. *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
* Boston, MA 02111-1307, USA gnu@gnu.org *
\********************************************************************/
#ifndef _NEW_USER_FUNS_H_
#define _NEW_USER_FUNS_H_

View File

@ -31,9 +31,9 @@ create_newUserDialog (void)
GdkColor newAccountCurrencyChoosePage_bg_color = { 0, 6425, 6425, 28784 };
GdkColor newAccountCurrencyChoosePage_logo_bg_color = { 0, 65535, 65535, 65535 };
GdkColor newAccountCurrencyChoosePage_title_color = { 0, 65535, 65535, 65535 };
GtkWidget *newAccountCurrencyChooser_vbox;
GtkWidget *vbox2;
GtkWidget *newAccountCurrencyChooser_vbox2;
GtkWidget *newUserChooseCurrencyDescrip;
GtkWidget *newAccountCurrencyChooser_vbox;
GtkWidget *chooseAccountTypesPage;
GdkColor chooseAccountTypesPage_bg_color = { 0, 6425, 6425, 28784 };
GdkColor chooseAccountTypesPage_logo_bg_color = { 0, 65535, 65535, 65535 };
@ -98,20 +98,13 @@ create_newUserDialog (void)
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (newAccountCurrencyChoosePage), &newAccountCurrencyChoosePage_title_color);
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (newAccountCurrencyChoosePage), _("Choose Currency"));
newAccountCurrencyChooser_vbox = GNOME_DRUID_PAGE_STANDARD (newAccountCurrencyChoosePage)->vbox;
gtk_widget_set_name (newAccountCurrencyChooser_vbox, "newAccountCurrencyChooser_vbox");
gtk_widget_ref (newAccountCurrencyChooser_vbox);
gtk_object_set_data_full (GTK_OBJECT (newUserDialog), "newAccountCurrencyChooser_vbox", newAccountCurrencyChooser_vbox,
newAccountCurrencyChooser_vbox2 = GNOME_DRUID_PAGE_STANDARD (newAccountCurrencyChoosePage)->vbox;
gtk_widget_set_name (newAccountCurrencyChooser_vbox2, "newAccountCurrencyChooser_vbox2");
gtk_widget_ref (newAccountCurrencyChooser_vbox2);
gtk_object_set_data_full (GTK_OBJECT (newUserDialog), "newAccountCurrencyChooser_vbox2", newAccountCurrencyChooser_vbox2,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountCurrencyChooser_vbox);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_widget_set_name (vbox2, "vbox2");
gtk_widget_ref (vbox2);
gtk_object_set_data_full (GTK_OBJECT (newUserDialog), "vbox2", vbox2,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (newAccountCurrencyChooser_vbox), vbox2, TRUE, TRUE, 0);
gtk_widget_show (newAccountCurrencyChooser_vbox2);
gtk_container_set_border_width (GTK_CONTAINER (newAccountCurrencyChooser_vbox2), 5);
newUserChooseCurrencyDescrip = gtk_label_new (_("Please choose the currency to use for new accounts."));
gtk_widget_set_name (newUserChooseCurrencyDescrip, "newUserChooseCurrencyDescrip");
@ -119,8 +112,15 @@ create_newUserDialog (void)
gtk_object_set_data_full (GTK_OBJECT (newUserDialog), "newUserChooseCurrencyDescrip", newUserChooseCurrencyDescrip,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newUserChooseCurrencyDescrip);
gtk_box_pack_start (GTK_BOX (vbox2), newUserChooseCurrencyDescrip, FALSE, FALSE, 0);
gtk_widget_set_sensitive (newUserChooseCurrencyDescrip, FALSE);
gtk_box_pack_start (GTK_BOX (newAccountCurrencyChooser_vbox2), newUserChooseCurrencyDescrip, FALSE, FALSE, 0);
newAccountCurrencyChooser_vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_set_name (newAccountCurrencyChooser_vbox, "newAccountCurrencyChooser_vbox");
gtk_widget_ref (newAccountCurrencyChooser_vbox);
gtk_object_set_data_full (GTK_OBJECT (newUserDialog), "newAccountCurrencyChooser_vbox", newAccountCurrencyChooser_vbox,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (newAccountCurrencyChooser_vbox);
gtk_box_pack_start (GTK_BOX (newAccountCurrencyChooser_vbox2), newAccountCurrencyChooser_vbox, FALSE, FALSE, 0);
chooseAccountTypesPage = gnome_druid_page_standard_new_with_vals ("", NULL);
gtk_widget_set_name (chooseAccountTypesPage, "chooseAccountTypesPage");
@ -140,6 +140,7 @@ create_newUserDialog (void)
gtk_object_set_data_full (GTK_OBJECT (newUserDialog), "druid_vbox1", druid_vbox1,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (druid_vbox1);
gtk_container_set_border_width (GTK_CONTAINER (druid_vbox1), 5);
pickAccountsDescriptionLabel = gtk_label_new (_("Please choose the account types you would like to have automatically setup in GnuCash."));
gtk_widget_set_name (pickAccountsDescriptionLabel, "pickAccountsDescriptionLabel");
@ -380,7 +381,7 @@ create_addAccountCancelDialog (void)
GtkWidget *dialog_action_area1;
GtkWidget *newAccountCancelDialog_OKButton;
addAccountCancelDialog = gnome_dialog_new (NULL, NULL);
addAccountCancelDialog = gnome_dialog_new (_("Cancelling"), NULL);
gtk_widget_set_name (addAccountCancelDialog, "addAccountCancelDialog");
gtk_object_set_data (GTK_OBJECT (addAccountCancelDialog), "addAccountCancelDialog", addAccountCancelDialog);
GTK_WINDOW (addAccountCancelDialog)->type = GTK_WINDOW_DIALOG;
@ -393,7 +394,7 @@ create_addAccountCancelDialog (void)
gtk_object_set_data (GTK_OBJECT (addAccountCancelDialog), "newAccountCancelDialog", newAccountCancelDialog);
gtk_widget_show (newAccountCancelDialog);
vbox1 = gtk_vbox_new (FALSE, 0);
vbox1 = gtk_vbox_new (FALSE, 5);
gtk_widget_set_name (vbox1, "vbox1");
gtk_widget_ref (vbox1);
gtk_object_set_data_full (GTK_OBJECT (addAccountCancelDialog), "vbox1", vbox1,
@ -401,7 +402,7 @@ create_addAccountCancelDialog (void)
gtk_widget_show (vbox1);
gtk_box_pack_start (GTK_BOX (newAccountCancelDialog), vbox1, TRUE, TRUE, 0);
newAccountCancelDialog_ShouldRunAgainLable = gtk_label_new (_("Canceling. Please uncheck if you would not like this new user dialog to run again."));
newAccountCancelDialog_ShouldRunAgainLable = gtk_label_new (_("Uncheck if you do not want this new user dialog to run again."));
gtk_widget_set_name (newAccountCancelDialog_ShouldRunAgainLable, "newAccountCancelDialog_ShouldRunAgainLable");
gtk_widget_ref (newAccountCancelDialog_ShouldRunAgainLable);
gtk_object_set_data_full (GTK_OBJECT (addAccountCancelDialog), "newAccountCancelDialog_ShouldRunAgainLable", newAccountCancelDialog_ShouldRunAgainLable,
@ -411,7 +412,7 @@ create_addAccountCancelDialog (void)
gtk_label_set_justify (GTK_LABEL (newAccountCancelDialog_ShouldRunAgainLable), GTK_JUSTIFY_FILL);
gtk_label_set_line_wrap (GTK_LABEL (newAccountCancelDialog_ShouldRunAgainLable), TRUE);
newAccountCancelDialog_RunAgainToggle = gtk_check_button_new_with_label (_("Run New User Dialog again?"));
newAccountCancelDialog_RunAgainToggle = gtk_check_button_new_with_label (_("Run New User Account Setup again?"));
gtk_widget_set_name (newAccountCancelDialog_RunAgainToggle, "newAccountCancelDialog_RunAgainToggle");
gtk_widget_ref (newAccountCancelDialog_RunAgainToggle);
gtk_object_set_data_full (GTK_OBJECT (addAccountCancelDialog), "newAccountCancelDialog_RunAgainToggle", newAccountCancelDialog_RunAgainToggle,
@ -427,7 +428,7 @@ create_addAccountCancelDialog (void)
gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8);
gnome_dialog_append_button (GNOME_DIALOG (addAccountCancelDialog), GNOME_STOCK_BUTTON_OK);
newAccountCancelDialog_OKButton = g_list_last (GNOME_DIALOG (addAccountCancelDialog)->buttons)->data;
newAccountCancelDialog_OKButton = GTK_WIDGET (g_list_last (GNOME_DIALOG (addAccountCancelDialog)->buttons)->data);
gtk_widget_set_name (newAccountCancelDialog_OKButton, "newAccountCancelDialog_OKButton");
gtk_widget_ref (newAccountCancelDialog_OKButton);
gtk_object_set_data_full (GTK_OBJECT (addAccountCancelDialog), "newAccountCancelDialog_OKButton", newAccountCancelDialog_OKButton,

View File

@ -77,44 +77,44 @@
<widget>
<class>GtkVBox</class>
<child_name>GnomeDruidPageStandard:vbox</child_name>
<name>newAccountCurrencyChooser_vbox</name>
<name>newAccountCurrencyChooser_vbox2</name>
<border_width>5</border_width>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>newUserChooseCurrencyDescrip</name>
<label>Please choose the currency to use for new accounts.</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkVBox</class>
<name>vbox2</name>
<name>newAccountCurrencyChooser_vbox</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkLabel</class>
<name>newUserChooseCurrencyDescrip</name>
<sensitive>False</sensitive>
<label>Please choose the currency to use for new accounts.</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>Placeholder</class>
</widget>
@ -144,8 +144,9 @@
<class>GtkVBox</class>
<child_name>GnomeDruidPageStandard:vbox</child_name>
<name>druid-vbox1</name>
<border_width>5</border_width>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
@ -428,6 +429,7 @@ Press `Finish' if this is OK.</text>
<widget>
<class>GnomeDialog</class>
<name>addAccountCancelDialog</name>
<title>Cancelling</title>
<type>GTK_WINDOW_DIALOG</type>
<position>GTK_WIN_POS_MOUSE</position>
<modal>True</modal>
@ -484,7 +486,7 @@ Press `Finish' if this is OK.</text>
<class>GtkVBox</class>
<name>vbox1</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<spacing>5</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
@ -494,7 +496,7 @@ Press `Finish' if this is OK.</text>
<widget>
<class>GtkLabel</class>
<name>newAccountCancelDialog_ShouldRunAgainLable</name>
<label>Canceling. Please uncheck if you would not like this new user dialog to run again.</label>
<label>Uncheck if you do not want this new user dialog to run again.</label>
<justify>GTK_JUSTIFY_FILL</justify>
<wrap>True</wrap>
<xalign>0.5</xalign>
@ -517,7 +519,7 @@ Press `Finish' if this is OK.</text>
<handler>on_newAccountRunAgain_toggled</handler>
<last_modification_time>Wed, 10 Jan 2001 03:44:02 GMT</last_modification_time>
</signal>
<label>Run New User Dialog again?</label>
<label>Run New User Account Setup again?</label>
<active>True</active>
<draw_indicator>True</draw_indicator>
<child>