[grisbi-cvs] grisbi/src accueil.c, 1.207, 1.208 affichage.c, 1.163, 1.164 gsb_archive_config.c, 1.24, 1.25 gsb_assistant_archive.c, 1.35, 1.36 gsb_currency_link_config.c, 1.12, 1.13 gsb_file_config.c, 1.80, 1.81 gsb_form_config.c, 1.31, 1.32 gsb_payment_method_config.c, 1.36, 1.37 gsb_reconcile_config.c, 1.29, 1.30 help.c, 1.86, 1.87 import.c, 1.282, 1.283 parametres.c, 1.201, 1.202 parametres.h, 1.30, 1.31 structures.h, 1.230, 1.231 transaction_list.c, 1.48, 1.49
Pierre Biava
pbiava at users.sourceforge.net
Sun Aug 23 18:45:07 CEST 2009
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.47, 1.48 da.po, 1.54, 1.55 de.po, 1.110, 1.111 el.po, 1.18, 1.19 eo.po, 1.11, 1.12 es.po, 1.100, 1.101 fa.po, 1.41, 1.42 fr.po, 1.173, 1.174 grisbi.pot, 1.89, 1.90 he.po, 1.47, 1.48 it.po, 1.47, 1.48 nl.po, 1.46, 1.47 pl.po, 1.52, 1.53 pt_BR.po, 1.49, 1.50 ro.po, 1.47, 1.48 ru.po, 1.46, 1.47 zh_CN.po, 1.41, 1.42
- Next message: [grisbi-cvs] grisbi/win32-msvc - New directory
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13884/src
Modified Files:
accueil.c affichage.c gsb_archive_config.c
gsb_assistant_archive.c gsb_currency_link_config.c
gsb_file_config.c gsb_form_config.c
gsb_payment_method_config.c gsb_reconcile_config.c help.c
import.c parametres.c parametres.h structures.h
transaction_list.c
Log Message:
Changes in labels and size of others widgets to decrease the size of the tabs in preferences
Index: structures.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/structures.h,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- structures.h 22 Jul 2009 19:45:43 -0000 1.230
+++ structures.h 23 Aug 2009 16:45:05 -0000 1.231
@@ -29,7 +29,6 @@
#define CSV_MAX_TOP_LINES 10 /** How many lines to show in CSV preview. */
-
/* variables contenant juste 0 ou 1 */
/* FIXME : scinder cette structure en 3 parties : */
/* la partie configurée par le fichier */
Index: gsb_currency_link_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_currency_link_config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gsb_currency_link_config.c 10 May 2009 13:06:56 -0000 1.12
+++ gsb_currency_link_config.c 23 Aug 2009 16:45:05 -0000 1.13
@@ -85,6 +85,7 @@
GtkTreeModel *tree_model;
GtkWidget *entry;
GtkWidget *combobox;
+ gint width_entry = 170;
vbox_pref = new_vbox_with_title_and_icon ( _("Links between currencies"), "currencies.png" );
paddingbox = new_paddingbox_with_title (vbox_pref, TRUE, _("Known links"));
@@ -95,7 +96,7 @@
/* links list */
scrolled_window = gtk_scrolled_window_new ( NULL, NULL );
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scrolled_window ),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
/* Create it. */
tree_view = GTK_TREE_VIEW ( gsb_currency_link_config_create_list () );
@@ -137,17 +138,13 @@
paddingbox = new_paddingbox_with_title (vbox_pref, FALSE, _("Link properties"));
/* Create hbox line */
- hbox = gtk_hbox_new ( FALSE,
- 5 );
+ hbox = gtk_hbox_new ( FALSE, 5 );
gtk_box_pack_start ( GTK_BOX ( paddingbox ),
hbox,
TRUE, TRUE, 0 );
- gtk_widget_set_sensitive ( hbox,
- FALSE );
- g_object_set_data ( G_OBJECT (tree_model),
- "hbox_line",
- hbox );
+ gtk_widget_set_sensitive ( hbox, FALSE );
+ g_object_set_data ( G_OBJECT (tree_model), "hbox_line", hbox );
/* Create first currency link entry */
label = gtk_label_new (_("1 "));
@@ -155,8 +152,8 @@
label,
FALSE, FALSE, 0 );
combobox = gsb_currency_make_combobox (TRUE);
- g_object_set_data ( G_OBJECT (tree_model),
- "combobox_1", combobox );
+ gtk_widget_set_size_request ( combobox, width_entry, -1 );
+ g_object_set_data ( G_OBJECT (tree_model), "combobox_1", combobox );
g_signal_connect_swapped ( G_OBJECT (combobox),
"changed",
G_CALLBACK (gsb_currency_link_config_modify_link),
@@ -171,6 +168,7 @@
label,
FALSE, FALSE, 0 );
entry = gtk_entry_new ();
+ gtk_widget_set_size_request ( entry, width_entry/2, -1 );
g_object_set_data ( G_OBJECT (tree_model),
"exchange_entry", entry );
g_signal_connect_swapped ( G_OBJECT (entry),
@@ -183,8 +181,8 @@
/* Create second currency link entry */
combobox = gsb_currency_make_combobox (TRUE);
- g_object_set_data ( G_OBJECT (tree_model),
- "combobox_2", combobox );
+ gtk_widget_set_size_request ( combobox, width_entry, -1 );
+ g_object_set_data ( G_OBJECT (tree_model), "combobox_2", combobox );
g_signal_connect_swapped ( G_OBJECT (combobox),
"changed",
G_CALLBACK (gsb_currency_link_config_modify_link),
@@ -195,8 +193,7 @@
/* Create warning label */
label = gtk_label_new (NULL);
- g_object_set_data ( G_OBJECT (tree_model),
- "warning_label", label );
+ g_object_set_data ( G_OBJECT (tree_model), "warning_label", label );
gtk_box_pack_start ( GTK_BOX ( paddingbox ),
label,
FALSE, FALSE, 0 );
@@ -205,7 +202,6 @@
}
-
/**
* create the tree wich contains the currency list
* used both for the currency known list, and the currency to add list
@@ -262,7 +258,7 @@
for (i=0 ; i< LINK_NUMBER_COLUMN; i++ )
{
- GtkTreeViewColumn *column;
+ GtkTreeViewColumn *column = NULL;
if ( i == LINK_INVALID_COLUMN )
{
@@ -270,6 +266,7 @@
gtk_cell_renderer_pixbuf_new (),
"stock-id", i,
NULL );
+ ;
}
else
{
Index: help.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/help.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- help.c 27 Apr 2009 19:41:03 -0000 1.86
+++ help.c 23 Aug 2009 16:45:05 -0000 1.87
@@ -77,7 +77,7 @@
"Benjamin Drieu (bdrieu[at]april.org)",
"Cedric Auger (cedric[at]grisbi.org)",
"Francois Terrot (grisbi[at]terrot.net)",
-"Pierre Biava ([at]nerim.net)",
+"Pierre Biava (pierre.biava[at]nerim.net)",
"",
_("Packaging"),
Index: gsb_assistant_archive.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_assistant_archive.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gsb_assistant_archive.c 22 Aug 2009 15:34:51 -0000 1.35
+++ gsb_assistant_archive.c 23 Aug 2009 16:45:05 -0000 1.36
@@ -758,13 +758,14 @@
transaction_number = gsb_data_transaction_get_transaction_number (tmp_list -> data);
gsb_data_transaction_set_archive_number ( transaction_number, archive_number );
- /* On supprime l'opération dans le tree_view */
+
+ /* Delete transaction in the tree_view */
if ( gsb_data_transaction_get_mother_transaction_number ( transaction_number ) == 0 )
gsb_transactions_list_delete_transaction_from_tree_view ( transaction_number );
tmp_list = tmp_list -> next;
}
- /* on recrée la liste des archives par compte */
+ /* create again the list of archives by account */
gsb_data_archive_store_init_variables ();
gsb_data_archive_store_create_list ( );
gsb_transactions_list_fill_archive_store ( );
@@ -803,7 +804,7 @@
if ( etat.modification_fichier == 0 )
modification_fichier ( TRUE );
- /* On met à jour l'affichage de la liste si nécessaire */
+ /* update the display of tree_view if necessary */
if ( ( account_nb = gsb_gui_navigation_get_current_account ( ) ) != -1 )
gsb_transactions_list_update_tree_view ( account_nb, TRUE );
Index: gsb_reconcile_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_reconcile_config.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gsb_reconcile_config.c 10 May 2009 13:06:56 -0000 1.29
+++ gsb_reconcile_config.c 23 Aug 2009 16:45:05 -0000 1.30
@@ -98,6 +98,7 @@
};
GtkWidget *table_selection;
GtkWidget *button;
+ gint width_entry = 80;
vbox_pref = new_vbox_with_title_and_icon ( _("Reconciliation"),
"reconciliationlg.png" );
@@ -185,6 +186,7 @@
reconcile_name_entry = gsb_autofunc_entry_new ( NULL,
G_CALLBACK (gsb_reconcile_config_update_line), reconcile_treeview,
G_CALLBACK (gsb_data_reconcile_set_name), 0 );
+ gtk_widget_set_size_request ( reconcile_name_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table_selection ), reconcile_name_entry, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, 0, 10, 0 );
@@ -198,6 +200,7 @@
reconcile_init_date_entry = gsb_autofunc_date_new ( NULL,
G_CALLBACK (gsb_reconcile_config_update_line), reconcile_treeview,
G_CALLBACK (gsb_data_reconcile_set_init_date), 0 );
+ gtk_widget_set_size_request ( reconcile_init_date_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table_selection ), reconcile_init_date_entry, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0, 10, 0 );
@@ -211,6 +214,7 @@
reconcile_final_date_entry = gsb_autofunc_date_new ( NULL,
G_CALLBACK (gsb_reconcile_config_update_line), reconcile_treeview,
G_CALLBACK (gsb_data_reconcile_set_final_date), 0 );
+ gtk_widget_set_size_request ( reconcile_final_date_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table_selection ), reconcile_final_date_entry, 1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, 0, 10, 0 );
@@ -221,7 +225,7 @@
g_signal_connect ( G_OBJECT (delete_reconcile_button), "clicked",
G_CALLBACK (gsb_reconcile_config_delete),
reconcile_treeview );
- gtk_table_attach ( GTK_TABLE ( table_selection ), delete_reconcile_button, 3, 4, 0, 1,
+ gtk_table_attach ( GTK_TABLE ( table_selection ), delete_reconcile_button, 2, 4, 0, 1,
GTK_EXPAND | GTK_FILL, 0, 0, 0 );
/* set the initial balance */
@@ -234,6 +238,7 @@
reconcile_init_balance_entry = gsb_autofunc_real_new ( null_real,
G_CALLBACK (gsb_reconcile_config_update_line), reconcile_treeview,
G_CALLBACK (gsb_data_reconcile_set_init_balance), 0 );
+ gtk_widget_set_size_request ( reconcile_init_balance_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table_selection ), reconcile_init_balance_entry, 3, 4, 1, 2,
GTK_EXPAND | GTK_FILL, 0, 0, 0 );
@@ -247,6 +252,7 @@
reconcile_final_balance_entry = gsb_autofunc_real_new ( null_real,
G_CALLBACK (gsb_reconcile_config_update_line), reconcile_treeview,
G_CALLBACK (gsb_data_reconcile_set_final_balance), 0 );
+ gtk_widget_set_size_request ( reconcile_final_balance_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table_selection ), reconcile_final_balance_entry, 3, 4, 2, 3,
GTK_EXPAND | GTK_FILL, 0, 0, 0 );
@@ -254,7 +260,8 @@
gtk_widget_set_sensitive ( table_selection, FALSE );
/* set the button to find non-associated transactions */
- button = gtk_button_new_with_label ( _("Find all marked transactions not associated with a reconcile number"));
+ button = gtk_button_new_with_label (
+ _("Find all marked transactions not associated with a reconcile number"));
gtk_button_set_relief ( GTK_BUTTON (button),
GTK_RELIEF_NONE );
g_signal_connect ( G_OBJECT (button), "clicked",
Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- parametres.c 16 Aug 2009 21:00:05 -0000 1.201
+++ parametres.c 23 Aug 2009 16:45:05 -0000 1.202
@@ -89,7 +89,7 @@
static GtkTreeStore *preference_tree_model = NULL;
static GtkNotebook * preference_frame = NULL;
-
+static gint width_spin_button = 50;
/*START_EXTERN*/
@@ -235,7 +235,7 @@
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL );
- gtk_window_set_default_size ( GTK_WINDOW ( fenetre_preferences ), -1, 500 );
+ gtk_window_set_default_size ( GTK_WINDOW ( fenetre_preferences ), 600, -1 );
gtk_window_set_position ( GTK_WINDOW ( fenetre_preferences ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_resizable ( GTK_WINDOW ( fenetre_preferences ), TRUE );
@@ -376,7 +376,6 @@
1, TOTALS_PAGE,
2, 400,
-1);
- //~ gtk_notebook_append_page (preference_frame, gsb_currency_config_create_totals_page(), NULL);
gtk_notebook_append_page ( preference_frame, onglet_metatree (), NULL );
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
@@ -715,6 +714,7 @@
button = gsb_automem_spin_button_new ( &(nb_max_derniers_fichiers_ouverts),
G_CALLBACK ( affiche_derniers_fichiers_ouverts ), NULL );
+ gtk_widget_set_size_request ( button, width_spin_button, -1 );
gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
/* Backups */
@@ -746,6 +746,7 @@
button = gsb_automem_spin_button_new ( &etat.make_backup_nb_minutes,
G_CALLBACK (gsb_file_automatic_backup_change_time), NULL );
+ gtk_widget_set_size_request ( button, width_spin_button, -1 );
gtk_box_pack_start ( GTK_BOX (hbox), button, FALSE, FALSE, 0 );
label = gtk_label_new (_(" minutes"));
@@ -861,7 +862,7 @@
gtk_table_attach ( GTK_TABLE(table), entry, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL, 0, 0, 0 );
text = g_strconcat ( "<span foreground=\"blue\">",
- _("You may use %s to expand the URL - I.e: 'firefox -remote %s' "),
+ _("You may use %s to expand the URL I.e:\n'firefox -remote %s'"),
"</span>", NULL );
label = gtk_label_new ( text );
gtk_label_set_use_markup ( GTK_LABEL(label), TRUE );
@@ -941,6 +942,8 @@
gtk_box_pack_start ( GTK_BOX (hbox), label, FALSE, FALSE, 0 );
entry = gsb_automem_spin_button_new ( &nb_days_before_scheduled, NULL, NULL );
+ gtk_widget_set_size_request ( entry, width_spin_button, -1 );
+
gtk_box_pack_start ( GTK_BOX (hbox), entry, FALSE, FALSE, 0 );
/* Take into account the planned operations in the calculation of balances */
Index: gsb_payment_method_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_payment_method_config.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gsb_payment_method_config.c 10 May 2009 13:06:56 -0000 1.36
+++ gsb_payment_method_config.c 23 Aug 2009 16:45:05 -0000 1.37
@@ -112,6 +112,7 @@
GtkCellRenderer *cell;
GtkWidget *bouton_ajouter_type;
GtkTreeStore *payment_method_model;
+ gint width_entry = 80;
/* Now we have a model, create view */
vbox_pref = new_vbox_with_title_and_icon ( _("Payment methods"),
@@ -244,8 +245,10 @@
GTK_SHRINK | GTK_FILL, 0,
0, 0 );
payment_name_entry = gsb_autofunc_entry_new ( NULL,
- G_CALLBACK (gsb_payment_method_config_name_changed), payment_method_treeview,
- G_CALLBACK (gsb_data_payment_set_name), 0 );
+ G_CALLBACK (gsb_payment_method_config_name_changed),
+ payment_method_treeview,
+ G_CALLBACK (gsb_data_payment_set_name), 0 );
+ gtk_widget_set_size_request ( payment_name_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table ),
payment_name_entry, 1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, 0,
@@ -273,6 +276,7 @@
payment_last_number_entry = gsb_autofunc_spin_new ( 0,
G_CALLBACK (gsb_payment_method_config_auto_entry_changed), payment_method_treeview,
G_CALLBACK (gsb_data_payment_set_last_number), 0 );
+ gtk_widget_set_size_request ( payment_last_number_entry, width_entry, -1 );
gtk_table_attach ( GTK_TABLE ( table ),
payment_last_number_entry, 1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
Index: parametres.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- parametres.h 22 Jul 2009 19:45:43 -0000 1.30
+++ parametres.h 23 Aug 2009 16:45:05 -0000 1.31
@@ -29,6 +29,7 @@
METHODS_OF_PAYMENT_PAGE,
NUM_PREFERENCES_PAGES
};
+
/* START_INCLUDE_H */
/* END_INCLUDE_H */
Index: gsb_form_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_form_config.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gsb_form_config.c 10 May 2009 13:06:56 -0000 1.31
+++ gsb_form_config.c 23 Aug 2009 16:45:05 -0000 1.32
@@ -142,103 +142,69 @@
* */
void gsb_form_config_make_configuration_box ( GtkWidget *vbox_parent )
{
+ GtkWidget *sw;
GtkWidget *hbox;
GtkWidget *button;
GtkWidget *paddingbox;
GtkWidget *label;
/* create the paddingbox into the parent */
- paddingbox = new_paddingbox_with_title ( vbox_parent,
- TRUE,
- _("Form structure preview"));
+ paddingbox = new_paddingbox_with_title ( vbox_parent, TRUE, _("Form structure preview"));
/* we can organize the form
* either the same for all the accounts
* either each account has its own configuration */
- hbox = gtk_hbox_new ( FALSE,
- 5 );
- gtk_box_pack_start ( GTK_BOX (paddingbox),
- hbox,
- FALSE,
- FALSE,
- 0 );
+ hbox = gtk_hbox_new ( FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX (paddingbox), hbox, FALSE, FALSE, 0 );
/* the button to choose the configuration for all/one account */
button = gsb_automem_checkbutton_new ( _("Each account has his own form"),
- &etat.formulaire_distinct_par_compte,
- G_CALLBACK ( gsb_form_config_switch_general_to_several_form ), NULL);
- gtk_box_pack_start ( GTK_BOX (hbox ),
- button,
- FALSE,
- FALSE,
- 0 );
+ &etat.formulaire_distinct_par_compte,
+ G_CALLBACK ( gsb_form_config_switch_general_to_several_form ),
+ NULL);
+ gtk_box_pack_start ( GTK_BOX (hbox ), button, FALSE, FALSE, 0 );
/* the accounts option_menu */
accounts_combobox = gsb_account_create_combo_list ((GtkSignalFunc) gsb_form_config_change_account_choice, NULL, FALSE );
- gtk_widget_set_sensitive ( accounts_combobox,
- etat.formulaire_distinct_par_compte );
- gtk_box_pack_start ( GTK_BOX (hbox ),
- accounts_combobox,
- FALSE,
- FALSE,
- 0 );
+ gtk_widget_set_sensitive ( accounts_combobox, etat.formulaire_distinct_par_compte );
+ gtk_box_pack_start ( GTK_BOX (hbox ), accounts_combobox, FALSE, FALSE, 0 );
/* add the update-form button */
- hbox = gtk_hbox_new ( FALSE,
- 5 );
- gtk_box_pack_start ( GTK_BOX (paddingbox),
- hbox,
- FALSE,
- FALSE,
- 0 );
+ hbox = gtk_hbox_new ( FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX (paddingbox), hbox, FALSE, FALSE, 0 );
update_button = gtk_button_new_with_label (_("Update"));
- gtk_widget_set_sensitive ( update_button,
- etat.formulaire_distinct_par_compte );
+ gtk_widget_set_sensitive ( update_button, etat.formulaire_distinct_par_compte );
g_signal_connect ( G_OBJECT (update_button),
- "clicked",
- G_CALLBACK (gsb_form_config_update_accounts),
- accounts_combobox );
- gtk_box_pack_start ( GTK_BOX (hbox),
- update_button,
- FALSE,
- FALSE,
- 0 );
+ "clicked",
+ G_CALLBACK (gsb_form_config_update_accounts),
+ accounts_combobox );
+ gtk_box_pack_start ( GTK_BOX (hbox), update_button, FALSE, FALSE, 0 );
- label = gtk_label_new (_(" : Update all the accounts forms according to the selected account"));
- gtk_box_pack_start ( GTK_BOX (hbox),
- label,
- FALSE,
- FALSE,
- 0 );
+ label = gtk_label_new ( _(" : Duplicate the selected form for all accounts") );
+ gtk_box_pack_start ( GTK_BOX (hbox), label, FALSE, FALSE, 0 );
+
+ /*create the scolled window for tree_view */
+ sw = gtk_scrolled_window_new ( NULL, NULL);
+ gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( sw ),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_box_pack_start ( GTK_BOX ( paddingbox), sw, TRUE, TRUE, 0 );
/* create the tree_view */
GtkListStore* list_store = gsb_form_config_create_store ();
form_config_tree_view = gsb_form_config_create_tree_view (list_store);
g_object_unref (G_OBJECT(list_store));
- gtk_box_pack_start ( GTK_BOX ( paddingbox),
- form_config_tree_view,
- FALSE,
- FALSE,
- 0 );
-
+ gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( sw ),
+ form_config_tree_view );
/* set the buttons line to increase/decrease the form */
gtk_box_pack_start ( GTK_BOX ( paddingbox ),
- gsb_form_config_create_sizing_buttons_line (),
- FALSE,
- FALSE,
- 0 );
+ gsb_form_config_create_sizing_buttons_line (), FALSE, FALSE, 0 );
/* set the box with the buttons */
- paddingbox = new_paddingbox_with_title ( vbox_parent,
- FALSE,
- _("Form structure content"));
+ paddingbox = new_paddingbox_with_title ( vbox_parent, FALSE, _("Form structure content") );
gtk_box_pack_start ( GTK_BOX ( paddingbox ),
- gsb_form_config_create_buttons_table (),
- FALSE,
- FALSE,
- 0 );
+ gsb_form_config_create_buttons_table (), FALSE, FALSE, 0 );
gtk_widget_show_all (paddingbox);
}
Index: affichage.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/affichage.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- affichage.c 17 Jun 2009 19:39:50 -0000 1.163
+++ affichage.c 23 Aug 2009 16:45:05 -0000 1.164
@@ -226,8 +226,11 @@
/* change colors */
paddingbox = new_paddingbox_with_title ( vbox_pref, FALSE, _("Colors") );
+ vbox = gtk_vbox_new ( FALSE, 10 );
+ gtk_box_pack_start ( GTK_BOX ( paddingbox ), vbox, FALSE, FALSE, 10 );
+
hbox = gtk_hbox_new ( FALSE, 10 );
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), hbox, FALSE, FALSE, 10 );
+ gtk_box_pack_start ( GTK_BOX ( vbox ), hbox, FALSE, FALSE, 10 );
color_combobox = preferences_view_create_color_combobox ();
gtk_box_pack_start ( GTK_BOX (hbox),
@@ -255,7 +258,7 @@
"clicked",
G_CALLBACK (preferences_view_color_default),
G_OBJECT (color_combobox));
- gtk_box_pack_start ( GTK_BOX (hbox),
+ gtk_box_pack_start ( GTK_BOX (vbox),
button,
FALSE, FALSE, 0);
Index: gsb_archive_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_archive_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gsb_archive_config.c 21 May 2009 21:58:55 -0000 1.24
+++ gsb_archive_config.c 23 Aug 2009 16:45:05 -0000 1.25
@@ -241,7 +241,7 @@
/* check part at the opening of the file */
check_paddingbox = new_paddingbox_with_title (vbox_pref, FALSE,
_("Automatic check"));
-
+
button = gsb_automem_checkbutton_new ( _("Check at opening if creating archive is needed."),
&etat.check_for_archival,
NULL, NULL );
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- import.c 17 Jun 2009 19:39:51 -0000 1.282
+++ import.c 23 Aug 2009 16:45:05 -0000 1.283
@@ -3298,7 +3298,7 @@
gtk_box_pack_start ( GTK_BOX ( vbox_main ), vbox, TRUE, TRUE, 0 );
gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
- paddingbox = new_paddingbox_with_title ( vbox, TRUE, _("Import associations") );
+ paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Import associations") );
texte = g_strdup ( _("This will associate a search string to a payee every time you "
"import a file. For instance, all QIF labels containing 'Rent' "
@@ -3318,7 +3318,7 @@
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
- GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_box_pack_start ( GTK_BOX (hbox), sw, TRUE,TRUE, 0 );
Index: accueil.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/accueil.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- accueil.c 17 Aug 2009 19:27:53 -0000 1.207
+++ accueil.c 23 Aug 2009 16:45:05 -0000 1.208
@@ -1866,7 +1866,7 @@
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
- GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
gtk_box_pack_start ( GTK_BOX (hbox), sw, TRUE,TRUE, 0 );
@@ -1915,7 +1915,7 @@
g_object_unref ( list_store );
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
- gtk_widget_set_size_request ( treeview, -1, 230 );
+ gtk_widget_set_size_request ( treeview, -1, 150 );
/* check the keys on the list */
g_signal_connect ( G_OBJECT ( treeview ),
@@ -1947,7 +1947,7 @@
/* Nom du solde partiel */
cell = gtk_cell_renderer_text_new ( );
- column = gtk_tree_view_column_new_with_attributes ( _("Partial balance"),
+ column = gtk_tree_view_column_new_with_attributes ( _("Name"),
cell, "text", 0, NULL);
gtk_tree_view_column_set_expand ( column, TRUE );
gtk_tree_view_column_set_alignment ( column, 0.5 );
@@ -1963,6 +1963,21 @@
gtk_tree_view_column_set_sort_column_id (column, 1);
gtk_tree_view_append_column ( GTK_TREE_VIEW (treeview), column);
+ /* Colorize */
+ cell = gtk_cell_renderer_toggle_new ( );
+ g_signal_connect ( cell,
+ "toggled",
+ G_CALLBACK ( gsb_partial_balance_colorise_toggled ),
+ treeview );
+ gtk_cell_renderer_toggle_set_radio ( GTK_CELL_RENDERER_TOGGLE(cell), FALSE );
+ g_object_set (cell, "xalign", 0.5, NULL);
+
+ column = gtk_tree_view_column_new_with_attributes ( _("Colorize"),
+ cell,
+ "active", 5,
+ NULL);
+ gtk_tree_view_append_column ( GTK_TREE_VIEW(treeview), column);
+
/* Type de compte */
cell = gtk_cell_renderer_text_new ( );
column = gtk_tree_view_column_new_with_attributes ( _("Account kind"),
@@ -1981,21 +1996,6 @@
gtk_tree_view_column_set_sort_column_id (column, 3);
gtk_tree_view_append_column ( GTK_TREE_VIEW (treeview), column);
- /* Colorize */
- cell = gtk_cell_renderer_toggle_new ( );
- g_signal_connect ( cell,
- "toggled",
- G_CALLBACK ( gsb_partial_balance_colorise_toggled ),
- treeview );
- gtk_cell_renderer_toggle_set_radio ( GTK_CELL_RENDERER_TOGGLE(cell), FALSE );
- g_object_set (cell, "xalign", 0.5, NULL);
-
- column = gtk_tree_view_column_new_with_attributes ( _("Colorize"),
- cell,
- "active", 5,
- NULL);
- gtk_tree_view_append_column ( GTK_TREE_VIEW(treeview), column);
-
dst_iface = GTK_TREE_DRAG_DEST_GET_IFACE ( list_store );
if ( dst_iface )
dst_iface -> drag_data_received = &gsb_data_partial_balance_drag_data_received;
Index: transaction_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/transaction_list.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- transaction_list.c 22 Aug 2009 15:34:51 -0000 1.48
+++ transaction_list.c 23 Aug 2009 16:45:05 -0000 1.49
@@ -318,7 +318,7 @@
newrecord -> visible_col[find_element_col (ELEMENT_DATE)] = gsb_format_gdate (
gsb_data_archive_get_beginning_date ( archive_number ) );
newrecord -> visible_col[find_element_col (ELEMENT_PARTY)] = g_strdup_printf (
- _("archive %s (%d transactions)"),
+ _("%s (%d transactions)"),
gsb_data_archive_get_name (archive_number),
gsb_data_archive_store_get_transactions_number (
archive_store_number ) );
@@ -504,10 +504,10 @@
CustomList *custom_list;
gboolean return_val = FALSE;
- devel_debug_int (archive_number);
custom_list = transaction_model_get_model ();
- g_return_val_if_fail ( custom_list != NULL, FALSE);
+ if ( custom_list == NULL )
+ return FALSE;
/* there is several archive store records which correspond to the archive */
for (i=0 ; i < custom_list -> num_rows ; i++)
Index: gsb_file_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_file_config.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- gsb_file_config.c 9 Aug 2009 18:31:42 -0000 1.80
+++ gsb_file_config.c 23 Aug 2009 16:45:05 -0000 1.81
@@ -1328,7 +1328,7 @@
gchar *tmpstr = g_strconcat (
_("Careful, you are about to deleting the file\n"
"of configuration of an old version of Grisbi.\n"
- "\n<b>Do you want to continue ?</b>"),
+ "\n<b>Do you want to delete this file ?</b>"),
NULL );
label = gtk_label_new ( tmpstr );
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.47, 1.48 da.po, 1.54, 1.55 de.po, 1.110, 1.111 el.po, 1.18, 1.19 eo.po, 1.11, 1.12 es.po, 1.100, 1.101 fa.po, 1.41, 1.42 fr.po, 1.173, 1.174 grisbi.pot, 1.89, 1.90 he.po, 1.47, 1.48 it.po, 1.47, 1.48 nl.po, 1.46, 1.47 pl.po, 1.52, 1.53 pt_BR.po, 1.49, 1.50 ro.po, 1.47, 1.48 ru.po, 1.46, 1.47 zh_CN.po, 1.41, 1.42
- Next message: [grisbi-cvs] grisbi/win32-msvc - New directory
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list