[grisbi-cvs] [git push]Grisbi branch master updated. upstream_version_1_0_0-168-gf918e9f
Rémi Cardona
noreply at sourceforge.net
Tue Mar 18 22:33:20 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grisbi".
The branch, master has been updated
via f918e9f341e52e4ed0d56255e2a1d460486433c4 (commit)
via 5f8a792593be2c91174467582ce7994a963b1377 (commit)
via 689a516eed9bea73f517af6c671ca733c3b712fb (commit)
via 9144263748b430d6cb59cc11119dbd7f5ee3bf9e (commit)
via c71b3b4a7a155ada1cf59436614eedb34632ed2f (commit)
via d17b2db83aace78ac741c199789d0e01c98f9c00 (commit)
via f13ca5a3dd2b52cdcdbc1a76632b831b39ae16dd (commit)
via fcfdde4d81532912bda5ef5c9a3b605ed1960af2 (commit)
via 1dfaf969ee50dfd20777a47262f33c73c6448523 (commit)
via 27144b666f118d33bae3cef80cc2d2e52abfce98 (commit)
via 7982af323a7eb83f203fbab1dd466c7e6463ae79 (commit)
via 41d0bd01667c68b0f58da6393186944e0e3c8ae7 (commit)
via 2f325e7e53f7720ace1117699e3db73235244da8 (commit)
via 0f267373274aab3d08185e7218f8e04ba2bc2980 (commit)
via 3702d40d1fed52627761b4fc186bb5742020cb27 (commit)
via f30025c0ad469f848f9a1a852bd2dcdcd5a6fe4a (commit)
via fe5dcee4b0fcaa2698f094e0b8fbdc6465f5c2ea (commit)
via 670d8f1657bf01d86fd8fd932fea17b3774dd5cd (commit)
via 8a2c9acf7221516b3a3d302fd94f4256f559c002 (commit)
via f405a6df4c53689c009ceefe8bfd0b5f74315b5c (commit)
via a62b6031f5f3930231fa02603e4edcaf7958e761 (commit)
via 94a72db586ac3b35a8c125f9c43a27543ed7e197 (commit)
via d15f5eb0bc3797c2f4e5bca4dd998537c27cd8f9 (commit)
via 5b074a11ed79f7039484e471235271a62da38007 (commit)
via c823cf4d1a6394620d4a6bffda7b3b03f1fbff0f (commit)
via 1f0dea9915f7b56ae3870680606153a35646eb24 (commit)
via feb1581ddc116570a78fb452be5f8481fab54680 (commit)
via c723da299b23d1f83a8328eeb5c4a9d73e7146af (commit)
via d02d6724d4425775f649b027c2117a29f773a179 (commit)
via 632a42231c0ee6abc9bdc82822591082f0448e2f (commit)
via f0da5af07b6e79f0eff13184e846387e4aaec90a (commit)
via 303500083f7fe2052f6fc8b7fb519936771082ae (commit)
via 5c7493e0efacdf9034988fc04b2266649e886f41 (commit)
via 6da4771ea4727f62f2d57ae4d47eb9d2484fad25 (commit)
via 4c72dc05d4fec08c8ccb9752c04e7de24f732097 (commit)
via 29e789361412efc336e332c7607664e7178ccb42 (commit)
via 075719238d248aef1487c84227e2cd57df25f3a9 (commit)
via d76083d1a4813fb9bad477a63de34cf27b4d8c57 (commit)
via a98848e72d435e99828eb4c0adcb5fa7e527c9de (commit)
via 6fa17d242d9bbfbc4297fe111dc8f6e384254d43 (commit)
via 484a4e5a04e0316465ef86f50a9944d51abc5f23 (commit)
via 31e2aff29b0e32ef92660635b241a0b87b59b45b (commit)
via 86b9e66b42955ef93d9ff1059aec47cfc8aabf91 (commit)
via 5b74778ca912c81955e689c2b2a52921238d0fe1 (commit)
via 4ad1df5ed567fa5e11cbc9d2a76035974ffbfbe2 (commit)
via 9f268e13e7d2f0c3fe88d6d7b25c600df919ae7f (commit)
via 435ffd08e15f598179dd72b650865b6011ab632c (commit)
via ed5033f753783c7e9d602959a94ff42d9d6cafad (commit)
via 98f1fcef83cd6efcaad97250ea6835d46ba4ea53 (commit)
via ab236a1ea7f1bade12f28cab15fa356d951a6e74 (commit)
via 4c1c1d7ab680ad1cc4807fe39b8878fea54ec5aa (commit)
via 782692ebea6a26016a38a1f0447287d167fad98e (commit)
via babb5c62b494cb1b5ec010e3dd2694ede2b4284f (commit)
via fa6c48c6f8f066496af4fd6765b9294ae2023f27 (commit)
via 1af914a6668aed3c6c892ae5bc6a93647e35b24a (commit)
via 30594e2be8b46051c12da956acfc4a19bd03e5ec (commit)
via f83b37c4ac4edfdcecc2d5a06a26e1e14900080a (commit)
via be1c6b8808cd88584eab6917033b9980aed10954 (commit)
via c3c4601d9e9c00da49228d78f55a2b1ee2e63ff8 (commit)
via 58778bf0795e1501bdde89291d3c5fd022107334 (commit)
via f69643b4418a1cac29e175816dd808b5ab8991ff (commit)
via b40c730dc8bcfc5658b7ef50aea4c4e861e83e98 (commit)
via 2c2faaf9f0c7ce7ebe8aaa40562d5fba94556d5d (commit)
via f259f242f762fdec307aeabbda05b6fd9fb69455 (commit)
via 18e80d64820f7b1dbc7b86577fed1e97ea0d75a0 (commit)
via fad7426a214e5c48b13571a8d5e5916e25488f60 (commit)
via 05a858ea82eaa0de3e265042e073de4b9f9508e5 (commit)
via dd25d65605fc0df8898b8ac1b3f653c2e831bd49 (commit)
via 203507710d54072dac8cc95b82004a80926c6d28 (commit)
via 1a76e57c62f270109870da1728c6316fae944f7f (commit)
via ab9fdc7a100b53cfd48ad80edc75be6c983cc6af (commit)
via 2f1f80a236a9bd3677cdcb9a96b8b9562420bbc6 (commit)
via 569bc2304308c1319db9f002aabe7a1700a2bbb7 (commit)
via be221317ce10329721303e4fa6a4cb814bdf671b (commit)
via 557534ff927b5842df6a2b5f4c9b704782a9abd0 (commit)
via 9ddb70a0e904ce4244962ade90f77f102620d6a9 (commit)
via 54df03d51d463dc56377bcaedc0ca606179ad4b3 (commit)
via cf3f446b7270380430b850c0c8f13ea51b0e5952 (commit)
via 880a17dfdfb4c9aad9ccce3226dcdc0bc36dcd82 (commit)
via fef841b810e39c136817c95c7cbef661e5a50eab (commit)
via 87d34c4a5cca897e29528dbf904452fcc15a6ef4 (commit)
from b194749970ff89f803f8604033efa3b5e3870060 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=
commit f918e9f341e52e4ed0d56255e2a1d460486433c4
Merge: 5f8a792 9144263
Author: Rémi Cardona <remi at gentoo.org>
Date: Tue Mar 18 22:25:20 2014 +0100
Merge upstream_version_1_0_0 into master
diff --cc configure.ac
index 2136c7f,85edcfb..0260109
--- a/configure.ac
+++ b/configure.ac
@@@ -1,11 -1,11 +1,11 @@@
dnl Process this file with autoconf to produce a configure script.
m4_define(grisbi_major_version, 1)
-m4_define(grisbi_minor_version, 0)
-m4_define(grisbi_micro_version, 0)
+m4_define(grisbi_minor_version, 1)
+m4_define(grisbi_micro_version, 1)
m4_define(grisbi_version, grisbi_major_version.grisbi_minor_version.grisbi_micro_version)
- AC_INIT([grisbi],[grisbi_version],[http://grisbi.tuxfamily.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.fr.html])
+ AC_INIT([grisbi],[grisbi_version],[http://www.grisbi.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.php])
AC_CONFIG_SRCDIR(src/main.c)
AC_CONFIG_HEADERS([config.h])
diff --cc src/accueil.c
index b31e444,436994f..60b02ff
--- a/src/accueil.c
+++ b/src/accueil.c
@@@ -1079,6 -1085,7 +1082,7 @@@ void gsb_main_page_affiche_ligne_du_com
gtk_misc_set_alignment ( GTK_MISC ( pLabel ), MISC_LEFT, MISC_VERT_CENTER );
gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), pLabel );
gtk_widget_set_style ( pLabel, pStyleLabelNomCompte );
- gtk_style_unref ( pStyleLabelNomCompte );
++ g_object_unref ( pStyleLabelNomCompte );
/* Création d'une boite à évènement qui sera rattachée au nom du compte */
pEventBox = gtk_event_box_new ();
@@@ -1138,6 -1145,7 +1142,7 @@@
}
}
gtk_widget_set_style ( pLabel, pStyleLabelSoldePointe );
- gtk_style_unref ( pStyleLabelSoldePointe );
++ g_object_unref ( pStyleLabelSoldePointe );
/* Création d'une boite à évènement qui sera rattachée au solde pointé du compte */
pEventBox = gtk_event_box_new ();
@@@ -1197,6 -1205,7 +1202,7 @@@
}
}
gtk_widget_set_style ( pLabel, pStyleLabelSoldeCourant );
- gtk_style_unref ( pStyleLabelSoldeCourant );
++ g_object_unref ( pStyleLabelSoldeCourant );
/* Création d'une boite à évènement qui sera rattachée au solde courant du compte */
pEventBox = gtk_event_box_new ();
diff --cc src/bet_graph.c
index e482b14,31d60fb..6526f3f
--- a/src/bet_graph.c
+++ b/src/bet_graph.c
@@@ -1917,10 -1954,13 +1917,6 @@@ GtkToolItem *bet_graph_button_menu_new
struct_bet_graph_button *self;
struct_bet_graph_prefs *prefs = NULL;
- /* Initialisation d'un nouveau GtkBuilder */
- if ( !bet_graph_initialise_builder ( ) )
- return NULL;
-
- /* boite qui contiendra les deux boutons */
- box = gtk_hbox_new ( FALSE, 0 );
-
- /* boite qui contiendra le bouton actif */
- box_button = gtk_vbox_new ( TRUE, 0 );
- gtk_box_pack_start ( GTK_BOX ( box ), box_button, FALSE, FALSE, 0 );
-
/* initialisation des préférences */
if ( strcmp ( type_graph, "forecast_graph" ) == 0 )
{
diff --cc src/etats_config.c
index 10505e5,02dd0ec..ebc0338
--- a/src/etats_config.c
+++ b/src/etats_config.c
@@@ -3505,233 -6521,964 +3505,233 @@@ static void etats_config_recupere_info_
}
-
/**
+ * ajoute les combobox pour les devises
*
+ * \param
*
+ * \return
+ */
+void etats_config_onglet_affichage_devises_make_combobox ( void )
+{
+ GtkWidget *hbox;
+ GtkWidget *button;
+
+ hbox = etats_prefs_widget_get_widget_by_name ( "hbox_devise_general_etat", NULL );
+ button = gsb_currency_make_combobox (FALSE);
+ g_object_set_data ( G_OBJECT ( hbox ), "button", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+
+ hbox = etats_prefs_widget_get_widget_by_name ( "hbox_devise_tiers_etat", NULL );
+ button = gsb_currency_make_combobox (FALSE);
+ g_object_set_data ( G_OBJECT ( hbox ), "button", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+
+ hbox = etats_prefs_widget_get_widget_by_name ( "hbox_devise_categ_etat", NULL );
+ button = gsb_currency_make_combobox (FALSE);
+ g_object_set_data ( G_OBJECT ( hbox ), "button", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+
+ hbox = etats_prefs_widget_get_widget_by_name ( "hbox_devise_ib_etat", NULL );
+ button = gsb_currency_make_combobox (FALSE);
+ g_object_set_data ( G_OBJECT ( hbox ), "button", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+
+ hbox = etats_prefs_widget_get_widget_by_name ( "hbox_devise_montant_etat", NULL );
+ button = gsb_currency_make_combobox (FALSE);
+ g_object_set_data ( G_OBJECT ( hbox ), "button", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+}
+/*END_ONGLETS*/
+/**
+ * Initialise la boite de dialogue propriétés de l'état.
*
+ * \param
*
+ * \return
*/
-GtkWidget *onglet_affichage_etat_operations ( void )
+static gboolean etats_config_initialise_dialog_from_etat ( gint report_number )
{
- GtkWidget * table, * vbox_onglet, * menu, * menu_item, * paddingbox;
-
- vbox_onglet = new_vbox_with_title_and_icon ( _("Transactions display"), "transdisplay.png" );
- gtk_widget_show ( vbox_onglet );
+ /* onglet période */
+ etats_config_initialise_onglet_periode ( report_number );
- /* afficher ou non les opés */
+ /* onglet virements */
+ etats_config_initialise_onglet_virements ( report_number );
- bouton_afficher_opes = gtk_check_button_new_with_label ( _("Display transactions") );
- gtk_box_pack_start ( GTK_BOX ( vbox_onglet ), bouton_afficher_opes, FALSE, FALSE, 0 );
+ /* onglet comptes */
+ etats_config_initialise_onglet_comptes ( report_number );
- vbox_show_transactions = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start ( GTK_BOX (vbox_onglet),
- vbox_show_transactions,
- FALSE, FALSE, 0);
- g_signal_connect ( G_OBJECT (bouton_afficher_opes),
- "toggled",
- G_CALLBACK (sens_desensitive_pointeur),
- vbox_show_transactions );
+ /* onglet tiers */
+ etats_config_initialise_onglet_tiers ( report_number );
- /* demande les détails affichés dans les opérations */
- paddingbox = new_paddingbox_with_title ( vbox_show_transactions, FALSE,
- _("Include following information") );
- /* connection pour rendre sensitif la frame */
- table = gtk_table_new ( 12, 3, FALSE );
- gtk_box_pack_start ( GTK_BOX (paddingbox), table, FALSE, FALSE, 0 );
+ /* onglet Categories */
+ etats_config_initialise_onglet_categ_budget ( report_number, TRUE );
- bouton_afficher_no_ope = gtk_check_button_new_with_label ( _("transaction number") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_no_ope, 0, 1, 0, 1 );
+ /* onglet Budgets */
+ etats_config_initialise_onglet_categ_budget ( report_number, FALSE );
- bouton_afficher_date_opes = gtk_check_button_new_with_label ( _("date") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_date_opes, 1, 2, 0, 1 );
+ /* onglet Textes */
+ etats_config_initialise_onglet_textes ( report_number );
- bouton_afficher_value_date_opes = gtk_check_button_new_with_label ( _("value date") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_value_date_opes, 2, 3, 0, 1 );
+ /* onglet Montants */
+ etats_config_initialise_onglet_montants ( report_number );
- bouton_afficher_tiers_opes = gtk_check_button_new_with_label ( _("payee") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_tiers_opes, 0, 1, 1, 2 );
+ /* onglet modes de paiement */
+ etats_config_initialise_onglet_mode_paiement ( report_number );
- bouton_afficher_categ_opes = gtk_check_button_new_with_label ( _("category") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_categ_opes, 1, 2, 1, 2 );
+ /* onglet divers */
+ etats_config_initialise_onglet_divers ( report_number );
- bouton_afficher_sous_categ_opes = gtk_check_button_new_with_label ( _("sub-category") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_sous_categ_opes, 2, 3, 1, 2 );
+ /* onglet data grouping */
+ etats_config_initialise_onglet_data_grouping ( report_number );
- bouton_afficher_ib_opes = gtk_check_button_new_with_label ( _("budgetary line") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_ib_opes, 0, 1, 2, 3 );
+ /* onglet data separation */
+ etats_config_initialise_onglet_data_separation ( report_number );
- bouton_afficher_sous_ib_opes = gtk_check_button_new_with_label ( _("sub-budgetary line") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_sous_ib_opes, 1, 2, 2, 3 );
+ /* onglet generalites */
+ etats_config_initialise_onglet_affichage_generalites ( report_number );
- bouton_afficher_notes_opes = gtk_check_button_new_with_label ( _("notes") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_notes_opes, 2, 3, 2, 3 );
+ /* onglet titres */
+ etats_config_initialise_onglet_affichage_titres ( report_number );
- bouton_afficher_type_ope = gtk_check_button_new_with_label ( _("method of payment") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_type_ope, 0, 1, 3, 4 );
-
- bouton_afficher_no_cheque = gtk_check_button_new_with_label ( _("cheque/transfer number") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_no_cheque, 1, 2, 3, 4 );
+ /* onglet opérations */
+ etats_config_initialise_onglet_affichage_operations ( report_number );
- bouton_afficher_pc_opes = gtk_check_button_new_with_label ( _("voucher") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_pc_opes, 2, 3, 3, 4 );
-
- bouton_afficher_exo_opes = gtk_check_button_new_with_label ( _("financial year") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_exo_opes, 2, 3, 4, 5 );
-
- bouton_afficher_infobd_opes = gtk_check_button_new_with_label ( _("bank reference") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_infobd_opes, 0, 1, 4, 5 );
-
- bouton_afficher_no_rappr = gtk_check_button_new_with_label ( _("reconciliation reference") );
- gtk_table_attach_defaults ( GTK_TABLE ( table ), bouton_afficher_no_rappr, 1, 2, 4, 5 );
-
-
- /* on propose d'afficher le titre des colonnes */
- paddingbox = new_paddingbox_with_title ( vbox_show_transactions, FALSE, _("Columns") );
-
- bouton_afficher_titres_colonnes = gtk_check_button_new_with_label ( _("Display column titles") );
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), bouton_afficher_titres_colonnes, FALSE, FALSE, 0 );
-
- bouton_titre_changement = gtk_radio_button_new_with_label ( NULL, _("every section") );
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), bouton_titre_changement, FALSE, FALSE, 0 );
-
- bouton_titre_en_haut = gtk_radio_button_new_with_label ( gtk_radio_button_get_group ( GTK_RADIO_BUTTON ( bouton_titre_changement )),
- _("at the top of the report") );
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), bouton_titre_en_haut, FALSE, FALSE, 0 );
-
-
- /* mise en place du type de classement des opés */
- paddingbox = new_paddingbox_with_title ( vbox_show_transactions, FALSE, _("Sort transactions by") );
+ /* onglet devises */
+ etats_config_initialise_onglet_affichage_devises ( report_number );
- bouton_choix_classement_ope_etat = gtk_option_menu_new ();
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), bouton_choix_classement_ope_etat, FALSE, FALSE, 0 );
-
- menu = gtk_menu_new ();
-
- menu_item = gtk_menu_item_new_with_label ( _("date"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 0 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("value date"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 1 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("transaction number"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 2 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("payee"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 3 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("category"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 4 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("budgetary line"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 5 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("note"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 6 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("method of payment"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 7 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("cheque/transfer number"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 8 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("voucher"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 9 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("bank reference"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 10 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- menu_item = gtk_menu_item_new_with_label ( _("reconciliation reference"));
- g_object_set_data ( G_OBJECT ( menu_item ),
- "no_classement",
- GINT_TO_POINTER ( 11 ));
- gtk_menu_shell_append ( GTK_MENU_SHELL ( menu ),
- menu_item );
-
- gtk_option_menu_set_menu ( GTK_OPTION_MENU ( bouton_choix_classement_ope_etat ),
- menu );
-
-
- /* on propose de rendre clickable le détails des opérations */
- paddingbox = new_paddingbox_with_title ( vbox_show_transactions, FALSE, _("Clickable transactions") );
-
- bouton_rendre_ope_clickables = gtk_check_button_new_with_label ( _("Make transactions clickable"));
- gtk_box_pack_start ( GTK_BOX ( paddingbox ), bouton_rendre_ope_clickables, FALSE, FALSE, 0 );
-
-
- /* on met les connexions */
- g_signal_connect ( G_OBJECT ( bouton_afficher_categ_opes ),
- "toggled",
- G_CALLBACK ( sens_desensitive_pointeur ),
- bouton_afficher_sous_categ_opes );
- g_signal_connect ( G_OBJECT ( bouton_afficher_ib_opes ),
- "toggled",
- G_CALLBACK ( sens_desensitive_pointeur ),
- bouton_afficher_sous_ib_opes );
- g_signal_connect ( G_OBJECT ( bouton_afficher_titres_colonnes ),
- "toggled",
- G_CALLBACK ( sens_desensitive_pointeur ),
- bouton_titre_changement );
- g_signal_connect ( G_OBJECT ( bouton_afficher_titres_colonnes ),
- "toggled",
- G_CALLBACK ( sens_desensitive_pointeur ),
- bouton_titre_en_haut );
-
- gtk_widget_show_all ( vbox_onglet );
-
- return ( vbox_onglet );
+ /* return */
+ return TRUE;
}
-/******************************************************************************/
-/******************************************************************************/
-GtkWidget *onglet_affichage_etat_devises ( void )
-{
- GtkWidget *label;
- GtkWidget *hbox;
- GtkWidget *vbox_onglet;
-
-
- vbox_onglet = new_vbox_with_title_and_icon ( _("Totals currencies"), "currencies.png" );
- gtk_widget_show ( vbox_onglet );
-
-
- hbox = gtk_hbox_new ( FALSE,
- 5 );
- gtk_box_pack_start ( GTK_BOX ( vbox_onglet ),
- hbox,
- FALSE,
- FALSE,
- 0 );
- gtk_widget_show ( hbox );
-
- label = gtk_label_new ( _("General totals currency: ") );
- gtk_misc_set_alignment ( GTK_MISC ( label ),
- 0,
- 0.5 );
- gtk_box_pack_start ( GTK_BOX ( hbox ),
- label,
... 4003 lines suppressed ...
hooks/post-receive
--
Grisbi
More information about the cvs
mailing list