[grisbi-cvs] grisbi/src gsb_scheduler_list.c, 1.56, 1.57 gsb_transactions_list.c, 1.143, 1.144 import.c, 1.255, 1.256 imputation_budgetaire.c, 1.146, 1.147 parametres.c, 1.184, 1.185 print_config.c, 1.38, 1.39 tiers_onglet.c, 1.140, 1.141
Martin Stromberger
fabiolla at users.sourceforge.net
Mon Dec 8 15:39:02 CET 2008
- Previous message: [grisbi-cvs] grisbi/src gsb_bank.c, 1.13, 1.14 gsb_crypt.c, 1.12, 1.13 gsb_currency.c, 1.30, 1.31 gsb_currency_config.c, 1.38, 1.39 gsb_payment_method_config.c, 1.27, 1.28
- Next message: [grisbi-cvs] grisbi/src help.c,1.81,1.82
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23445/src
Modified Files:
gsb_scheduler_list.c gsb_transactions_list.c import.c
imputation_budgetaire.c parametres.c print_config.c
tiers_onglet.c
Log Message:
unified handling for dialoges (part_03)
Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gsb_scheduler_list.c 6 Nov 2008 21:04:37 -0000 1.56
+++ gsb_scheduler_list.c 8 Dec 2008 14:39:00 -0000 1.57
@@ -154,18 +154,18 @@
GtkWidget *tree_view;
devel_debug (NULL);
-
+
/* first, a vbox */
vbox = gtk_vbox_new ( FALSE, 5 );
gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 0 );
gtk_widget_show ( vbox );
- /* create the toolbar */
+ /* create the toolbar */
gtk_box_pack_start ( GTK_BOX ( vbox ),
creation_barre_outils_echeancier(),
FALSE, FALSE, 0 );
- /* create the scrolled window */
+ /* create the scrolled window */
scrolled_window = gtk_scrolled_window_new ( NULL, NULL);
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scrolled_window ),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
@@ -181,8 +181,8 @@
gsb_scheduler_list_set_tree_view (tree_view);
gtk_container_add ( GTK_CONTAINER (scrolled_window),
tree_view);
-
-
+
+
/* create the columns */
gsb_scheduler_list_create_list_columns (tree_view);
@@ -220,7 +220,7 @@
*
* \param tree_view
*
- * \return
+ * \return
* */
void gsb_scheduler_list_set_tree_view ( GtkWidget *tree_view )
{
@@ -245,7 +245,7 @@
*
* \param model
*
- * \return
+ * \return
* */
void gsb_scheduler_list_set_model ( GtkTreeModel *model )
{
@@ -260,7 +260,7 @@
*
* \param tree_model_sort
*
- * \return
+ * \return
* */
void gsb_scheduler_list_set_sorted_model ( GtkTreeModelSort *tree_model_sort )
{
@@ -328,11 +328,11 @@
{
gint i;
gchar *scheduler_titles[] = {
- _("Date"), _("Account"), _("Payee"), _("Frequency"),
+ _("Date"), _("Account"), _("Payee"), _("Frequency"),
_("Mode"), _("Comments"), _("Amount"), _("Balance")
};
gfloat col_justs[] = {
- COLUMN_CENTER, COLUMN_LEFT, COLUMN_LEFT, COLUMN_CENTER,
+ COLUMN_CENTER, COLUMN_LEFT, COLUMN_LEFT, COLUMN_CENTER,
COLUMN_CENTER, COLUMN_LEFT, COLUMN_RIGHT, COLUMN_RIGHT
};
@@ -477,11 +477,11 @@
/**
- * change the showed informations on the list :
+ * change the showed informations on the list :
* either show the frequency and mode of the scheduled
* either show the notes
*
- * \param
+ * \param
*
* \return FALSE
*/
@@ -519,7 +519,7 @@
gsb_scheduler_list_edit_transaction (scheduled_number);
/* the only difference for now between an execution and a edition of scheduled is here :
- * set the flag to say that we execute the scheduled transaction
+ * set the flag to say that we execute the scheduled transaction
* and hide the scheduler part of the form */
g_object_set_data ( G_OBJECT (gsb_form_get_form_widget ()),
"execute_scheduled", GINT_TO_POINTER (TRUE));
@@ -777,7 +777,7 @@
/**
* remove the given scheduled transaction from the list
* and too all the corresponding virtual transactions
- *
+ *
* \param transaction_number
*
* \return FALSE
@@ -984,7 +984,7 @@
&&
frequency >= 0 )
{
- gchar * names[] = { _("Once"), _("Weekly"), _("Montly"),
+ gchar * names[] = { _("Once"), _("Weekly"), _("Montly"),
_("Bimonthly"), _("Quarterly"), _("Yearly") };
line[COL_NB_FREQUENCY] = names [frequency];
}
@@ -1023,7 +1023,7 @@
* \param store
* \param iter
* \param line a tab of gchar with SCHEDULER_COL_VISIBLE_COLUMNS of size, wich is the text content of the line
- *
+ *
* \return FALSE
* */
gboolean gsb_scheduler_list_fill_transaction_row ( GtkTreeStore *store,
@@ -1086,7 +1086,7 @@
SCHEDULER_COL_NB_VIRTUAL_TRANSACTION, &virtual_transaction,
COL_NB_AMOUNT, &amount,
-1 );
-
+
if ( virtual_transaction )
gtk_tree_store_set ( store,
&iter,
@@ -1169,11 +1169,11 @@
}
-/**
+/**
* get the iter of the scheduled transaction given in param
- *
+ *
* \param scheduled_number
- *
+ *
* \return a newly allocated GtkTreeIter or NULL if not found
* */
GtkTreeIter *gsb_scheduler_list_get_iter_from_scheduled_number ( gint scheduled_number )
@@ -1229,14 +1229,14 @@
return NULL;
}
-/**
+/**
* the same as gsb_scheduler_list_get_iter_from_scheduled_number but
* return a gslist of iter corresponding to that scheduled number,
* so there is only 1 iter for the once view, but more than 1 for the other views
* use when changin the scheduled, to change also the virtuals ones on the screen
- *
+ *
* \param scheduled_number
- *
+ *
* \return a gslist of pointer to the iters, need to be free, or NULL if not found
* */
GSList *gsb_scheduler_list_get_iter_list_from_scheduled_number ( gint scheduled_number )
@@ -1295,11 +1295,11 @@
}
}
-
+
if ( scheduled_transaction_buf == mother_number )
{
GtkTreeIter *mother_iter;
-
+
mother_iter = gtk_tree_iter_copy (&iter);
return_iter = gtk_tree_model_iter_children ( model,
&iter,
@@ -1326,7 +1326,7 @@
GDate *gsb_scheduler_list_get_end_date_scheduled_showed ( void )
{
GDate *end_date;
-
+
/* on récupère la date du jour et la met dans end_date pour les
* vérifications ultérieures */
@@ -1474,7 +1474,7 @@
gsb_scheduler_list_switch_expander (scheduled_number);
break;
}
- return ( FALSE );
+ return ( FALSE );
}
/**
@@ -1509,7 +1509,7 @@
* get the current selected transaction and return it
* if it's a virtual transaction, return 0
*
- * \param
+ * \param
*
* \return the current scheduled transaction number
* */
@@ -1587,12 +1587,12 @@
/**
* delete the scheduled transaction
- *
+ *
* \param scheduled_number the transaction to delete
* \param show_warning TRUE to warn, FALSE to delete directly
* !! this don't affect the question to delete only the occurence or the whole scheduled transaction
* it affects only for children of split, and especially deleting the white line child
- *
+ *
* \return FALSE
* */
gboolean gsb_scheduler_list_delete_scheduled_transaction ( gint scheduled_number,
@@ -1731,8 +1731,8 @@
gboolean gsb_scheduler_list_change_scheduler_view ( enum scheduler_periodicity periodicity,
gpointer item )
{
- gchar * names[] = { _("Unique view"), _("Week view"), _("Month view"),
- _("Two months view"), _("Quarter view"),
+ gchar * names[] = { _("Unique view"), _("Week view"), _("Month view"),
+ _("Two months view"), _("Quarter view"),
_("Year view"), _("Custom view"), NULL };
if ( periodicity == SCHEDULER_PERIODICITY_CUSTOM_VIEW )
@@ -1741,7 +1741,7 @@
return FALSE;
}
- gchar* tmpstr = g_strconcat ( _("Scheduled transactions"), " : ",
+ gchar* tmpstr = g_strconcat ( _("Scheduled transactions"), " : ",
names[periodicity], NULL);
gsb_gui_headings_update ( tmpstr, "" );
g_free ( tmpstr );
@@ -1770,12 +1770,15 @@
gchar * names[] = { _("days"), _("weeks"), _("months"), _("years"), NULL };
int i;
- dialog = gtk_dialog_new_with_buttons ( _("Show scheduled transactions"),
- GTK_WINDOW (window), GTK_DIALOG_MODAL,
+ dialog = gtk_dialog_new_with_buttons ( _("Show scheduled transactions"),
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_APPLY, GTK_RESPONSE_OK,
- NULL);
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+ NULL );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
@@ -1789,7 +1792,7 @@
label = gtk_label_new ( COLON(_("Show transactions for the next")));
gtk_box_pack_start ( GTK_BOX(hbox2), label, FALSE, FALSE, 0 );
- entry = gsb_automem_spin_button_new ( &affichage_echeances_perso_nb_libre,
+ entry = gsb_automem_spin_button_new ( &affichage_echeances_perso_nb_libre,
NULL, NULL );
gtk_box_pack_start ( GTK_BOX(hbox2), entry, FALSE, FALSE, 6 );
Index: print_config.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/print_config.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- print_config.c 1 Nov 2008 21:59:44 -0000 1.38
+++ print_config.c 8 Dec 2008 14:39:00 -0000 1.39
@@ -64,7 +64,7 @@
/* FIXME : remove all of that when debian stable goes into gtk 2.10 */
-/**
+/**
* Open a dialog window which asks for information about paper,
* margins, etc..
*
@@ -78,23 +78,24 @@
/* Set up dialog */
dialog = gtk_dialog_new_with_buttons ( _("Print"),
- GTK_WINDOW(window),
- GTK_DIALOG_DESTROY_WITH_PARENT |
- GTK_DIALOG_NO_SEPARATOR,
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR | GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_PRINT, GTK_RESPONSE_OK,
NULL );
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
/* Insert notebook */
notebook = gtk_notebook_new ();
gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, TRUE, TRUE, 6 );
/* Add tabs */
- gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_general(dialog),
+ gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_general(dialog),
gtk_label_new (_("General")) );
- gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_paper(dialog),
+ gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_paper(dialog),
gtk_label_new (_("Paper")) );
/* gtk_notebook_append_page ( GTK_NOTEBOOK(notebook), print_config_appearance(dialog), */
@@ -115,19 +116,19 @@
break;
}
- filename = my_strdup ( gtk_entry_get_text ( GTK_ENTRY (g_object_get_data(G_OBJECT(dialog),
+ filename = my_strdup ( gtk_entry_get_text ( GTK_ENTRY (g_object_get_data(G_OBJECT(dialog),
"printer_filename") ) ) );
if ( ! filename )
{
filename = "";
- }
+ }
test = utf8_fopen ( filename, "r" );
if ( test )
{
fclose ( test );
- if ( question_yes_no_hint ( g_strdup_printf ( _("File %s already exists."),
+ if ( question_yes_no_hint ( g_strdup_printf ( _("File %s already exists."),
filename ),
_("Do you want to overwrite it? There is no undo for this."),
GTK_RESPONSE_NO ) )
@@ -171,13 +172,13 @@
/**
* Handler triggered when user validates a file selector window.
*
- * \param button Widget that triggered this event.
+ * \param button Widget that triggered this event.
* \param data Pointer to a GtkEntry to fill with the result of the
* file selector window
*
* \return FALSE to allow other handlers to be processed
*/
-/* TODO dOm : this function seems not to be used. Is it possible to remove it
+/* TODO dOm : this function seems not to be used. Is it possible to remove it
gboolean change_print_to_file ( GtkButton *button, gpointer data )
{
GtkFileSelection * file_selector;
@@ -218,11 +219,11 @@
/* Print to printer */
radio1 = gtk_radio_button_new_with_label ( NULL, _("Printer") );
gtk_table_attach ( GTK_TABLE(table), radio1, 0, 1, 0, 1,
- GTK_SHRINK, GTK_SHRINK,
+ GTK_SHRINK, GTK_SHRINK,
0, 0 );
g_object_set_data ( G_OBJECT(dialog), "printer", radio1 );
g_object_set_data ( G_OBJECT(radio1), "printer_value", GINT_TO_POINTER (1));
- g_signal_connect ( G_OBJECT(radio1), "toggled",
+ g_signal_connect ( G_OBJECT(radio1), "toggled",
(GCallback) print_config_radio_toggled, NULL );
input1 = gtk_entry_new ( );
gtk_table_attach_defaults ( GTK_TABLE(table), input1, 1, 2, 0, 1 );
@@ -232,16 +233,16 @@
/* Print to file */
radio2 = gtk_radio_button_new_with_label ( gtk_radio_button_group (GTK_RADIO_BUTTON(radio1)), _("File") );
gtk_table_attach ( GTK_TABLE(table), radio2, 0, 1, 1, 2,
- GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL,
+ GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL,
0, 0 );
gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON(radio2), !etat.print_config.printer );
g_object_set_data ( G_OBJECT(radio2), "printer_value", 0 );
- g_signal_connect ( G_OBJECT(radio2), "toggled",
+ g_signal_connect ( G_OBJECT(radio2), "toggled",
(GCallback) print_config_radio_toggled, NULL );
input2 = my_file_chooser ();
gtk_table_attach_defaults ( GTK_TABLE(table), input2, 1, 2, 1, 2 );
- g_object_set_data ( G_OBJECT(dialog), "printer_filename",
+ g_object_set_data ( G_OBJECT(dialog), "printer_filename",
g_object_get_data (G_OBJECT(input2), "entry") );
gtk_entry_set_text ( GTK_ENTRY(g_object_get_data (G_OBJECT(input2), "entry")),
etat.print_config.printer_filename );
@@ -331,7 +332,7 @@
*
* \return a pointer to a newly created GtkVbox
*/
-/* TODO dOm : this function seems not to be used. Is it possible to remove it
+/* TODO dOm : this function seems not to be used. Is it possible to remove it
GtkWidget * print_config_appearance ( GtkWidget * dialog )
{
GtkWidget *vbox, *paddingbox;
@@ -364,7 +365,7 @@
*
* \return FALSE to allow other handlers to be executed
*/
-gboolean print_config_radio_toggled ( GtkToggleButton * togglebutton, gpointer user_data )
+gboolean print_config_radio_toggled ( GtkToggleButton * togglebutton, gpointer user_data )
{
GtkWidget *peer1, *peer2;
gboolean value;
Index: imputation_budgetaire.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/imputation_budgetaire.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- imputation_budgetaire.c 23 Nov 2008 11:25:00 -0000 1.146
+++ imputation_budgetaire.c 8 Dec 2008 14:39:00 -0000 1.147
@@ -101,7 +101,7 @@
budgetary_line_tree = gtk_tree_view_new();
g_signal_connect ( G_OBJECT (budgetary_line_tree ), "destroy",
G_CALLBACK ( gtk_widget_destroyed), &budgetary_line_tree );
- budgetary_line_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS,
+ budgetary_line_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS,
META_TREE_COLUMN_TYPES );
/* We create the main vbox */
@@ -115,18 +115,18 @@
scroll_window = gtk_scrolled_window_new ( NULL, NULL );
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scroll_window ),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
- gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW(scroll_window),
+ gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW(scroll_window),
GTK_SHADOW_IN );
gtk_box_pack_start ( GTK_BOX ( vbox ), scroll_window, TRUE, TRUE, 0 );
gtk_widget_show ( scroll_window );
/* Create model */
- gtk_tree_sortable_set_sort_column_id ( GTK_TREE_SORTABLE(budgetary_line_tree_model),
+ gtk_tree_sortable_set_sort_column_id ( GTK_TREE_SORTABLE(budgetary_line_tree_model),
META_TREE_TEXT_COLUMN, GTK_SORT_ASCENDING );
- gtk_tree_sortable_set_sort_func ( GTK_TREE_SORTABLE(budgetary_line_tree_model),
+ gtk_tree_sortable_set_sort_func ( GTK_TREE_SORTABLE(budgetary_line_tree_model),
META_TREE_TEXT_COLUMN, metatree_sort_column,
NULL, NULL );
- g_object_set_data ( G_OBJECT ( budgetary_line_tree_model), "metatree-interface",
+ g_object_set_data ( G_OBJECT ( budgetary_line_tree_model), "metatree-interface",
budgetary_interface );
/* Create container + TreeView */
@@ -139,48 +139,48 @@
gtk_tree_view_set_reorderable (GTK_TREE_VIEW(budgetary_line_tree), TRUE);
gtk_tree_selection_set_mode ( gtk_tree_view_get_selection ( GTK_TREE_VIEW(budgetary_line_tree)),
GTK_SELECTION_SINGLE );
- gtk_tree_view_set_model (GTK_TREE_VIEW (budgetary_line_tree),
+ gtk_tree_view_set_model (GTK_TREE_VIEW (budgetary_line_tree),
GTK_TREE_MODEL (budgetary_line_tree_model));
g_object_unref ( G_OBJECT(budgetary_line_tree_model));
- g_object_set_data ( G_OBJECT(budgetary_line_tree_model), "tree-view",
+ g_object_set_data ( G_OBJECT(budgetary_line_tree_model), "tree-view",
budgetary_line_tree );
/* Make category column */
cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Budgetary line"), cell,
- "text", META_TREE_TEXT_COLUMN,
+ column = gtk_tree_view_column_new_with_attributes (_("Budgetary line"), cell,
+ "text", META_TREE_TEXT_COLUMN,
"weight", META_TREE_FONT_COLUMN,
NULL);
#if GTK_CHECK_VERSION(2,4,0)
gtk_tree_view_column_set_expand ( column, TRUE );
#endif
- gtk_tree_view_append_column ( GTK_TREE_VIEW ( budgetary_line_tree ),
+ gtk_tree_view_append_column ( GTK_TREE_VIEW ( budgetary_line_tree ),
GTK_TREE_VIEW_COLUMN ( column ) );
/* Make account column */
cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Account"), cell,
- "text", META_TREE_ACCOUNT_COLUMN,
+ column = gtk_tree_view_column_new_with_attributes (_("Account"), cell,
+ "text", META_TREE_ACCOUNT_COLUMN,
"weight", META_TREE_FONT_COLUMN,
NULL);
- gtk_tree_view_append_column ( GTK_TREE_VIEW ( budgetary_line_tree ),
+ gtk_tree_view_append_column ( GTK_TREE_VIEW ( budgetary_line_tree ),
GTK_TREE_VIEW_COLUMN ( column ) );
/* Make balance column */
cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Balance"), cell,
+ column = gtk_tree_view_column_new_with_attributes (_("Balance"), cell,
"text", META_TREE_BALANCE_COLUMN,
"weight", META_TREE_FONT_COLUMN,
"xalign", META_TREE_XALIGN_COLUMN,
NULL);
- gtk_tree_view_append_column ( GTK_TREE_VIEW ( budgetary_line_tree ),
+ gtk_tree_view_append_column ( GTK_TREE_VIEW ( budgetary_line_tree ),
GTK_TREE_VIEW_COLUMN ( column ) );
gtk_container_add ( GTK_CONTAINER ( scroll_window ), budgetary_line_tree );
gtk_widget_show ( budgetary_line_tree );
/* Connect to signals */
- g_signal_connect ( G_OBJECT(budgetary_line_tree), "row-expanded",
+ g_signal_connect ( G_OBJECT(budgetary_line_tree), "row-expanded",
G_CALLBACK(division_column_expanded), NULL );
g_signal_connect( G_OBJECT(budgetary_line_tree), "row-activated",
G_CALLBACK(division_activated), NULL);
@@ -244,7 +244,7 @@
budget_number = gsb_data_budget_get_no_budget (budget_list -> data);
gtk_tree_store_append (GTK_TREE_STORE (budgetary_line_tree_model), &iter_budgetary_line, NULL);
- fill_division_row ( GTK_TREE_MODEL(budgetary_line_tree_model), budgetary_interface,
+ fill_division_row ( GTK_TREE_MODEL(budgetary_line_tree_model), budgetary_interface,
&iter_budgetary_line, budget_number);
/** Each budget has sub budgetary lines. */
@@ -260,9 +260,9 @@
sub_budget_number = gsb_data_budget_get_no_sub_budget (sub_budget_list -> data);
- gtk_tree_store_append (GTK_TREE_STORE (budgetary_line_tree_model),
+ gtk_tree_store_append (GTK_TREE_STORE (budgetary_line_tree_model),
&iter_sub_budgetary_line, &iter_budgetary_line);
- fill_sub_division_row ( GTK_TREE_MODEL(budgetary_line_tree_model), budgetary_interface,
+ fill_sub_division_row ( GTK_TREE_MODEL(budgetary_line_tree_model), budgetary_interface,
&iter_sub_budgetary_line,
budget_number,
sub_budget_number);
@@ -274,9 +274,9 @@
/* add the no-sub-budget only if budget exists */
if (budget_number)
{
- gtk_tree_store_append (GTK_TREE_STORE (budgetary_line_tree_model),
+ gtk_tree_store_append (GTK_TREE_STORE (budgetary_line_tree_model),
&iter_sub_budgetary_line, &iter_budgetary_line);
- fill_sub_division_row ( GTK_TREE_MODEL(budgetary_line_tree_model), budgetary_interface,
+ fill_sub_division_row ( GTK_TREE_MODEL(budgetary_line_tree_model), budgetary_interface,
&iter_sub_budgetary_line, budget_number, 0 );
}
budget_list = budget_list -> next;
@@ -301,10 +301,10 @@
{
if ( path )
{
- gtk_tree_set_row_drag_data (selection_data,
+ gtk_tree_set_row_drag_data (selection_data,
GTK_TREE_MODEL(budgetary_line_tree_model), path);
}
-
+
return FALSE;
}
@@ -488,7 +488,7 @@
/* New sub budgetary line button */
button = gsb_automem_imagefile_button_new ( etat.display_toolbar,
- _("New sub\nbudgetary line"),
+ _("New sub\nbudgetary line"),
"new-sub-ib.png",
G_CALLBACK(appui_sur_ajout_sub_division),
budgetary_line_tree_model );
@@ -500,7 +500,7 @@
/* Import button */
button = gsb_automem_stock_button_new ( etat.display_toolbar,
- GTK_STOCK_OPEN,
+ GTK_STOCK_OPEN,
_("Import"),
G_CALLBACK(importer_ib),
NULL );
@@ -510,7 +510,7 @@
/* Export button */
button = gsb_automem_stock_button_new ( etat.display_toolbar,
- GTK_STOCK_SAVE,
+ GTK_STOCK_SAVE,
_("Export"),
G_CALLBACK(exporter_ib),
NULL );
@@ -531,7 +531,7 @@
/* Properties button */
button = gsb_automem_stock_button_new ( etat.display_toolbar,
GTK_STOCK_PROPERTIES, _("Properties"),
- G_CALLBACK(edit_budgetary_line),
+ G_CALLBACK(edit_budgetary_line),
budgetary_line_tree );
metatree_register_widget_as_linked ( GTK_TREE_MODEL(budgetary_line_tree_model), button, "selection" );
gtk_widget_set_tooltip_text ( GTK_WIDGET (button),
@@ -540,7 +540,7 @@
/* View button */
button = gsb_automem_stock_button_menu_new ( etat.display_toolbar,
- GTK_STOCK_SELECT_COLOR,
+ GTK_STOCK_SELECT_COLOR,
_("View"),
G_CALLBACK(popup_budgetary_line_view_mode_menu),
NULL );
@@ -574,26 +574,26 @@
/* Edit transaction */
menu_item = gtk_image_menu_item_new_with_label ( _("Budgetary line view") );
- g_signal_connect ( G_OBJECT(menu_item), "activate",
+ g_signal_connect ( G_OBJECT(menu_item), "activate",
G_CALLBACK(expand_arbre_division), (gpointer) 0 );
g_object_set_data ( G_OBJECT(menu_item), "tree-view", budgetary_line_tree );
gtk_menu_append ( menu, menu_item );
menu_item = gtk_image_menu_item_new_with_label ( _("Sub-budgetary line view") );
- g_signal_connect ( G_OBJECT(menu_item), "activate",
+ g_signal_connect ( G_OBJECT(menu_item), "activate",
G_CALLBACK(expand_arbre_division), (gpointer) 1 );
g_object_set_data ( G_OBJECT(menu_item), "tree-view", budgetary_line_tree );
gtk_menu_append ( menu, menu_item );
menu_item = gtk_image_menu_item_new_with_label ( _("Complete view") );
- g_signal_connect ( G_OBJECT(menu_item), "activate",
+ g_signal_connect ( G_OBJECT(menu_item), "activate",
G_CALLBACK(expand_arbre_division), (gpointer) 2 );
g_object_set_data ( G_OBJECT(menu_item), "tree-view", budgetary_line_tree );
gtk_menu_append ( menu, menu_item );
gtk_widget_show_all ( menu );
- gtk_menu_popup ( GTK_MENU(menu), NULL, button, set_popup_position, button, 1,
+ gtk_menu_popup ( GTK_MENU(menu), NULL, button, set_popup_position, button, 1,
gtk_get_current_event_time());
return FALSE;
@@ -618,7 +618,7 @@
selection = gtk_tree_view_get_selection ( view );
if ( selection && gtk_tree_selection_get_selected(selection, &model, &iter))
{
- gtk_tree_model_get ( model, &iter,
+ gtk_tree_model_get ( model, &iter,
META_TREE_NO_DIV_COLUMN, &budget_number,
META_TREE_NO_SUB_DIV_COLUMN, &sub_budget_number,
-1 );
@@ -638,11 +638,15 @@
0,
_("No budget defined") ));
- dialog = gtk_dialog_new_with_buttons ( title, GTK_WINDOW (window), GTK_DIALOG_MODAL,
- GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
- GTK_STOCK_APPLY, GTK_RESPONSE_OK,
- NULL);
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+ dialog = gtk_dialog_new_with_buttons ( title ,
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
+ GTK_STOCK_APPLY, GTK_RESPONSE_OK,
+ NULL );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
@@ -687,11 +691,11 @@
gtk_table_attach ( GTK_TABLE(table), label, 0, 1, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0 );
- radiogroup = gsb_autofunc_radiobutton_new ( _("Credit"), _("Debit"),
+ radiogroup = gsb_autofunc_radiobutton_new ( _("Credit"), _("Debit"),
gsb_data_budget_get_type (budget_number),
NULL, NULL,
G_CALLBACK (gsb_data_budget_set_type), budget_number);
- gtk_table_attach ( GTK_TABLE(table), radiogroup,
+ gtk_table_attach ( GTK_TABLE(table), radiogroup,
1, 2, 1, 2, GTK_EXPAND|GTK_FILL, 0, 0, 0 );
}
@@ -706,21 +710,21 @@
return FALSE;
}
- if ( ( sub_budget_number > 0 &&
+ if ( ( sub_budget_number > 0 &&
gsb_data_budget_get_sub_budget_number_by_name ( budget_number,
gtk_entry_get_text ( GTK_ENTRY ( entry ) ),
FALSE ) &&
gsb_data_budget_get_sub_budget_number_by_name ( budget_number,
gtk_entry_get_text ( GTK_ENTRY ( entry ) ),
FALSE ) != sub_budget_number) ||
- ( sub_budget_number <= 0 &&
+ ( sub_budget_number <= 0 &&
gsb_data_budget_get_number_by_name ( gtk_entry_get_text ( GTK_ENTRY ( entry ) ),
FALSE, 0 ) &&
gsb_data_budget_get_number_by_name ( gtk_entry_get_text ( GTK_ENTRY ( entry ) ),
FALSE, 0 ) != budget_number ) )
{
gchar * message;
- if ( sub_budget_number > 0 )
+ if ( sub_budget_number > 0 )
{
message = g_strdup_printf ( _("You tried to rename current sub-budgetary line to '%s' "
"but this sub-budgetary line already exists. Please "
@@ -760,7 +764,7 @@
{
div_iter = get_iter_from_div ( model, budget_number, sub_budget_number );
fill_sub_division_row ( model, budgetary_interface,
- div_iter,
+ div_iter,
budget_number,
sub_budget_number);
}
Index: gsb_transactions_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_transactions_list.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- gsb_transactions_list.c 16 Nov 2008 20:34:25 -0000 1.143
+++ gsb_transactions_list.c 8 Dec 2008 14:39:00 -0000 1.144
@@ -179,7 +179,7 @@
/**
* save the transactions tree_view
- *
+ *
* \param tree_view
*
* \return
@@ -275,9 +275,9 @@
/**
* create fully the gui list and fill it
- *
+ *
* \param
- *
+ *
* \return the widget which contains the list, to set at the right place
* */
GtkWidget *gsb_transactions_list_make_gui_list ( void )
@@ -310,14 +310,14 @@
-/**
+/**
* creates the columns of the tree_view
* */
void gsb_transactions_list_create_tree_view_columns ( void )
{
gint i;
gfloat alignment[] = {
- COLUMN_CENTER, COLUMN_CENTER, COLUMN_LEFT,
+ COLUMN_CENTER, COLUMN_CENTER, COLUMN_LEFT,
COLUMN_CENTER, COLUMN_RIGHT, COLUMN_RIGHT, COLUMN_RIGHT
};
gint column_balance;
@@ -408,9 +408,9 @@
/**
* create the tree view from the CustomList
- *
+ *
* \param model the CustomList
- *
+ *
* \return the tree_view
* */
GtkWidget *gsb_transactions_list_create_tree_view ( GtkTreeModel *model )
@@ -477,9 +477,9 @@
/**
* fill the new store with the all the transactions
* normally called at the opening of a file
- *
- * \param
- *
+ *
+ * \param
+ *
* \return FALSE
* */
gboolean gsb_transactions_list_fill_model ( void )
@@ -547,7 +547,7 @@
g_free (string_1);
}
}
- return FALSE;
+ return FALSE;
}
@@ -581,7 +581,7 @@
-/**
+/**
* append a new transaction in the tree_view
* use gsb_transactions_list_append_transaction and do all the stuff
* arround that, ie calculate the balances, show or not the line...
@@ -664,10 +664,10 @@
/**
* take in a transaction the content to set in a cell of the transaction's list
* all the value are dupplicate and have to be freed after use (except when NULL)
- *
+ *
* \param transaction_number
* \param cell_content_number what we need in the transaction
- *
+ *
* \return a newly allocated string which represent the content of the transaction, or NULL
* */
gchar *gsb_transactions_list_grep_cell_content ( gint transaction_number,
@@ -754,7 +754,7 @@
g_free ( tmpstr );
return result;
}
- else
+ else
return NULL;
break;
@@ -833,11 +833,11 @@
return ( NULL );
}
-/**
+/**
* update the transaction given in the tree_view
- *
+ *
* \param transaction transaction to update
- *
+ *
* \return FALSE
* */
gboolean gsb_transactions_list_update_transaction ( gint transaction_number )
@@ -1106,7 +1106,7 @@
/**
* called when press a mouse button on the transactions list
- *
+ *
* \param tree_view
* \param ev a GdkEventButton
*
@@ -1131,7 +1131,7 @@
/* first, give the focus to the list */
gtk_widget_grab_focus (tree_view);
- /* get the path,
+ /* get the path,
* if it's a right button and we are not in the list, show the partial popup
* else go away */
if ( !gtk_tree_view_get_path_at_pos ( GTK_TREE_VIEW ( tree_view ),
@@ -1172,7 +1172,7 @@
name = gsb_data_archive_get_name (archive_number);
if (name)
{
- gchar* tmpstr = g_strdup_printf (
+ gchar* tmpstr = g_strdup_printf (
_("Do you want to load the transaction of the archive %s into the list ?"),
name );
if (question_yes_no ( tmpstr , GTK_RESPONSE_CANCEL ))
@@ -1333,12 +1333,12 @@
if ( new_selected_transaction != -1 )
{
account_number = gsb_data_transaction_get_account_number (new_selected_transaction);
- gsb_menu_transaction_operations_set_sensitive ( TRUE );
+ gsb_menu_transaction_operations_set_sensitive ( TRUE );
}
else
{
account_number = gsb_gui_navigation_get_current_account ();
- gsb_menu_transaction_operations_set_sensitive ( FALSE );
+ gsb_menu_transaction_operations_set_sensitive ( FALSE );
}
/* save the new current transaction */
@@ -1356,9 +1356,9 @@
-/**
+/**
* Called to edit a specific transaction
- *
+ *
* \param transaction_number
*
* \return FALSE
@@ -1371,10 +1371,10 @@
}
-/**
+/**
* Called to edit a specific transaction but the number of transaction
* is passed via a pointer (by g_signal_connect)
- *
+ *
* \param transaction_number a pointer wich is the number of the transaction
*
* \return FALSE
@@ -1388,9 +1388,9 @@
-/**
+/**
* Called to edit a the current transaction
- *
+ *
* \param
*
* \return FALSE
@@ -1408,9 +1408,9 @@
* switch the mark of the transaction in the list between P or empty
* it will mark/unmark the transaction and update the marked amount
* if we are reconciling, update too the amounts of the reconcile panel
- *
+ *
* \param transaction_number
- *
+ *
* \return FALSE
* */
gboolean gsb_transactions_list_switch_mark ( gint transaction_number )
@@ -1498,9 +1498,9 @@
* reconcile number (but if come from before, it could happen)
* when we unmark, we keep the reconcile number into the transaction to find it easily when the user
* will re-R again
- *
+ *
* \param transaction_number
- *
+ *
* \return FALSE
* */
gboolean gsb_transactions_list_switch_R_mark ( gint transaction_number )
@@ -1606,7 +1606,7 @@
/* we warn the user the transaction disappear
* don't laugh ! there were several bugs reports about a transaction wich disappear :-) */
- dialogue_hint ( _("The transaction has disappear from the list...\nDon't worry, it's because you marked it as R, and you choosed not to show the R transactions into the list ; show them if you want to check what you did."),
+ dialogue_hint ( _("The transaction has disappear from the list...\nDon't worry, it's because you marked it as R, and you choosed not to show the R transactions into the list ; show them if you want to check what you did."),
_("Marking a transaction as R"));
}
}
@@ -1674,15 +1674,16 @@
gint reconcile_number;
dialog = gtk_dialog_new_with_buttons ( _("Selection of a reconciliation"),
- GTK_WINDOW (window),
+ GTK_WINDOW ( window ),
GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL );
- /* need to set a size, else the list will be small */
- gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
- gtk_container_set_border_width ( GTK_CONTAINER(dialog), 12 );
+
+ gtk_window_set_default_size ( GTK_WINDOW ( dialog ), 770, 412 );
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
+ gtk_container_set_border_width ( GTK_CONTAINER ( dialog ), 12 );
label = gtk_label_new (COLON(_("Select the reconciliation to associate to the selected transaction")));
gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
@@ -1805,7 +1806,7 @@
gtk_widget_destroy (dialog);
return reconcile_number;
}
-
+
dialogue_error ( _("Grisbi couldn't get the selection, operation canceled..."));
gtk_widget_destroy (dialog);
return 0;
@@ -1817,7 +1818,7 @@
* delete a transaction
* if it's a transfer, delete also the contra-transaction
* if it's a split, delete the childs
- *
+ *
* \param transaction The transaction to delete
* \param show_warning TRUE to ask if the user is sure, FALSE directly delete the transaction
* if TRUE, the form will be reset too
@@ -1866,22 +1867,22 @@
{
if (gsb_data_transaction_get_mother_transaction_number (transaction_number))
{
- gchar* tmpstr = g_strdup_printf (
+ gchar* tmpstr = g_strdup_printf (
_("Do you really want to delete the child of the transaction with party '%s' ?"),
gsb_data_payee_get_name ( gsb_data_transaction_get_party_number ( transaction_number),
FALSE ));
if ( !question_yes_no_hint ( _("Delete a transaction"),
tmpstr,
GTK_RESPONSE_NO ))
- {
+ {
g_free(tmpstr);
return FALSE;
- }
+ }
g_free(tmpstr);
}
else
{
- gchar *tmpstr = g_strdup_printf (
+ gchar *tmpstr = g_strdup_printf (
_("Do you really want to delete transaction with party '%s' ?"),
gsb_data_payee_get_name ( gsb_data_transaction_get_party_number ( transaction_number),
FALSE ));
@@ -2004,7 +2005,7 @@
* Delete the transaction from the tree view
* if it's a transfer, delete the contra transaction from the tree view
* if it's a split, delete a the children and if necessary the contra transactions
- *
+ *
* don't do any check about possible or marked... check before
* do nothing in memory, only on the tree view
*
@@ -2057,8 +2058,8 @@
/**
* Pop up a menu with several actions to apply to current transaction.
- *
- * \param
+ *
+ * \param
*
*/
void popup_transaction_context_menu ( gboolean full, int x, int y )
@@ -2109,7 +2110,7 @@
GTK_ICON_SIZE_MENU ));
g_signal_connect ( G_OBJECT(menu_item), "activate", remove_transaction, NULL );
if ( !full
- ||
+ ||
gsb_data_transaction_get_marked_transaction (transaction_number) == OPERATION_RAPPROCHEE
||
gsb_data_transaction_get_marked_transaction (transaction_number) == OPERATION_TELERAPPROCHEE )
@@ -2156,7 +2157,7 @@
if ( !full
||
!mi_full
- ||
+ ||
gsb_data_transaction_get_marked_transaction (transaction_number) == OPERATION_RAPPROCHEE
||
gsb_data_transaction_get_marked_transaction (transaction_number) == OPERATION_TELERAPPROCHEE )
@@ -2164,7 +2165,7 @@
gtk_menu_append ( menu, menu_item );
/* Add accounts submenu */
- gtk_menu_item_set_submenu ( GTK_MENU_ITEM(menu_item),
+ gtk_menu_item_set_submenu ( GTK_MENU_ITEM(menu_item),
GTK_WIDGET(gsb_account_create_menu_list (GTK_SIGNAL_FUNC(move_selected_operation_to_account), FALSE, FALSE)) );
@@ -2174,7 +2175,7 @@
/* Change cell content. */
menu_item = gtk_menu_item_new_with_label ( _("Change cell content") );
if ( full )
- gtk_menu_item_set_submenu ( GTK_MENU_ITEM ( menu_item ),
+ gtk_menu_item_set_submenu ( GTK_MENU_ITEM ( menu_item ),
GTK_WIDGET ( gsb_gui_create_cell_contents_menu ( x, y ) ) );
gtk_widget_set_sensitive ( menu_item, full );
gtk_menu_append ( menu, menu_item );
@@ -2190,7 +2191,7 @@
* Create and return a menu that contains all cell content types.
* When a type is selected, the cell that triggered this pop-up menu
* is changed accordingly.
- *
+ *
* \param x Horizontal coordinate of the cell that will be modified.
* \param y Vertical coordinate of the cell that will be modified.
*
@@ -2209,7 +2210,7 @@
g_object_set_data ( G_OBJECT (item), "x", GINT_TO_POINTER (x) );
g_object_set_data ( G_OBJECT (item), "y", GINT_TO_POINTER (y) );
- g_signal_connect ( G_OBJECT(item), "activate",
+ g_signal_connect ( G_OBJECT(item), "activate",
G_CALLBACK(gsb_gui_change_cell_content), GINT_TO_POINTER (i+1));
gtk_menu_append ( menu, item );
}
@@ -2274,7 +2275,7 @@
/**
- * Check that a transaction is selected
+ * Check that a transaction is selected
*
* \return TRUE on success, FALSE otherwise.
*/
@@ -2290,7 +2291,7 @@
/**
* Empty transaction form and select transactions tab.
*/
-gboolean new_transaction ()
+gboolean new_transaction ()
{
gtk_notebook_set_page ( GTK_NOTEBOOK ( notebook_general ), 1 );
gsb_form_escape_form();
@@ -2403,7 +2404,7 @@
gsb_form_transaction_validate_transfer ( new_transaction_number,
1,
gsb_data_transaction_get_contra_transaction_account (transaction_number));
-
+
/* we need to set the contra method of payment of the transfer */
gsb_data_transaction_set_method_of_payment_number ( gsb_data_transaction_get_contra_transaction_number (new_transaction_number),
gsb_data_transaction_get_method_of_payment_number (gsb_data_transaction_get_contra_transaction_number (transaction_number)));
@@ -2452,8 +2453,8 @@
if (! assert_selected_transaction()) return FALSE;
source_account = gsb_gui_navigation_get_current_account ();
- target_account = GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT(menu_item),
- "account_number" ) );
+ target_account = GPOINTER_TO_INT ( gtk_object_get_data ( GTK_OBJECT(menu_item),
+ "account_number" ) );
if ( gsb_transactions_list_move_transaction_to_account ( gsb_data_account_get_current_transaction_number (source_account),
target_account ))
@@ -2495,7 +2496,7 @@
if (! assert_selected_transaction()) return;
source_account = gsb_gui_navigation_get_current_account ();
- target_account = GPOINTER_TO_INT ( account );
+ target_account = GPOINTER_TO_INT ( account );
if ( gsb_transactions_list_move_transaction_to_account ( gsb_data_account_get_current_transaction_number (source_account),
target_account ))
@@ -3018,7 +3019,7 @@
}
tmp_list = tmp_list -> next;
}
-
+
selected_transaction = transaction_list_select_get ();
/* now we can sort the list */
@@ -3122,7 +3123,7 @@
||
i == current_account)
{
- gsb_data_account_set_nb_rows ( i,
+ gsb_data_account_set_nb_rows ( i,
rows_number );
}
list_tmp = list_tmp -> next;
@@ -3134,17 +3135,17 @@
-/**
+/**
* check if the transaction given in param should be visible or not
* according to the account and the current line
* this function is called to filter the model for each line in transaction_list_filter
* so need to be very fast
- *
+ *
* \param transaction_number the pointer in the model, usually a transaction, but can be archive
* \param account_number account number
* \param line_in_transaction the line in the transaction (0, 1, 2 or 3)
* \param what_is_line IS_TRANSACTION / IS_ARCHIVE
- *
+ *
* \return TRUE if the transaction should be shown, FALSE else
* */
gboolean gsb_transactions_list_transaction_visible ( gpointer transaction_ptr,
@@ -3192,9 +3193,9 @@
/*
* get the real name of the category of the transaction
* so return split of transaction, transfer : ..., categ : under_categ
- *
+ *
* \param transaction the adr of the transaction
- *
+ *
* \return the real name. It returns a newly allocated string which must be
* freed when no more used.
* */
Index: parametres.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parametres.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -d -r1.184 -r1.185
--- parametres.c 2 Nov 2008 16:55:37 -0000 1.184
+++ parametres.c 8 Dec 2008 14:39:00 -0000 1.185
@@ -106,8 +106,8 @@
GtkWidget *tree_view;
/* Create model */
- preference_tree_model = gtk_tree_store_new (3,
- G_TYPE_STRING,
+ preference_tree_model = gtk_tree_store_new (3,
+ G_TYPE_STRING,
G_TYPE_INT,
G_TYPE_INT );
@@ -121,18 +121,18 @@
tree_view = gtk_tree_view_new();
g_signal_connect ( G_OBJECT (tree_view ), "destroy",
G_CALLBACK ( gtk_widget_destroyed), &tree_view );
- gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
GTK_TREE_MODEL (preference_tree_model));
g_object_unref (G_OBJECT(preference_tree_model));
/* Make column */
cell = gtk_cell_renderer_text_new ();
- column =
+ column =
gtk_tree_view_column_new_with_attributes ("Categories",
cell,
"text", 0,
NULL);
- gtk_tree_view_column_add_attribute ( GTK_TREE_VIEW_COLUMN(column), cell,
+ gtk_tree_view_column_add_attribute ( GTK_TREE_VIEW_COLUMN(column), cell,
"weight", 2 );
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view),
@@ -141,12 +141,12 @@
/* Handle select */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
- g_signal_connect (selection, "changed",
- ((GCallback)selectionne_liste_preference),
+ g_signal_connect (selection, "changed",
+ ((GCallback)selectionne_liste_preference),
preference_tree_model);
/* Choose which entries will be selectable */
- gtk_tree_selection_set_select_function ( selection, preference_selectable_func,
+ gtk_tree_selection_set_select_function ( selection, preference_selectable_func,
NULL, NULL );
/* Put the tree in the scroll */
@@ -216,21 +216,21 @@
devel_debug_int (page);
/* Create dialog */
- fenetre_preferences = gtk_dialog_new_with_buttons (_("Grisbi preferences"),
- GTK_WINDOW ( window ),
- GTK_DIALOG_MODAL,
- /* FIXME: untill we implement the help system, this is useless */
- /* GTK_STOCK_HELP, GTK_RESPONSE_HELP, */
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
- NULL);
- gtk_window_set_default_size (GTK_WINDOW (fenetre_preferences), -1, 500 );
- gtk_window_set_position ( GTK_WINDOW (fenetre_preferences), GTK_WIN_POS_CENTER );
+ fenetre_preferences = gtk_dialog_new_with_buttons (_("Grisbi preferences"),
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ NULL );
+
+ gtk_window_set_default_size ( GTK_WINDOW ( fenetre_preferences ), -1, 500 );
+ gtk_window_set_position ( GTK_WINDOW ( fenetre_preferences ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( fenetre_preferences ), TRUE );
g_signal_connect ( G_OBJECT (fenetre_preferences ), "destroy",
G_CALLBACK ( gtk_widget_destroyed), &fenetre_preferences );
/* Create List & Tree for topics */
- tree = create_preferences_tree();
+ tree = create_preferences_tree();
hpaned = gtk_hpaned_new();
g_signal_connect ( G_OBJECT (hpaned ), "destroy",
G_CALLBACK ( gtk_widget_destroyed), &hpaned );
@@ -257,7 +257,7 @@
&iter,
0, _("Main"),
1, NOT_A_PAGE,
- 2, 800,
+ 2, 800,
-1);
/* File tab */
@@ -266,7 +266,7 @@
&iter2,
0, _("Files"),
1, FILES_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_fichier(), NULL);
/* by default, we select that first page */
@@ -276,7 +276,7 @@
&iter2,
0, _("Archives"),
1, ARCHIVE_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_archive_config_create (), NULL);
@@ -285,7 +285,7 @@
&iter2,
0, _("Import"),
1, IMPORT_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_importation(), NULL);
@@ -294,7 +294,7 @@
&iter2,
0, _("Programs"),
1, SOFTWARE_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_programmes(), NULL);
@@ -304,7 +304,7 @@
&iter,
0, _("Display"),
1, NOT_A_PAGE,
- 2, 800,
+ 2, 800,
-1);
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
@@ -312,7 +312,7 @@
&iter2,
0, _("Fonts & logo"),
1, FONTS_AND_LOGO_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_display_fonts(), NULL);
@@ -321,7 +321,7 @@
&iter2,
0, _("Messages & warnings"),
1, MESSAGES_AND_WARNINGS_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_messages_and_warnings(), NULL);
@@ -330,7 +330,7 @@
&iter2,
0, _("Addresses & titles"),
1, ADDRESSES_AND_TITLES_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_display_addresses(), NULL);
@@ -339,7 +339,7 @@
&iter2,
0, _("Totals currencies"),
1, TOTALS_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_currency_config_create_totals_page(), NULL);
@@ -348,7 +348,7 @@
&iter2,
0, _("Toolbars"),
1, TOOLBARS_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, tab_display_toolbar(), NULL);
@@ -358,7 +358,7 @@
&iter,
0, _("Transactions"),
1, NOT_A_PAGE,
- 2, 800,
+ 2, 800,
-1);
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
@@ -366,9 +366,9 @@
&iter2,
0, _("List behavior"),
1, TRANSACTIONS_PAGE,
- 2, 400,
+ 2, 400,
-1);
- gtk_notebook_append_page (preference_frame,
+ gtk_notebook_append_page (preference_frame,
GTK_WIDGET(onglet_affichage_operations()), NULL);
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
@@ -376,7 +376,7 @@
&iter2,
0, _("Reconciliation"),
1, RECONCILIATION_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_reconcile_config_create(), NULL);
@@ -385,7 +385,7 @@
&iter2,
0, _("Sort for reconciliation"),
1, RECONCILIATION_SORT_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_reconcile_sort_config_create(), NULL);
@@ -395,7 +395,7 @@
&iter,
0, _("Transaction form"),
1, NOT_A_PAGE,
- 2, 800,
+ 2, 800,
-1);
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
@@ -403,7 +403,7 @@
&iter2,
0, _("Content"),
1, TRANSACTION_FORM_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_form_config_create_page(), NULL);
@@ -412,7 +412,7 @@
&iter2,
0, _("Behavior"),
1, TRANSACTION_FORM_BEHAVIOR_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_diverse_form_and_lists(), NULL);
@@ -421,7 +421,7 @@
&iter2,
0, _("Completion"),
1, TRANSACTION_FORM_COMPLETION_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, onglet_form_completion(), NULL);
@@ -431,7 +431,7 @@
&iter,
0, _("Resources"),
1, NOT_A_PAGE,
- 2, 800,
+ 2, 800,
-1);
gtk_tree_store_append (GTK_TREE_STORE (preference_tree_model), &iter2, &iter);
@@ -439,7 +439,7 @@
&iter2,
0, _("Scheduler"),
1, SCHEDULER_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_config_scheduler_page (), NULL);
@@ -448,7 +448,7 @@
&iter2,
0, _("Currencies"),
1, CURRENCIES_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_currency_config_create_page(), NULL);
@@ -457,7 +457,7 @@
&iter2,
0, _("Currencies links"),
1, CURRENCY_LINKS_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_currency_link_config_create_page (), NULL);
@@ -466,7 +466,7 @@
&iter2,
0, _("Banks"),
1, BANKS_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_bank_create_page (FALSE), NULL);
@@ -475,7 +475,7 @@
&iter2,
0, _("Financial years"),
1, FINANCIAL_YEARS_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_fyear_config_create_page(), NULL);
@@ -484,13 +484,13 @@
&iter2,
0, _("Payment methods"),
1, METHODS_OF_PAYMENT_PAGE,
- 2, 400,
+ 2, 400,
-1);
gtk_notebook_append_page (preference_frame, gsb_payment_method_config_create (), NULL);
gtk_widget_show_all ( hpaned );
gtk_container_set_border_width ( GTK_CONTAINER(hpaned), 6 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(fenetre_preferences) -> vbox ),
+ gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(fenetre_preferences) -> vbox ),
hpaned, TRUE, TRUE, 0);
/* select the page */
@@ -662,14 +662,14 @@
&(etat.dernier_fichier_auto), NULL, NULL );
g_signal_connect ( G_OBJECT (button ), "destroy",
G_CALLBACK ( gtk_widget_destroyed), &button );
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), button,
+ gtk_box_pack_start ( GTK_BOX ( paddingbox ), button,
FALSE, FALSE, 0 );
button = gsb_automem_checkbutton_new (_("Automatically save on exit"),
&(etat.sauvegarde_auto), NULL, NULL);
g_signal_connect ( G_OBJECT (button ), "destroy",
G_CALLBACK ( gtk_widget_destroyed), &button );
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), button,
+ gtk_box_pack_start ( GTK_BOX ( paddingbox ), button,
FALSE, FALSE, 0 );
/* Warn if file is used by someone else? */
@@ -843,7 +843,7 @@
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- vbox_pref = new_vbox_with_title_and_icon ( _("Programs"), "exec.png" );
+ vbox_pref = new_vbox_with_title_and_icon ( _("Programs"), "exec.png" );
paddingbox = new_paddingbox_with_title (vbox_pref, FALSE, _("Web"));
@@ -871,7 +871,7 @@
paddingbox = new_paddingbox_with_title (vbox_pref, FALSE, _("LaTeX support (old print system)"));
-
+
table = gtk_table_new ( 0, 2, FALSE );
gtk_box_pack_start ( GTK_BOX ( paddingbox ), table, FALSE, FALSE, 0 );
gtk_table_set_col_spacings ( GTK_TABLE(table), 6 );
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- import.c 26 Nov 2008 20:52:53 -0000 1.255
+++ import.c 8 Dec 2008 14:39:00 -0000 1.256
@@ -22,7 +22,7 @@
#include "include.h"
-
+
/*START_INCLUDE*/
#include "import.h"
#include "./utils.h"
@@ -568,11 +568,11 @@
}
type = autodetect_file_type ( iterator -> data, pointeur_char );
-
+
/* passe par un fichier temporaire pour bipasser le bug libofx */
if ( ! strcmp ( type, "OFX" ) )
{
- nom_fichier = g_strconcat (g_get_tmp_dir (),G_DIR_SEPARATOR_S,
+ nom_fichier = g_strconcat (g_get_tmp_dir (),G_DIR_SEPARATOR_S,
g_path_get_basename ( iterator -> data ), NULL);
if (! gsb_import_set_tmp_file (nom_fichier, pointeur_char ) )
{
@@ -713,10 +713,10 @@
if ( gtk_dialog_run ( GTK_DIALOG (dialog ) ) == GTK_RESPONSE_ACCEPT )
filenames = gtk_file_chooser_get_filenames ( GTK_FILE_CHOOSER (dialog));
-
+
/* save charmap */
charmap_imported = g_strdup (go_charmap_sel_get_encoding ( (GOCharmapSel * )go_charmap_sel ));
-
+
gsb_file_update_last_path (file_selection_get_last_directory (GTK_FILE_CHOOSER (dialog), TRUE));
gtk_widget_destroy (dialog);
return filenames;
@@ -1377,7 +1377,7 @@
gsb_data_import_rule_set_action (rule, compte -> action);
}
if ( ! strcmp ( compte -> origine, "OFX" ) )
- {
+ {
g_remove (compte -> real_filename);
}
list_tmp = list_tmp -> next;
@@ -1431,7 +1431,7 @@
* to another transaction.
* we can find that transactions because they have contra_transaction_number to -1
* and the bank_references is the name of the contra account, with [Â ]
- *
+ *
* that function try to find the contra-transaction and create the link
*
* */
@@ -1786,9 +1786,9 @@
{
struct struct_ope_importation *imported_transaction;
imported_transaction = list_tmp -> data;
-
+
/* on remplace ici le caractère utilisé pour contourner le bug de la libofx "&"
- par le bon caractère "°"
+ par le bon caractère "°"
regarder si on ne pourrait pas utiliser imported_account -> type_de_compte */
if ( g_ascii_strcasecmp (imported_account -> origine, "OFX") == 0 && imported_transaction -> cheque )
imported_transaction -> tiers = my_strdelimit (imported_transaction -> tiers, "&", "°");
@@ -1958,13 +1958,15 @@
dialog = gtk_dialog_new_with_buttons ( _("Confirmation of importation of transactions"),
- GTK_WINDOW ( window),
+ GTK_WINDOW ( window ),
GTK_DIALOG_MODAL,
GTK_STOCK_OK,
GTK_RESPONSE_OK,
NULL );
- gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+
+ gtk_window_set_default_size ( GTK_WINDOW ( dialog ), 770, 412 );
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
gtk_container_set_border_width ( GTK_CONTAINER(dialog), 12 );
label = gtk_label_new ( _("Some imported transactions seem to be already saved. Please select the transactions to import." ));
@@ -2279,11 +2281,11 @@
/* récupération des notes */
gsb_data_transaction_set_notes ( transaction_number,
imported_transaction -> notes );
-
+
if (origine && g_ascii_strcasecmp (origine, "OFX") == 0 )
{
gint payment_number = 0;
-
+
switch ( imported_transaction -> type_de_transaction )
{
case OFX_CHECK:
@@ -2356,7 +2358,7 @@
case OFX_CREDIT:
case OFX_OTHER:
break;
- }
+ }
}
else
{
@@ -2763,16 +2765,17 @@
GtkTreeViewColumn *column;
+ dialog = gtk_dialog_new_with_buttons ( _("Orphaned transactions"),
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_APPLY, 1,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK, GTK_RESPONSE_OK,
+ NULL );
- dialog = gtk_dialog_new_with_buttons ( _("Orphaned transactions"),
- GTK_WINDOW ( window ),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_APPLY, 1,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
- NULL );
- gtk_window_set_default_size (GTK_WINDOW (dialog), 770, 412 );
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+ gtk_window_set_default_size ( GTK_WINDOW ( dialog ), 770, 412 );
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
gtk_container_set_border_width ( GTK_CONTAINER(dialog), 12 );
label = gtk_label_new ( _("Mark transactions you want to add to the list and click the add button"));
@@ -3264,14 +3267,14 @@
{
gchar * pointeur_char;
GError * error = NULL;
-
+
if ( ! g_file_get_contents ( filename, &pointeur_char, NULL, &error ) )
{
g_print ( _("Unable to read file: %s\n"), error -> message);
i++;
continue;
}
- nom_fichier = g_strconcat (g_get_tmp_dir (),G_DIR_SEPARATOR_S,
+ nom_fichier = g_strconcat (g_get_tmp_dir (),G_DIR_SEPARATOR_S,
g_path_get_basename ( filename ), NULL);
if (! gsb_import_set_tmp_file (nom_fichier, pointeur_char ) )
{
@@ -3344,7 +3347,7 @@
gsb_data_import_rule_set_last_file_name (rule, filename);
if ( ! strcmp ( type, "OFX" ) )
- {
+ {
g_remove (account -> real_filename);
}
@@ -3388,12 +3391,15 @@
if (!rule)
return NULL;
- dialog = gtk_dialog_new_with_buttons (_("Import a file with a rule"), GTK_WINDOW (window),
- GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
- NULL);
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+ dialog = gtk_dialog_new_with_buttons (_("Import a file with a rule"),
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ NULL );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
/* text for paddingbox */
tmpstr = g_strdup_printf (_("Properties of the rule : %s\n"),
@@ -3461,9 +3467,9 @@
G_CALLBACK (gsb_import_by_rule_get_file), entry );
gtk_table_attach ( GTK_TABLE(table), button, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, 0, 0, 0 );
-
+
g_object_set_data ( G_OBJECT(entry), "rule", GINT_TO_POINTER ( rule ) );
-
+
gtk_widget_show_all (dialog);
if ( gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
array = g_strsplit ( gtk_entry_get_text (GTK_ENTRY (entry)),
@@ -3525,9 +3531,9 @@
{
gchar * contenu_fichier;
GError * error = NULL;
-
+
contenu_fichier = my_strdelimit (pointeur_char, "°", "&");
-
+
/* create tmp file */
if ( ! g_file_set_contents ( filename, contenu_fichier, -1, &error ) )
{
@@ -3535,7 +3541,7 @@
g_print ( _("Unable to create tmp file: %s\n"), error -> message);
return FALSE;
}
-
+
g_free (contenu_fichier);
return TRUE;
}
Index: tiers_onglet.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/tiers_onglet.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- tiers_onglet.c 23 Nov 2008 11:25:00 -0000 1.140
+++ tiers_onglet.c 8 Dec 2008 14:39:00 -0000 1.141
@@ -497,11 +497,16 @@
title = g_strdup_printf ( _("Properties for %s"), gsb_data_payee_get_name(payee_number,
TRUE));
- dialog = gtk_dialog_new_with_buttons ( title, GTK_WINDOW (window), GTK_DIALOG_MODAL,
+
+ dialog = gtk_dialog_new_with_buttons ( title,
+ GTK_WINDOW ( window ),
+ GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_NO,
GTK_STOCK_APPLY, GTK_RESPONSE_OK,
- NULL);
- gtk_window_set_position ( GTK_WINDOW (dialog), GTK_WIN_POS_CENTER );
+ NULL );
+
+ gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
+ gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
@@ -567,7 +572,7 @@
else
{
gchar * message;
-
+
message = g_strdup_printf ( _("You tried to rename current payee to '%s' "
"but this payee already exists. Please "
"choose another name."),
- Previous message: [grisbi-cvs] grisbi/src gsb_bank.c, 1.13, 1.14 gsb_crypt.c, 1.12, 1.13 gsb_currency.c, 1.30, 1.31 gsb_currency_config.c, 1.38, 1.39 gsb_payment_method_config.c, 1.27, 1.28
- Next message: [grisbi-cvs] grisbi/src help.c,1.81,1.82
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list