[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-114-g1d93b03
Pierre Biava
nobody at users.sourceforge.net
Wed Mar 30 20:26:22 CEST 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 1d93b03360d517c96a5f24e8af87f7212eee80d1 (commit)
from 00fe097df5f9da7a5e8a202b4f116a8ec7f241c7 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Changes:
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index 69e4e38..8d21d89 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -38,6 +38,7 @@
#include "gsb_combo_box.h"
#include "gsb_currency.h"
#include "gsb_data_account.h"
+#include "gsb_dirs.h"
#include "gsb_file.h"
#include "gsb_form_widget.h"
#include "gsb_real.h"
@@ -51,7 +52,6 @@
#include "utils_file_selection.h"
#include "utils_str.h"
#include "erreur.h"
-#include "gsb_dirs.h"
/*END_INCLUDE*/
/*START_STATIC*/
@@ -302,8 +302,7 @@ GtkWidget *bet_finance_create_simulator_page ( void )
g_object_set_data ( G_OBJECT ( tree_view ), "label_title", label_title );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* on y ajoute la barre d'outils */
toolbar = bet_finance_create_simulator_toolbar ( page, tree_view, TRUE, FALSE );
@@ -1168,8 +1167,7 @@ GtkWidget *bet_finance_create_amortization_page ( void )
g_object_set_data ( G_OBJECT ( tree_view ), "label_title", label_title );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* on y ajoute la barre d'outils */
toolbar = bet_finance_create_simulator_toolbar ( page, tree_view, FALSE, TRUE );
@@ -1608,8 +1606,7 @@ GtkWidget *bet_finance_create_account_page ( void )
g_object_set_data ( G_OBJECT ( tree_view ), "label_title", label_title );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* on y ajoute la barre d'outils */
toolbar = bet_finance_create_simulator_toolbar ( page, tree_view, FALSE, FALSE );
diff --git a/src/bet_hist.c b/src/bet_hist.c
index 821a288..201d972 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -44,6 +44,7 @@
#include "navigation.h"
#include "structures.h"
#include "traitement_variables.h"
+#include "utils.h"
#include "utils_dates.h"
#include "utils_str.h"
#include "erreur.h"
@@ -214,8 +215,7 @@ GtkWidget *bet_historical_create_page ( void )
g_object_set_data ( G_OBJECT ( account_page ), "bet_historical_treeview", tree_view );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
gtk_widget_show_all ( page );
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 653b937..c992483 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -48,6 +48,7 @@
#include "gsb_data_payee.h"
#include "gsb_data_scheduled.h"
#include "gsb_data_transaction.h"
+#include "gsb_dirs.h"
#include "gsb_file.h"
#include "gsb_real.h"
#include "gsb_scheduler.h"
@@ -64,7 +65,6 @@
#include "utils_file_selection.h"
#include "utils_str.h"
#include "erreur.h"
-#include "gsb_dirs.h"
/*END_INCLUDE*/
@@ -626,8 +626,7 @@ GtkWidget *bet_array_create_tree_view ( GtkWidget *container )
GINT_TO_POINTER ( SPP_ESTIMATE_TREE_COLOR_STRING ) );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* create the model */
tree_model = gtk_tree_store_new ( SPP_ESTIMATE_TREE_NUM_COLUMNS,
diff --git a/src/categories_onglet.c b/src/categories_onglet.c
index 15ade45..b32d283 100644
--- a/src/categories_onglet.c
+++ b/src/categories_onglet.c
@@ -106,7 +106,7 @@ GtkWidget *onglet_categories ( void )
arbre_categ = gtk_tree_view_new();
/* set the color of selected row */
- gtk_widget_modify_base ( arbre_categ, GTK_STATE_SELECTED, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( arbre_categ );
categ_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS, META_TREE_COLUMN_TYPES );
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index 1afe13f..f29eead 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -205,8 +205,7 @@ GtkWidget *gsb_scheduler_list_create_list ( void )
gtk_container_add ( GTK_CONTAINER ( scrolled_window ), tree_view );
/* set the color of selected row */
- gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
- gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( tree_view );
/* create the store and set it in the tree_view */
tree_model = gsb_scheduler_list_create_model ();
diff --git a/src/imputation_budgetaire.c b/src/imputation_budgetaire.c
index 16fd9a7..be6745d 100644
--- a/src/imputation_budgetaire.c
+++ b/src/imputation_budgetaire.c
@@ -114,7 +114,7 @@ GtkWidget *onglet_imputations ( void )
budgetary_line_tree = gtk_tree_view_new();
/* set the color of selected row */
- gtk_widget_modify_base ( budgetary_line_tree, GTK_STATE_SELECTED, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( budgetary_line_tree );
budgetary_line_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS,
META_TREE_COLUMN_TYPES );
diff --git a/src/tiers_onglet.c b/src/tiers_onglet.c
index 8735d7f..3806a43 100644
--- a/src/tiers_onglet.c
+++ b/src/tiers_onglet.c
@@ -181,7 +181,7 @@ GtkWidget *onglet_tiers ( void )
payee_tree = gtk_tree_view_new();
/* set the color of selected row */
- gtk_widget_modify_base ( payee_tree, GTK_STATE_SELECTED, &couleur_selection );
+ utils_set_tree_view_selection_and_text_color ( payee_tree );
payee_tree_model = gtk_tree_store_new ( META_TREE_NUM_COLUMNS, META_TREE_COLUMN_TYPES );
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index de5c64a..744352c 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -188,6 +188,7 @@ GdkColor couleur_nom_compte_prelight;
GdkColor couleur_bleue;
GdkColor couleur_jaune;
+GdkColor couleur_noire;
/* colors for the balance estimate modul */
GdkColor couleur_bet_division;
diff --git a/src/utils.c b/src/utils.c
index bee7d0a..78b2276 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -50,6 +50,8 @@
/*START_EXTERN*/
+extern GdkColor couleur_selection;
+extern GdkColor text_color[2];
extern GtkWidget *window;
/*END_EXTERN*/
@@ -258,7 +260,7 @@ gboolean lance_navigateur_web ( const gchar *url )
* \param fill Give all available space to padding box or not
* \param title Title to display on top of the paddingbox
*/
-GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, const gchar *title)
+GtkWidget *new_paddingbox_with_title (GtkWidget *parent, gboolean fill, const gchar *title)
{
GtkWidget *vbox, *hbox, *paddingbox, *label;
gchar* tmp_str;
@@ -320,8 +322,8 @@ GtkWidget *new_paddingbox_with_title (GtkWidget * parent, gboolean fill, const g
* \returns A pointer to a vbox widget that will contain all created
* widgets and user defined widgets
*/
-GtkWidget *new_vbox_with_title_and_icon ( gchar * title,
- gchar * image_filename)
+GtkWidget *new_vbox_with_title_and_icon ( gchar *title,
+ gchar *image_filename)
{
GtkWidget *vbox_pref, *hbox, *label, *image, *eb;
GtkStyle * style;
@@ -457,7 +459,7 @@ void update_ecran ( void )
/******************************************************************************/
-void register_button_as_linked ( GtkWidget * widget, GtkWidget * linked )
+void register_button_as_linked ( GtkWidget *widget, GtkWidget *linked )
{
GSList * links;
@@ -474,7 +476,7 @@ void register_button_as_linked ( GtkWidget * widget, GtkWidget * linked )
*
*
*/
-gboolean radio_set_active_linked_widgets ( GtkWidget * widget )
+gboolean radio_set_active_linked_widgets ( GtkWidget *widget )
{
GSList * links;
@@ -532,6 +534,17 @@ void lance_mailer ( const gchar *uri )
g_free ( chaine );
}
+
+void utils_set_tree_view_selection_and_text_color ( GtkWidget *tree_view )
+{
+ gtk_widget_modify_base ( tree_view, GTK_STATE_SELECTED, &couleur_selection );
+ gtk_widget_modify_base ( tree_view, GTK_STATE_ACTIVE, &couleur_selection );
+
+ gtk_widget_modify_text ( tree_view, GTK_STATE_SELECTED, &text_color[0] );
+ gtk_widget_modify_text ( tree_view, GTK_STATE_ACTIVE, &text_color[0] );
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/utils.h b/src/utils.h
index 416a4bf..66ee0da 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -29,6 +29,6 @@ gboolean sens_desensitive_pointeur ( GtkWidget *bouton,
gboolean sensitive_widget ( gpointer object,
GtkWidget *widget );
void update_ecran ( void );
-
+void utils_set_tree_view_selection_and_text_color ( GtkWidget *tree_view );
/* END_DECLARATION */
#endif
hooks/post-receive
--
grisbi
More information about the cvs
mailing list