[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_99-67-g3e11c39
Pierre Biava
nobody at users.sourceforge.net
Thu Feb 17 21:49:21 CET 2011
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 3e11c3952e7e3d4a2bdf101a64bf9c819f77fa69 (commit)
from 4e7a0759da940a066547645487cab97cfad22afa (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 -----------------------------------------------------------------
commit 3e11c3952e7e3d4a2bdf101a64bf9c819f77fa69
Author: pbiava <pierre.biava at nerim.net>
Date: Thu Feb 17 21:48:54 2011 +0100
transfer facilities for printing in structures.h
-----------------------------------------------------------------------
Changes:
diff --git a/src/accueil.c b/src/accueil.c
index 8a4509f..e52c4c0 100644
--- a/src/accueil.c
+++ b/src/accueil.c
@@ -30,6 +30,7 @@
#include "accueil.h"
#include "classement_echeances.h"
#include "dialog.h"
+#include "fenetre_principale.h"
#include "gsb_automem.h"
#include "gsb_data_account.h"
#include "gsb_data_currency.h"
@@ -37,19 +38,19 @@
#include "gsb_data_payee.h"
#include "gsb_data_scheduled.h"
#include "gsb_data_transaction.h"
-#include "utils_dates.h"
#include "gsb_form.h"
#include "gsb_form_scheduler.h"
-#include "navigation.h"
#include "gsb_real.h"
#include "gsb_scheduler.h"
#include "gsb_scheduler_list.h"
#include "gsb_select_icon.h"
#include "gsb_transactions_list.h"
#include "main.h"
-#include "utils.h"
+#include "navigation.h"
#include "structures.h"
-#include "fenetre_principale.h"
+#include "utils.h"
+#include "utils_dates.h"
+#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index bb0e5fc..aed6cab 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -46,6 +46,7 @@
#include "utils.h"
#include "utils_dates.h"
#include "utils_file_selection.h"
+#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
diff --git a/src/bet_tab.c b/src/bet_tab.c
index ede97a1..5a3d2b4 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -60,6 +60,7 @@
#include "utils.h"
#include "utils_dates.h"
#include "utils_file_selection.h"
+#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
diff --git a/src/parametres.c b/src/parametres.c
index e64e854..d4b1b19 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -69,6 +69,7 @@
#include "utils.h"
#include "utils_dates.h"
#include "utils_files.h"
+#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
diff --git a/src/print_config.h b/src/print_config.h
index 2bed224..c0e4422 100644
--- a/src/print_config.h
+++ b/src/print_config.h
@@ -1,62 +1,6 @@
-/* ************************************************************************** */
-/* */
-/* Copyright (C) 2008 Benjamin Drieu (bdrieu at april.org) */
-/* http://www.grisbi.org */
-/* */
-/* This program is free software; you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation; either version 2 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program; if not, write to the Free Software */
-/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-/* */
-/* ************************************************************************** */
-
#ifndef PRINT_CONFIG_H
#define PRINT_CONFIG_H
-/* Header file for print_config.c */
-
-
-struct paper_config
-{
- gchar * name;
- gfloat width;
- gfloat height;
-};
-
-
-enum filetype {
- POSTSCRIPT_FILE = 0,
- LATEX_FILE,
- NUM_FILETYPES,
-};
-
-enum orientation {
- LANDSCAPE = 0,
- PORTRAIT,
- NUM_ORIENTATION,
-};
-
-struct print_config
-{
- gboolean printer;
- gchar * printer_name;
- gchar * printer_filename;
- enum filetype filetype;
- struct paper_config paper_config;
- enum orientation orientation;
-};
-/* START_INCLUDE_H */
-/* END_INCLUDE_H */
-
/*START_DECLARATION*/
gboolean print_config ( );
diff --git a/src/structures.h b/src/structures.h
index 4eea59b..b8d6f97 100644
--- a/src/structures.h
+++ b/src/structures.h
@@ -2,10 +2,8 @@
#define _STRUCTURES_H (1)
/* fichier d'en tête structures.h */
-/* contient toutes les structures du prog */
+/* contient presque toutes les structures du prog */
-#include "print_config.h"
-#include "utils_str.h"
/* the VERSION_FICHIER is in fact the lowest version which can be used to open the
* file, so each time we make an incompatibility issue, VERSION_FICHIER must be set
@@ -28,6 +26,43 @@
#define GRISBI_PIXMAPS_DIR (utils_get_pixmaps_dir ( ) )
#define GRISBI_PLUGINS_DIR (utils_get_plugins_dir ( ) )
+
+/* structures pour la gestion de l'impression */
+enum filetype
+{
+ POSTSCRIPT_FILE = 0,
+ LATEX_FILE,
+ NUM_FILETYPES,
+};
+
+
+struct paper_config
+{
+ gchar *name;
+ gfloat width;
+ gfloat height;
+};
+
+
+enum orientation
+{
+ LANDSCAPE = 0,
+ PORTRAIT,
+ NUM_ORIENTATION,
+};
+
+
+struct print_config
+{
+ gboolean printer;
+ gchar * printer_name;
+ gchar * printer_filename;
+ enum filetype filetype;
+ struct paper_config paper_config;
+ enum orientation orientation;
+};
+
+
/** structure etat
* variables contenant juste 0 ou 1
* FIXME : scinder cette structure en 3 parties :
@@ -238,12 +273,24 @@ struct struct_payee_asso
gchar *search_str;
};
+
+/* définition du titre de grisbi */
+typedef enum GSB_TITLE_NAME
+{
+ GSB_ACCOUNTS_TITLE,
+ GSB_ACCOUNT_HOLDER,
+ GSB_ACCOUNTS_FILE,
+} GsbTitleType;
+
+
+/* définition de l'alignement */
enum alignement
{
ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT,
};
+/* définition du type d'origine pour les données du module budgétaire */
enum bet_array_origin_data
{
SPP_ORIGIN_TRANSACTION, /* Ligne issue d'une opération */
@@ -258,6 +305,8 @@ enum bet_array_origin_data
SPP_ORIGIN_SOLDE /* Ligne de solde au premier du mois */
};
+
+/* définition du type de mise à jour en fonction des données du module budgétaire */
enum bet_type_maj
{
BET_MAJ_FALSE = 0,
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index f7f4a6e..fbe7e02 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -75,6 +75,7 @@
#include "structures.h"
#include "transaction_model.h"
#include "utils_dates.h"
+#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
diff --git a/src/transaction_list.c b/src/transaction_list.c
index c992dbf..e7d03ee 100644
--- a/src/transaction_list.c
+++ b/src/transaction_list.c
@@ -38,23 +38,24 @@
/*START_INCLUDE*/
#include "transaction_list.h"
+#include "affichage_liste.h"
#include "custom_list.h"
#include "dialog.h"
-#include "affichage_liste.h"
-#include "gsb_transactions_list.h"
-#include "utils_dates.h"
#include "gsb_data_account.h"
#include "gsb_data_archive.h"
#include "gsb_data_archive_store.h"
#include "gsb_data_currency.h"
#include "gsb_data_transaction.h"
+#include "gsb_real.h"
+#include "gsb_transactions_list.h"
#include "gsb_transactions_list_sort.h"
#include "navigation.h"
-#include "gsb_real.h"
+#include "structures.h"
#include "transaction_list_select.h"
#include "transaction_list_sort.h"
#include "transaction_model.h"
-#include "structures.h"
+#include "utils_dates.h"
+#include "utils_str.h"
#include "erreur.h"
/*END_INCLUDE*/
diff --git a/src/utils_str.h b/src/utils_str.h
index c82bbe1..dc76db8 100644
--- a/src/utils_str.h
+++ b/src/utils_str.h
@@ -52,9 +52,4 @@ gdouble utils_str_safe_strtod ( const gchar *str_number, gchar **endptr );
gdouble utils_str_strtod ( const gchar *str_number, gchar **endptr );
/* END_DECLARATION */
-typedef enum GSB_TITLE_NAME {
- GSB_ACCOUNTS_TITLE,
- GSB_ACCOUNT_HOLDER,
- GSB_ACCOUNTS_FILE,
-} GsbTitleType;
#endif
hooks/post-receive
--
grisbi
More information about the cvs
mailing list