[grisbi-cvs] [SCM] grisbi branch, grisbi-gtk3, updated. grisbi_gtk3_1_3_0-54-g8487daa
Pierre Biava
nobody at users.sourceforge.net
Sat Jan 14 22:18:40 CET 2012
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, grisbi-gtk3 has been updated
via 8487daa7112caf63d6141183a1ad3da14aa137a5 (commit)
via e074be549fdf066b2a8d801fc219f1fa3ce67a95 (commit)
via 61b60e386f5e1a61cd0a44cce8cf32444a3f0ce0 (commit)
via 5c44fa1931201d85184b66fedf60babc5bb147d1 (commit)
via 199d136133d0c8fed0cdf20b228acc53e2503260 (commit)
via 8a9052db37d6595fb1b50b22155a658f780d37a1 (commit)
via da36f4bd6b50283bc5d84c3c509c8b32919b1aed (commit)
via c7af7eb90e0fbd196ba49fe999fb26de0b8811bd (commit)
via 67d13562c58e7832129d913835293f0b779609a1 (commit)
via 2acd81c0cd735009d04f996e00589945b25f8555 (commit)
via f9a941a4892c9cb08c4e204528cc70064b9da26b (commit)
via 018cd5fa6de7704eabaf8ba655cb6bd672d22d4e (commit)
via 7e2aa7e93065229862d5b4f46a9820e7cb580cf5 (commit)
via 7a4a209b59d59c64bb71ee937d19c6751cd803df (commit)
via 2a9ad57981296a525911a73a1e937d361d7684a2 (commit)
via 4554eead608a35758a15a924bcdfd87ea7350c89 (commit)
via e7cab711b6bfd74dc42d34be9c03ec6fe432e318 (commit)
via 63371008cbb7df90098b78a593c5a08ff3c8bb32 (commit)
via 6c922d8bf18553ff7a66c99b336a05dcb217bb9e (commit)
via e87c1a21503621c95a595ab9c93c451c9e103d91 (commit)
via f07c0f7be55e5191689ba62b69e5bc42838a5525 (commit)
via eccaf875dd31865b7aecb6da98d4f76f63279755 (commit)
via 91ce3e8998fa97e7b2bea674073a4b5657d8010e (commit)
via 9c4462c37198450b194a92bf7d86d505258ff761 (commit)
via 1df72b0bb98eecb6eebf1d47cf1b1a1363b63389 (commit)
via d500707a541826f62695779d9348da5d5b53c43e (commit)
via 3b9abd3b71f8d6362470abc42de3e95c7ea0e932 (commit)
via 5fb5914186806dc68dd78eeadbd7ea5b946e9445 (commit)
via 8ed9627160b222a22b82af735f8ad2ba0db6dda4 (commit)
via 45ca7983ce93522d40b1e7caeff8316fac695296 (commit)
via b95538c72c83afad2f656c56561c6fb139856054 (commit)
via 8b7fa0080985768b784538a284aa50a59a28adef (commit)
via ba693ffdde00760d35e619fc23a13b00753e15c8 (commit)
via a0ccd90a53fee0be7b5af993c2526fe62d29f941 (commit)
via dfcd20df44c62fbddcfa748e7d8f26eca0f71c60 (commit)
via c72c826d1ca29817c1b559dc8539db82405e525c (commit)
via fe088fd62927a89437b815073f19159e1bb0a57a (commit)
via ad2c801409e7dd8ddcc6c9b040bd4efdebf03a80 (commit)
via 585f03da9e04d6a48412403e50f98fc47d7ab85b (commit)
via cf504e38d9cb5fc306574e20b62d3efed81f7bed (commit)
via 65bdcc5ddf3c20e67071f598aeac12a822b2dd74 (commit)
from bd1956fce8745c3b22ec7559599199cc8fc1f4da (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 8487daa7112caf63d6141183a1ad3da14aa137a5
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:15:54 2012 +0100
utils_files.c: removal of direct calls to the structures of gtk objects
commit e074be549fdf066b2a8d801fc219f1fa3ce67a95
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:15:41 2012 +0100
utils.c: removal of direct calls to the structures of gtk objects
commit 61b60e386f5e1a61cd0a44cce8cf32444a3f0ce0
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:15:22 2012 +0100
utils_buttons.c: removal of direct calls to the structures of gtk objects
commit 5c44fa1931201d85184b66fedf60babc5bb147d1
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:14:47 2012 +0100
tip.c: removal of direct calls to the structures of gtk objects
commit 199d136133d0c8fed0cdf20b228acc53e2503260
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:13:51 2012 +0100
tiers_onglet.c: removal of direct calls to the structures of gtk objects
commit 8a9052db37d6595fb1b50b22155a658f780d37a1
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:13:37 2012 +0100
print_report.c: removal of direct calls to the structures of gtk objects
commit da36f4bd6b50283bc5d84c3c509c8b32919b1aed
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:12:54 2012 +0100
openssl.c: removal of direct calls to the structures of gtk objects
commit c7af7eb90e0fbd196ba49fe999fb26de0b8811bd
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:12:37 2012 +0100
parametres.c: removal of direct calls to the structures of gtk objects
commit 67d13562c58e7832129d913835293f0b779609a1
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:12:21 2012 +0100
navigation.c: removal of direct calls to the structures of gtk objects
commit 2acd81c0cd735009d04f996e00589945b25f8555
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:07:18 2012 +0100
metatree.c: removal of direct calls to the structures of gtk objects
commit f9a941a4892c9cb08c4e204528cc70064b9da26b
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:02:43 2012 +0100
imputation_budgetaire.c: removal of direct calls to the structures of gtk objects
commit 018cd5fa6de7704eabaf8ba655cb6bd672d22d4e
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:02:24 2012 +0100
import.c: removal of direct calls to the structures of gtk objects
commit 7e2aa7e93065229862d5b4f46a9820e7cb580cf5
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:01:04 2012 +0100
gtk_combofix.c: removal of direct calls to the structures of gtk objects
commit 7a4a209b59d59c64bb71ee937d19c6751cd803df
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 22:00:22 2012 +0100
gsb_transactions_list.c: removal of direct calls to the structures of gtk objects
commit 2a9ad57981296a525911a73a1e937d361d7684a2
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:59:37 2012 +0100
gsb_status.c: removal of direct calls to the structures of gtk objects
commit 4554eead608a35758a15a924bcdfd87ea7350c89
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:56:30 2012 +0100
gsb_select_icon.c: removal of direct calls to the structures of gtk objects
commit e7cab711b6bfd74dc42d34be9c03ec6fe432e318
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:55:11 2012 +0100
gsb_scheduler_list.c: removal of direct calls to the structures of gtk objects
commit 63371008cbb7df90098b78a593c5a08ff3c8bb32
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:54:49 2012 +0100
gsb_payment_method_config.c: removal of direct calls to the structures of gtk objects
commit 6c922d8bf18553ff7a66c99b336a05dcb217bb9e
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:54:10 2012 +0100
gsb_form_config.c: removal of direct calls to the structures of gtk objects
commit e87c1a21503621c95a595ab9c93c451c9e103d91
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:53:17 2012 +0100
gsb_form.c: minor changes
commit f07c0f7be55e5191689ba62b69e5bc42838a5525
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:52:35 2012 +0100
add or remove parameters
commit eccaf875dd31865b7aecb6da98d4f76f63279755
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:51:20 2012 +0100
gsb_file_config.c: removal of direct calls to the structures of gtk objects
commit 91ce3e8998fa97e7b2bea674073a4b5657d8010e
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:49:15 2012 +0100
gsb_file.c: removal of direct calls to the structures of gtk objects
commit 9c4462c37198450b194a92bf7d86d505258ff761
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:46:23 2012 +0100
gsb_partial_balance.c: removal of direct calls to the structures of gtk objects
commit 1df72b0bb98eecb6eebf1d47cf1b1a1363b63389
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:45:52 2012 +0100
gsb_currency_config.c: removal of direct calls to the structures of gtk objects
commit d500707a541826f62695779d9348da5d5b53c43e
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:45:27 2012 +0100
gsb_currency.c: removal of direct calls to the structures of gtk objects
commit 3b9abd3b71f8d6362470abc42de3e95c7ea0e932
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:43:37 2012 +0100
gsb_calendar_entry.c: removal of direct calls to the structures of gtk objects
commit 5fb5914186806dc68dd78eeadbd7ea5b946e9445
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:42:59 2012 +0100
gsb_calendar.c: removal of direct calls to the structures of gtk objects
commit 8ed9627160b222a22b82af735f8ad2ba0db6dda4
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:41:55 2012 +0100
gsb_bank.c: removal of direct calls to the structures of gtk objects
commit 45ca7983ce93522d40b1e7caeff8316fac695296
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:41:16 2012 +0100
gsb_assistant_reconcile_config.c: removal of direct calls to the structures of gtk objects
commit b95538c72c83afad2f656c56561c6fb139856054
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:40:36 2012 +0100
gsb_assistant.c: removal of direct calls to the structures of gtk objects
commit 8b7fa0080985768b784538a284aa50a59a28adef
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:40:15 2012 +0100
gsb_account_property.c: removal of direct calls to the structures of gtk objects
commit ba693ffdde00760d35e619fc23a13b00753e15c8
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:39:29 2012 +0100
etats_onglet.c: removal of direct calls to the structures of gtk objects
commit a0ccd90a53fee0be7b5af993c2526fe62d29f941
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:35:10 2012 +0100
etats_gtktable.c: removal of direct calls to the structures of gtk objects
commit dfcd20df44c62fbddcfa748e7d8f26eca0f71c60
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:34:37 2012 +0100
bet_future.c: removal of direct calls to the structures of gtk objects
commit c72c826d1ca29817c1b559dc8539db82405e525c
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 21:34:03 2012 +0100
bet_finance_ui.c: removal of direct calls to the structures of gtk objects
commit fe088fd62927a89437b815073f19159e1bb0a57a
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 17:57:49 2012 +0100
erreur.c:removal of direct calls to the structures of gtk objects
commit ad2c801409e7dd8ddcc6c9b040bd4efdebf03a80
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 17:54:54 2012 +0100
dialog.c .h: removal of direct calls to the structures of gtk objects
commit 585f03da9e04d6a48412403e50f98fc47d7ab85b
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 17:49:09 2012 +0100
categories_onglet.c: removal of direct calls to the structures of objects gtk
commit cf504e38d9cb5fc306574e20b62d3efed81f7bed
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 13:37:38 2012 +0100
affichage_liste.c: removal of direct calls to the structures of gtk objects
commit 65bdcc5ddf3c20e67071f598aeac12a822b2dd74
Author: pbiava <pierre.biava at nerim.net>
Date: Sat Jan 14 13:36:05 2012 +0100
accueil.c: removal of direct calls to the structures of gtk objects
-----------------------------------------------------------------------
Changes:
diff --git a/src/accueil.c b/src/accueil.c
index a175ebf..ca1e514 100644
--- a/src/accueil.c
+++ b/src/accueil.c
@@ -296,7 +296,7 @@ gboolean saisie_echeance_accueil ( GtkWidget *event_box,
GtkWidget *button;
gint result;
- parent_save = form_transaction_part -> parent;
+ parent_save = gtk_widget_get_parent ( form_transaction_part );
/* Create the dialog */
dialog = gtk_dialog_new_with_buttons ( _("Enter a scheduled transaction"),
@@ -311,9 +311,10 @@ gboolean saisie_echeance_accueil ( GtkWidget *event_box,
gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
gtk_dialog_set_default_response ( GTK_DIALOG (dialog), GTK_RESPONSE_OK );
+
/* first we reparent the form in the dialog */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, TRUE, TRUE, 0 );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 12 );
gtk_widget_reparent ( form_transaction_part, hbox );
gtk_widget_show_all ( hbox );
diff --git a/src/affichage_liste.c b/src/affichage_liste.c
index 050031d..dc60cdb 100644
--- a/src/affichage_liste.c
+++ b/src/affichage_liste.c
@@ -945,14 +945,16 @@ gboolean gsb_transaction_list_config_realized ( GtkWidget *tree_view,
for ( column = 0 ; column < CUSTOM_MODEL_VISIBLE_COLUMNS ; column++ )
{
gint width;
+ GtkAllocation allocation;
- width = ( transaction_col_width [column] * ( tree_view -> allocation.width ) ) / 100;
+ gtk_widget_get_allocation ( tree_view, &allocation );
+ width = ( transaction_col_width [column] * ( allocation.width ) ) / 100;
gtk_tree_view_column_set_fixed_width (
gtk_tree_view_get_column ( GTK_TREE_VIEW ( tree_view ), column ),
width );
}
- gdk_window_set_cursor ( tree_view -> window, gdk_cursor_new ( GDK_HAND2 ) );
+ gdk_window_set_cursor ( gtk_widget_get_window ( tree_view ), gdk_cursor_new ( GDK_HAND2 ) );
return FALSE;
}
diff --git a/src/bet_finance_ui.c b/src/bet_finance_ui.c
index 1f98372..1fc9ef0 100644
--- a/src/bet_finance_ui.c
+++ b/src/bet_finance_ui.c
@@ -624,6 +624,10 @@ GtkWidget *bet_finance_create_data_tree_view ( GtkWidget *container )
NULL);
gtk_tree_view_append_column ( GTK_TREE_VIEW ( tree_view ),
GTK_TREE_VIEW_COLUMN ( column ) );
+/* for gtk3
+ * gtk_widget_set_tooltip_text ( gtk_tree_view_column_get_button ( GTK_TREE_VIEW_COLUMN ( column ) ),
+ * _("Approximate cost") );
+ */
gtk_widget_set_tooltip_text ( GTK_WIDGET ( GTK_TREE_VIEW_COLUMN ( column )->button ),
_("Approximate cost") );
gtk_tree_view_column_set_expand ( GTK_TREE_VIEW_COLUMN ( column ), TRUE );
@@ -647,6 +651,7 @@ GtkWidget *bet_finance_create_data_tree_view ( GtkWidget *container )
gtk_widget_show_all ( scrolled_window );
+ /* return */
return tree_view;
}
diff --git a/src/bet_future.c b/src/bet_future.c
index b59e7ba..78144af 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -269,7 +269,7 @@ GtkWidget *bet_future_create_dialog ( gint account_number )
gtk_dialog_set_default_response ( GTK_DIALOG ( dialog ), GTK_RESPONSE_OK );
vbox = gtk_vbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )->vbox ), vbox, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), vbox, TRUE, TRUE, 0 );
gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
/* next we fill the bet_form */
@@ -1921,7 +1921,7 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
gtk_dialog_set_default_response ( GTK_DIALOG ( dialog ), GTK_RESPONSE_OK );
vbox = gtk_vbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )->vbox ), vbox, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), vbox, TRUE, TRUE, 0 );
gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
/* list of accounts */
diff --git a/src/categories_onglet.c b/src/categories_onglet.c
index 777abde..275adb5 100644
--- a/src/categories_onglet.c
+++ b/src/categories_onglet.c
@@ -715,9 +715,10 @@ gboolean edit_category ( GtkTreeView *tree_view )
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 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, title );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
diff --git a/src/dialog.c b/src/dialog.c
index 6ba3fee..1a866c0 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -76,7 +76,7 @@ struct conditional_message messages[] =
FALSE, FALSE, },
{ "minimum-balance-alert", N_("Account under desired balance."),
- N_("Grisbi detected that an account is under a desired balance: %s"),
+ N_("Grisbi detected that an account is under a desired balance: %s"),
FALSE, FALSE, },
{ "no-budgetary-line", N_("No budgetary line was entered"),
@@ -203,11 +203,11 @@ void dialogue_special ( GtkMessageType param, gchar *text )
{
GtkWidget *dialog;
- dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
+ dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
GTK_DIALOG_DESTROY_WITH_PARENT,
param, GTK_BUTTONS_CLOSE,
- "%s", text );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG (dialog)->label ), text );
+ NULL );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), text );
gtk_window_set_modal ( GTK_WINDOW ( dialog ), TRUE );
gtk_dialog_run (GTK_DIALOG (dialog));
@@ -234,17 +234,17 @@ GtkWidget *dialogue_special_no_run ( GtkMessageType param,
dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
GTK_DIALOG_DESTROY_WITH_PARENT || GTK_DIALOG_MODAL,
param, buttons,
- "%s", text );
+ NULL );
}
else
{
dialog = gtk_message_dialog_new ( NULL,
0,
param, buttons,
- "%s", text );
+ NULL );
}
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ), text );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), text );
return dialog;
}
@@ -326,14 +326,14 @@ GtkDialog *dialogue_conditional_new ( gchar *text,
dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
GTK_DIALOG_DESTROY_WITH_PARENT,
type, buttons,
- "%s", text );
+ NULL );
gtk_dialog_set_default_response ( GTK_DIALOG( dialog ), GTK_RESPONSE_CLOSE );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ), text );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), text );
- vbox = GTK_DIALOG(dialog) -> vbox;
+ vbox = gtk_message_dialog_get_message_area ( GTK_MESSAGE_DIALOG ( dialog ) );
checkbox = gtk_check_button_new_with_label ( _("Do not show this message again") );
- g_signal_connect ( G_OBJECT ( checkbox ), "toggled",
+ g_signal_connect ( G_OBJECT ( checkbox ), "toggled",
G_CALLBACK ( dialogue_update_var ), GINT_TO_POINTER ( i ) );
gtk_box_pack_start ( GTK_BOX ( vbox ), checkbox, TRUE, TRUE, 6 );
gtk_widget_show_all ( checkbox );
@@ -440,9 +440,8 @@ gboolean question_yes_no ( gchar *text, gint default_answer )
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
- "%s", text );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ), text );
-
+ NULL );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), text );
gtk_dialog_set_default_response (GTK_DIALOG (dialog), default_answer );
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -525,11 +524,11 @@ gboolean question_conditional_yes_no_with_struct ( struct conditional_message *m
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_YES_NO,
- "%s", text );
+ NULL );
gtk_dialog_set_default_response ( GTK_DIALOG( dialog ), GTK_RESPONSE_NO );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG ( dialog )->label ), text );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), text );
- vbox = GTK_DIALOG ( dialog ) -> vbox;
+ vbox = gtk_dialog_get_content_area ( GTK_DIALOG ( dialog ) );
checkbox = gtk_check_button_new_with_label ( _("Do not show this message again") );
g_signal_connect ( G_OBJECT ( checkbox ),
@@ -665,7 +664,7 @@ gchar *make_blue ( const gchar *text )
void dialogue_error_brain_damage ()
{
dialogue_error_hint ( _("Hi, you are in the middle of nowhere, between two lines of code."
- " Grisbi is expected to crash very soon. Have a nice day."),
+ " Grisbi is expected to crash very soon. Have a nice day."),
_("Serious brain damage expected.") );
}
@@ -735,15 +734,15 @@ const gchar *dialogue_hint_with_entry ( gchar *text, gchar *hint, gchar *entry_d
format_text = make_hint ( hint, text );
- dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
+ dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_INFO,
+ GTK_MESSAGE_INFO,
GTK_BUTTONS_CLOSE,
- "%s", format_text );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ), format_text );
+ NULL );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), format_text );
hbox = gtk_hbox_new (FALSE, 5);
- gtk_box_pack_start ( GTK_BOX (GTK_DIALOG (dialog) -> vbox),
+ gtk_box_pack_start ( GTK_BOX ( gtk_dialog_get_content_area ( GTK_DIALOG ( dialog ) ) ),
hbox,
FALSE, FALSE, 0);
@@ -762,6 +761,34 @@ const gchar *dialogue_hint_with_entry ( gchar *text, gchar *hint, gchar *entry_d
return string;
}
+
+
+/**
+ * return the content_area of dialog
+ *
+ * \param dialog
+ *
+ * \return the content_area
+ */
+GtkWidget *dialog_get_content_area ( GtkWidget *dialog )
+{
+ return gtk_dialog_get_content_area ( GTK_DIALOG ( dialog ) );
+}
+
+
+/**
+ * return the action_area of dialog
+ *
+ * \param dialog
+ *
+ * \return the action_area
+ */
+GtkWidget *dialog_get_action_area ( GtkWidget *dialog )
+{
+ return gtk_dialog_get_action_area ( GTK_DIALOG ( dialog ) );
+}
+
+
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/dialog.h b/src/dialog.h
index 64b0e16..39b36ed 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -25,6 +25,8 @@ G_MODULE_EXPORT void dialogue_error ( gchar *text );
void dialogue_error_brain_damage ();
G_MODULE_EXPORT void dialogue_error_hint ( const gchar *text, gchar *hint );
void dialogue_error_memory ();
+GtkWidget *dialog_get_action_area ( GtkWidget *dialog );
+GtkWidget *dialog_get_content_area ( GtkWidget *dialog );
void dialogue_hint ( gchar *text, gchar *hint );
const gchar *dialogue_hint_with_entry ( gchar *text, gchar *hint, gchar *entry_description );
void dialogue_special ( GtkMessageType param, gchar *text );
diff --git a/src/erreur.c b/src/erreur.c
index 7db9e30..366d870 100644
--- a/src/erreur.c
+++ b/src/erreur.c
@@ -157,15 +157,18 @@ void traitement_sigsegv ( gint signal_nb )
g_free ( errmsg );
#ifdef HAVE_BACKTRACE
- tmpstr = g_strconcat ( "<b>", _("Backtrace"), "</b>", NULL );
- expander = gtk_expander_new ( tmpstr );
- g_free ( tmpstr );
+ {
+
+ tmpstr = g_strconcat ( "<b>", _("Backtrace"), "</b>", NULL );
+ expander = gtk_expander_new ( tmpstr );
+ g_free ( tmpstr );
- gtk_expander_set_use_markup ( GTK_EXPANDER ( expander ), TRUE );
- gtk_container_add ( GTK_CONTAINER ( expander ), print_backtrace() );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(dialog)->vbox ), expander, FALSE, FALSE, 6 );
+ gtk_expander_set_use_markup ( GTK_EXPANDER ( expander ), TRUE );
+ gtk_container_add ( GTK_CONTAINER ( expander ), print_backtrace() );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), expander, FALSE, FALSE, 6 );
- gtk_widget_show_all ( dialog );
+ gtk_widget_show_all ( dialog );
+ }
#endif
gtk_dialog_run ( GTK_DIALOG ( dialog ) );
diff --git a/src/etats_gtktable.c b/src/etats_gtktable.c
index ca22a2c..cedcf71 100644
--- a/src/etats_gtktable.c
+++ b/src/etats_gtktable.c
@@ -245,10 +245,10 @@ gint gtktable_initialise ( GSList * opes_selectionnees, gchar * filename )
/* pas besoin d'indiquer la hauteur, elle grandit automatiquement */
if ( table_etat && GTK_IS_TABLE(table_etat) )
- gtk_widget_destroy (table_etat);
+ gtk_widget_destroy (table_etat);
- if ( scrolled_window_etat && GTK_BIN ( scrolled_window_etat ) -> child )
- gtk_widget_hide ( GTK_BIN ( scrolled_window_etat ) -> child );
+ if ( scrolled_window_etat && gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) )
+ gtk_widget_hide ( gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) );
/* just update screen so that the user does not see the previous report anymore
* while we are processing the new report */
@@ -271,8 +271,8 @@ gint gtktable_finish ()
gtk_container_set_border_width ( GTK_CONTAINER ( table_etat ), 6 );
gtk_widget_show_all ( table_etat );
- if ( GTK_BIN ( scrolled_window_etat ) -> child )
- gtk_widget_show ( GTK_BIN ( scrolled_window_etat ) -> child );
+ if ( gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) )
+ gtk_widget_show ( gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) );
return 1;
}
diff --git a/src/etats_onglet.c b/src/etats_onglet.c
index 78aae2d..8837048 100644
--- a/src/etats_onglet.c
+++ b/src/etats_onglet.c
@@ -265,16 +265,14 @@ gboolean ajout_etat ( void )
make_hint ( _("Choose template for new report"),
_("You are about to create a new report. For convenience, you can choose between the following templates. Reports may be customized later." ) ) );
- frame = new_paddingbox_with_title ( GTK_DIALOG(dialog)->vbox, FALSE,
- _("Report type"));
+ frame = new_paddingbox_with_title ( dialog_get_content_area ( dialog ), FALSE, _("Report type") );
/* combobox for predefined reports */
combobox = gtk_combo_box_text_new ( );
gtk_box_pack_start ( GTK_BOX(frame), combobox, FALSE, FALSE, 0 );
/* on ajoute maintenant la frame */
- frame = new_paddingbox_with_title ( GTK_DIALOG(dialog)->vbox, TRUE,
- _("Description"));
+ frame = new_paddingbox_with_title ( dialog_get_content_area ( dialog ), TRUE, _("Description"));
/* on met le label dans une scrolled window */
scrolled_window = gtk_scrolled_window_new ( FALSE, FALSE );
@@ -287,10 +285,10 @@ gboolean ajout_etat ( void )
gtk_misc_set_alignment ( GTK_MISC ( label_description ), 0, 0 );
gtk_label_set_line_wrap ( GTK_LABEL ( label_description ), TRUE );
gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window ),
- label_description );
+ label_description );
- gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( label_description -> parent ),
- GTK_SHADOW_NONE );
+ gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( gtk_bin_get_child ( GTK_BIN ( scrolled_window ) ) ),
+ GTK_SHADOW_NONE );
/* fill combobox */
gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT ( combobox ), _("Last month incomes and outgoings") );
@@ -311,7 +309,7 @@ gboolean ajout_etat ( void )
G_CALLBACK ( change_choix_nouvel_etat ),
G_OBJECT ( label_description ));
- gtk_box_set_spacing ( GTK_BOX(GTK_DIALOG(dialog)->vbox), 6 );
+ gtk_box_set_spacing ( GTK_BOX ( dialog_get_content_area ( dialog ) ), 6 );
gtk_widget_show_all ( dialog );
/* on attend le choix de l'utilisateur */
@@ -978,9 +976,12 @@ void efface_etat ( void )
*/
void gsb_gui_unsensitive_report_widgets ()
{
- if ( scrolled_window_etat && GTK_IS_WIDGET ( scrolled_window_etat ) &&
- GTK_BIN ( scrolled_window_etat ) -> child )
- gtk_widget_hide ( GTK_BIN ( scrolled_window_etat ) -> child );
+ if ( scrolled_window_etat
+ &&
+ GTK_IS_WIDGET ( scrolled_window_etat )
+ &&
+ gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) )
+ gtk_widget_hide ( gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) );
gtk_widget_set_sensitive ( bouton_personnaliser_etat, FALSE );
gtk_widget_set_sensitive ( bouton_imprimer_etat, FALSE );
@@ -1010,7 +1011,7 @@ void gsb_gui_update_gui_to_report ( gint report_number )
gsb_report_set_current (report_number);
}
else
- gtk_widget_show ( GTK_BIN ( scrolled_window_etat ) -> child );
+ gtk_widget_show ( gtk_bin_get_child ( GTK_BIN ( scrolled_window_etat ) ) );
}
diff --git a/src/gsb_account_property.c b/src/gsb_account_property.c
index c13e870..e52cdac 100644
--- a/src/gsb_account_property.c
+++ b/src/gsb_account_property.c
@@ -230,7 +230,7 @@ GtkWidget *gsb_account_property_create_page ( void )
vbox = gtk_vbox_new ( FALSE, 5 );
gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window ), vbox );
- gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( GTK_BIN ( scrolled_window ) -> child ),
+ gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( gtk_bin_get_child ( GTK_BIN ( scrolled_window ) ) ),
GTK_SHADOW_NONE );
/* création de la ligne des détails du compte */
diff --git a/src/gsb_assistant.c b/src/gsb_assistant.c
index 938068d..debb68c 100644
--- a/src/gsb_assistant.c
+++ b/src/gsb_assistant.c
@@ -35,10 +35,11 @@
/*START_INCLUDE*/
#include "gsb_assistant.h"
+#include "dialog.h"
+#include "gsb_dirs.h"
#include "structures.h"
#include "utils.h"
#include "utils_str.h"
-#include "gsb_dirs.h"
#include "erreur.h"
/*END_INCLUDE*/
@@ -92,7 +93,7 @@ GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
button_select = gtk_toggle_button_new_with_label ( _("Select all") );
gtk_widget_set_size_request ( button_select, width, -1 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( assistant )->action_area ),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_action_area ( assistant ) ),
button_select, FALSE, FALSE, 0 );
g_object_set_data ( G_OBJECT(assistant), "button_select", button_select );
@@ -135,12 +136,12 @@ GtkWidget * gsb_assistant_new ( const gchar * title, const gchar * explanation,
g_free ( tmpstr );
gtk_box_pack_start ( GTK_BOX(hbox), image, FALSE, FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(assistant) -> vbox ), eb, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( assistant ) ), eb, FALSE, FALSE, 0 );
notebook = gtk_notebook_new ();
gtk_notebook_set_show_tabs ( GTK_NOTEBOOK(notebook), FALSE );
gtk_notebook_set_show_border ( GTK_NOTEBOOK(notebook), FALSE );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(assistant) -> vbox ), notebook, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( assistant ) ), notebook, TRUE, TRUE, 0 );
view = gtk_text_view_new ();
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
diff --git a/src/gsb_assistant_reconcile_config.c b/src/gsb_assistant_reconcile_config.c
index 3775817..e0b4e0e 100644
--- a/src/gsb_assistant_reconcile_config.c
+++ b/src/gsb_assistant_reconcile_config.c
@@ -1196,7 +1196,7 @@ static gboolean gsb_assistant_reconcile_config_lauch_manu_asso ( GtkWidget *butt
label = gtk_label_new ( _("Select the reconciliation to associate to the selected transactions: ") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
- gtk_box_pack_start ( GTK_BOX (GTK_DIALOG (dialog) -> vbox),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( assistant ) ),
label,
FALSE, FALSE,
10 );
@@ -1206,7 +1206,7 @@ static gboolean gsb_assistant_reconcile_config_lauch_manu_asso ( GtkWidget *butt
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC );
- gtk_box_pack_start ( GTK_BOX (GTK_DIALOG (dialog) -> vbox),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( assistant ) ),
scrolled_window,
TRUE, TRUE,
0 );
diff --git a/src/gsb_bank.c b/src/gsb_bank.c
index 33d134e..91df09b 100644
--- a/src/gsb_bank.c
+++ b/src/gsb_bank.c
@@ -596,8 +596,8 @@ GtkWidget *gsb_bank_create_page ( gboolean default_sensitive )
vbox2 );
gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW ( scrolled_window ),
GTK_SHADOW_NONE );
- gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( GTK_BIN ( scrolled_window ) -> child ),
- GTK_SHADOW_NONE );
+ gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( gtk_bin_get_child ( GTK_BIN ( scrolled_window ) ) ),
+ GTK_SHADOW_NONE );
gtk_widget_set_sensitive ( vbox2, FALSE );
gsb_bank_create_form ( vbox2, NULL );
@@ -1039,17 +1039,17 @@ static gboolean gsb_bank_edit_bank ( gint bank_number,
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC );
gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW(scrolled_window),
GTK_SHADOW_NONE );
- gtk_container_add ( GTK_CONTAINER ( GTK_DIALOG(dialog)->vbox ), scrolled_window );
+ gtk_container_add ( GTK_CONTAINER ( dialog_get_content_area ( dialog ) ), scrolled_window );
gtk_widget_set_size_request ( scrolled_window, 600, 400 );
vbox = gtk_vbox_new ( FALSE, 6 );
gtk_container_set_border_width ( GTK_CONTAINER (vbox), 12 );
form = gsb_bank_create_form ( vbox, combobox );
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled_window), vbox);
- gtk_viewport_set_shadow_type ( GTK_VIEWPORT (GTK_BIN(scrolled_window) -> child ),
+ gtk_viewport_set_shadow_type ( GTK_VIEWPORT ( gtk_bin_get_child ( GTK_BIN ( scrolled_window ) ) ),
GTK_SHADOW_NONE );
- gtk_widget_show_all ( GTK_DIALOG(dialog)->vbox );
+ gtk_widget_show_all ( dialog_get_content_area ( dialog ) );
if ( bank_number == -2 )
{
@@ -1061,9 +1061,9 @@ static gboolean gsb_bank_edit_bank ( gint bank_number,
}
else
- gsb_bank_update_form ( bank_number, GTK_DIALOG(dialog)->vbox );
+ gsb_bank_update_form ( bank_number, dialog_get_content_area ( dialog ) );
- result = gtk_dialog_run ( GTK_DIALOG(dialog ) );
+ result = gtk_dialog_run ( GTK_DIALOG ( dialog ) );
if ( result == GTK_RESPONSE_APPLY )
{
diff --git a/src/gsb_calendar.c b/src/gsb_calendar.c
index 1e779bd..93c3031 100644
--- a/src/gsb_calendar.c
+++ b/src/gsb_calendar.c
@@ -103,49 +103,54 @@ gboolean gsb_calendar_update ( void )
{
time_t temps;
GSList *tmp_list;
- gint calendar_month;
- gint calendar_year;
+ guint calendar_day;
+ guint calendar_month;
+ guint calendar_year;
- gtk_calendar_clear_marks ( GTK_CALENDAR ( scheduled_calendar ));
+ gtk_calendar_clear_marks ( GTK_CALENDAR ( scheduled_calendar ) );
+ gtk_calendar_get_date ( GTK_CALENDAR ( scheduled_calendar ),
+ &calendar_day,
+ &calendar_month,
+ &calendar_year );
/* select the current day */
time ( &temps );
- if ( ( localtime ( &temps ) -> tm_mon == GTK_CALENDAR ( scheduled_calendar ) -> month )
- &&
- ( ( localtime ( &temps ) -> tm_year + 1900 ) == GTK_CALENDAR ( scheduled_calendar ) -> year ) )
- gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ),
- localtime ( &temps ) -> tm_mday );
+ if ( ( localtime ( &temps ) -> tm_mon == calendar_month )
+ &&
+ ( ( localtime ( &temps ) -> tm_year + 1900 ) == calendar_year ) )
+ gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ), localtime ( &temps ) -> tm_mday );
else
- gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ),
- FALSE );
+ gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ), FALSE );
- calendar_month = GTK_CALENDAR ( scheduled_calendar ) -> month + 1;
- calendar_year = GTK_CALENDAR ( scheduled_calendar ) -> year + 25;
+ calendar_month = calendar_month + 1;
+ calendar_year = calendar_year + 25;
/* check the scheduled transactions and bold them in the calendar */
tmp_list = gsb_data_scheduled_get_scheduled_list ();
while ( tmp_list )
{
- GDate *tmp_date;
- gint scheduled_number;
+ GDate *tmp_date;
+ gint scheduled_number;
- scheduled_number = gsb_data_scheduled_get_scheduled_number (tmp_list -> data);
+ scheduled_number = gsb_data_scheduled_get_scheduled_number ( tmp_list -> data );
- tmp_date = gsb_date_copy (gsb_data_scheduled_get_date (scheduled_number));
+ tmp_date = gsb_date_copy ( gsb_data_scheduled_get_date ( scheduled_number ) );
- while (tmp_date && g_date_get_month (tmp_date) == calendar_month && g_date_get_year (tmp_date) < calendar_year)
- {
- GDate *new_date;
+ while ( tmp_date
+ && g_date_get_month ( tmp_date ) == calendar_month
+ && g_date_get_year ( tmp_date ) < calendar_year )
+ {
+ GDate *new_date;
- gtk_calendar_mark_day ( GTK_CALENDAR ( scheduled_calendar ),
- g_date_get_day (tmp_date));
- new_date = gsb_scheduler_get_next_date (scheduled_number, tmp_date);
- g_free (tmp_date);
- tmp_date = new_date;
- }
- tmp_list = tmp_list -> next;
+ gtk_calendar_mark_day ( GTK_CALENDAR ( scheduled_calendar ), g_date_get_day ( tmp_date ) );
+ new_date = gsb_scheduler_get_next_date ( scheduled_number, tmp_date );
+
+ g_free ( tmp_date );
+ tmp_date = new_date;
+ }
+ tmp_list = tmp_list -> next;
}
return FALSE;
}
@@ -153,33 +158,37 @@ gboolean gsb_calendar_update ( void )
void click_sur_jour_calendrier_echeance ( GtkWidget *calendrier,
- gpointer null )
+ gpointer null )
{
time_t temps;
+ guint calendar_day;
+ guint calendar_month;
+ guint calendar_year;
time ( &temps );
+ gtk_calendar_get_date ( GTK_CALENDAR ( scheduled_calendar ),
+ &calendar_day,
+ &calendar_month,
+ &calendar_year );
g_signal_handlers_block_by_func ( G_OBJECT ( calendrier ),
- G_CALLBACK ( click_sur_jour_calendrier_echeance ),
- NULL );
-
- if ( ( localtime ( &temps ) -> tm_mon == GTK_CALENDAR ( scheduled_calendar ) -> month )
- &&
- ( ( localtime ( &temps ) -> tm_year + 1900 ) == GTK_CALENDAR ( scheduled_calendar ) -> year ) )
- gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ),
- localtime ( &temps ) -> tm_mday );
+ G_CALLBACK ( click_sur_jour_calendrier_echeance ),
+ NULL );
+
+ if ( ( localtime ( &temps ) -> tm_mon == calendar_month )
+ &&
+ ( ( localtime ( &temps ) -> tm_year + 1900 ) == calendar_year ) )
+ gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ), localtime ( &temps ) -> tm_mday );
else
- gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ),
- FALSE );
+ gtk_calendar_select_day ( GTK_CALENDAR ( scheduled_calendar ), FALSE );
g_signal_handlers_unblock_by_func ( G_OBJECT ( calendrier ),
- G_CALLBACK ( click_sur_jour_calendrier_echeance ),
- NULL );
+ G_CALLBACK ( click_sur_jour_calendrier_echeance ),
+ NULL );
}
-
/* Local Variables: */
/* c-basic-offset: 4 */
/* End: */
diff --git a/src/gsb_calendar_entry.c b/src/gsb_calendar_entry.c
index f81de12..01eb7d5 100644
--- a/src/gsb_calendar_entry.c
+++ b/src/gsb_calendar_entry.c
@@ -512,9 +512,7 @@ GtkWidget *gsb_calendar_entry_popup ( GtkWidget *entry )
gtk_widget_show ( button );
/* set the position */
- gdk_window_get_origin ( GTK_WIDGET ( entry ) -> window,
- &x,
- &y );
+ gdk_window_get_origin ( gtk_widget_get_window ( GTK_WIDGET ( entry ) ), &x, &y );
/* on récupère la taille de la popup */
popup_size = g_malloc0 ( sizeof ( GtkRequisition ));
diff --git a/src/gsb_currency.c b/src/gsb_currency.c
index a334696..5d2167f 100644
--- a/src/gsb_currency.c
+++ b/src/gsb_currency.c
@@ -149,37 +149,42 @@ GtkWidget *gsb_currency_make_combobox ( gboolean set_name )
{
GtkCellRenderer *text_renderer, *flag_renderer;
GtkWidget *combo_box;
+ gint xpad;
+ gint ypad;
if ( !combobox_currency_store )
- gsb_currency_create_combobox_store ();
+ gsb_currency_create_combobox_store ( );
- combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL
- (combobox_currency_store));
+ combo_box = gtk_combo_box_new_with_model ( GTK_TREE_MODEL ( combobox_currency_store ) );
/* Flag renderer */
- flag_renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), flag_renderer, FALSE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), flag_renderer,
- "pixbuf", CURRENCY_COL_FLAG, NULL );
+ flag_renderer = gtk_cell_renderer_pixbuf_new ( );
+ gtk_cell_layout_pack_start ( GTK_CELL_LAYOUT ( combo_box ), flag_renderer, FALSE );
+ gtk_cell_layout_set_attributes ( GTK_CELL_LAYOUT ( combo_box ),
+ flag_renderer,
+ "pixbuf", CURRENCY_COL_FLAG,
+ NULL );
- GTK_CELL_RENDERER(flag_renderer) -> xpad = 3; /* Ugly but how to set it otherwise ?*/
+ gtk_cell_renderer_get_padding ( GTK_CELL_RENDERER ( flag_renderer ), &xpad, &ypad );
+ gtk_cell_renderer_set_padding ( GTK_CELL_RENDERER ( flag_renderer ), 3, ypad );
- text_renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), text_renderer, FALSE);
+ text_renderer = gtk_cell_renderer_text_new ( );
+ gtk_cell_layout_pack_start ( GTK_CELL_LAYOUT ( combo_box ), text_renderer, FALSE );
if (set_name)
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), text_renderer,
- "text", CURRENCY_COL_NAME,
- NULL);
+ gtk_cell_layout_set_attributes ( GTK_CELL_LAYOUT ( combo_box ),
+ text_renderer,
+ "text", CURRENCY_COL_NAME,
+ NULL );
else
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), text_renderer,
- "text", CURRENCY_COL_CODE,
- NULL);
+ gtk_cell_layout_set_attributes ( GTK_CELL_LAYOUT ( combo_box ),
+ text_renderer,
+ "text", CURRENCY_COL_CODE,
+ NULL );
- gtk_combo_box_set_active ( GTK_COMBO_BOX (combo_box),
- 0 );
+ gtk_combo_box_set_active ( GTK_COMBO_BOX ( combo_box ), 0 );
- return (combo_box);
+ return ( combo_box );
}
@@ -539,7 +544,7 @@ void gsb_currency_exchange_dialog ( gint account_currency_number,
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, tmpstr );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
@@ -1051,56 +1056,57 @@ GtkWidget *gsb_currency_make_combobox_exchange_dialog ( gint transaction_currenc
GtkTreeIter iter;
GdkPixbuf *pixbuf;
gchar *string;
+ gchar *tmp_dir;
+ gint xpad;
+ gint ypad;
+
+ combobox_store = gtk_list_store_new ( 3, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING );
- combobox_store = gtk_list_store_new ( 3, G_TYPE_INT, GDK_TYPE_PIXBUF,
- G_TYPE_STRING);
+ string = g_strconcat ( gsb_data_currency_get_code_iso4217 ( transaction_currency_number ), ".png", NULL );
- string = g_strconcat( gsb_dirs_get_pixmaps_dir ( ), G_DIR_SEPARATOR_S,
- "flags", G_DIR_SEPARATOR_S,
- gsb_data_currency_get_code_iso4217 (
- transaction_currency_number ),
- ".png", NULL );
- pixbuf = gdk_pixbuf_new_from_file ( string, NULL );
- g_free (string);
+ tmp_dir = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "flags", string, NULL );
+ pixbuf = gdk_pixbuf_new_from_file ( tmp_dir, NULL );
+ g_free ( string );
+ g_free ( tmp_dir );
gtk_list_store_append ( GTK_LIST_STORE ( combobox_store ), &iter );
gtk_list_store_set ( combobox_store, &iter,
- 0, transaction_currency_number,
- 1, pixbuf,
- 2, gsb_data_currency_get_name ( transaction_currency_number ),
- -1 );
+ 0, transaction_currency_number,
+ 1, pixbuf,
+ 2, gsb_data_currency_get_name ( transaction_currency_number ),
+ -1 );
+
+ string = g_strconcat( gsb_data_currency_get_code_iso4217 ( account_currency_number ), ".png", NULL );
- string = g_strconcat( gsb_dirs_get_pixmaps_dir ( ), G_DIR_SEPARATOR_S,
- "flags", G_DIR_SEPARATOR_S,
- gsb_data_currency_get_code_iso4217 (
- account_currency_number ),
- ".png", NULL );
- pixbuf = gdk_pixbuf_new_from_file ( string, NULL );
- g_free (string);
+ tmp_dir = g_build_filename ( gsb_dirs_get_pixmaps_dir ( ), "flags", string, NULL );
+ pixbuf = gdk_pixbuf_new_from_file ( tmp_dir, NULL );
+ g_free ( string );
+ g_free ( tmp_dir );
gtk_list_store_append ( GTK_LIST_STORE ( combobox_store ), &iter );
gtk_list_store_set ( combobox_store, &iter,
- 0, account_currency_number,
- 1, pixbuf,
- 2, gsb_data_currency_get_name ( account_currency_number ),
- -1 );
+ 0, account_currency_number,
+ 1, pixbuf,
+ 2, gsb_data_currency_get_name ( account_currency_number ),
+ -1 );
- combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL
- (combobox_store));
+ combo_box = gtk_combo_box_new_with_model ( GTK_TREE_MODEL ( combobox_store ) );
/* Flag renderer */
- flag_renderer = gtk_cell_renderer_pixbuf_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), flag_renderer, FALSE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), flag_renderer,
- "pixbuf", 1, NULL );
+ flag_renderer = gtk_cell_renderer_pixbuf_new ( );
+ gtk_cell_layout_pack_start ( GTK_CELL_LAYOUT ( combo_box ), flag_renderer, FALSE );
+ gtk_cell_layout_set_attributes ( GTK_CELL_LAYOUT ( combo_box ),
+ flag_renderer,
+ "pixbuf", 1,
+ NULL );
- GTK_CELL_RENDERER(flag_renderer) -> xpad = 3; /* Ugly but how to set it otherwise ?*/
+ gtk_cell_renderer_get_padding ( GTK_CELL_RENDERER ( flag_renderer ), &xpad, &ypad );
+ gtk_cell_renderer_set_padding ( GTK_CELL_RENDERER ( flag_renderer ), 3, ypad );
- text_renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), text_renderer, FALSE);
+ text_renderer = gtk_cell_renderer_text_new ( );
+ gtk_cell_layout_pack_start ( GTK_CELL_LAYOUT ( combo_box ), text_renderer, FALSE );
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), text_renderer,
- "text", 2, NULL);
+ gtk_cell_layout_set_attributes ( GTK_CELL_LAYOUT ( combo_box ), text_renderer, "text", 2, NULL );
gtk_combo_box_set_active ( GTK_COMBO_BOX (combo_box), set_index );
diff --git a/src/gsb_currency_config.c b/src/gsb_currency_config.c
index de8fe8e..782a50f 100644
--- a/src/gsb_currency_config.c
+++ b/src/gsb_currency_config.c
@@ -953,7 +953,7 @@ gboolean gsb_currency_config_add_currency ( GtkWidget *button,
main_vbox = new_vbox_with_title_and_icon ( _("Select base currency for your account"),
"currencies.png" );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), main_vbox, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), main_vbox, TRUE, TRUE, 0 );
vbox = gtk_vbox_new ( FALSE, 12 );
gtk_box_pack_start ( GTK_BOX ( main_vbox ), vbox, TRUE, TRUE, 0 );
diff --git a/src/gsb_data_partial_balance.c b/src/gsb_data_partial_balance.c
index 145246c..f04309e 100644
--- a/src/gsb_data_partial_balance.c
+++ b/src/gsb_data_partial_balance.c
@@ -1546,7 +1546,7 @@ GtkWidget *gsb_partial_balance_create_dialog ( gint action, gint spin_value )
gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
main_vbox = new_vbox_with_title_and_icon ( _("Partial balance details"), "payment.png" );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), main_vbox, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), main_vbox, TRUE, TRUE, 0 );
vbox = gtk_vbox_new ( FALSE, 12 );
gtk_box_pack_start ( GTK_BOX ( main_vbox ), vbox, TRUE, TRUE, 0 );
@@ -1633,7 +1633,7 @@ gint gsb_partial_balance_request_currency ( GtkWidget *parent )
gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
hbox = gtk_hbox_new ( FALSE, 5 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), hbox, TRUE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area( dialog ) ), hbox, TRUE, FALSE, 0 );
label = gtk_label_new ( _("Select the currency of the partial balance: ") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 1 );
diff --git a/src/gsb_file.c b/src/gsb_file.c
index 9a8ebc8..7358d35 100644
--- a/src/gsb_file.c
+++ b/src/gsb_file.c
@@ -783,85 +783,88 @@ static gint gsb_file_dialog_save ( void )
GtkWidget *dialog;
gint difference = (gint) difftime ( now, run.file_modification );
gchar* message;
- gchar* tmpstr1;
- gchar* tmpstr2;
+ gchar* tmpstr1;
+ gchar* tmpstr2;
/* si le fichier n'est pas modifié on renvoie qu'on ne veut pas enregistrer */
-
- if ( ! gsb_file_get_modified ( ) )
- return GTK_RESPONSE_NO;
-
- if ( conf.sauvegarde_auto &&
- ( !etat.fichier_deja_ouvert || conf.force_enregistrement ) &&
- nom_fichier_comptes )
+ if ( !gsb_file_get_modified ( ) )
+ return GTK_RESPONSE_NO;
+
+ if ( conf.sauvegarde_auto
+ &&
+ ( !etat.fichier_deja_ouvert || conf.force_enregistrement )
+ &&
+ nom_fichier_comptes )
return GTK_RESPONSE_OK;
/* si le fichier était déjà locké et que force enregistrement n'est pas mis, */
/* on prévient ici */
dialog = gtk_message_dialog_new ( GTK_WINDOW ( run.window ),
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_NONE,
- " " );
- if ( etat.fichier_deja_ouvert
- &&
- !conf.force_enregistrement )
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_NONE,
+ NULL );
+ if ( etat.fichier_deja_ouvert && !conf.force_enregistrement )
{
- hint = g_strdup(_("Save locked files?"));
- message = g_strdup_printf ( _("The document '%s' is locked but modified. If you want to save it, you must cancel and save it with another name or activate the \"%s\" option in setup."),
- (nom_fichier_comptes ? g_path_get_basename(nom_fichier_comptes) : _("unnamed")),
- _("Force saving of locked files"));
- gtk_dialog_add_buttons ( GTK_DIALOG(dialog),
- _("Close without saving"), GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL );
- gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL );
+ hint = g_strdup ( _("Save locked files?") );
+ message = g_strdup_printf ( _("The document '%s' is locked but modified. "
+ "If you want to save it, you must cancel and save it with "
+ "another name or activate the \"%s\" option in setup."),
+ ( nom_fichier_comptes ? g_path_get_basename ( nom_fichier_comptes ) : _("unnamed") ),
+ _("Force saving of locked files") );
+
+ gtk_dialog_add_buttons ( GTK_DIALOG ( dialog ),
+ _("Close without saving"), GTK_RESPONSE_NO,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NULL );
+ gtk_dialog_set_default_response ( GTK_DIALOG ( dialog ), GTK_RESPONSE_CANCEL );
}
else
{
- hint = g_strdup_printf (_("Save changes to document '%s' before closing?"),
- (nom_fichier_comptes ? g_path_get_basename(nom_fichier_comptes) : _("unnamed")));
+ hint = g_strdup_printf ( _("Save changes to document '%s' before closing?"),
+ ( nom_fichier_comptes ? g_path_get_basename ( nom_fichier_comptes ) : _("unnamed") ) );
+
message = g_strdup("");
- gtk_dialog_add_buttons ( GTK_DIALOG(dialog),
- _("Close without saving"), GTK_RESPONSE_NO,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_OK,
- NULL );
- gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_OK );
+ gtk_dialog_add_buttons ( GTK_DIALOG(dialog),
+ _("Close without saving"), GTK_RESPONSE_NO,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+ NULL );
+ gtk_dialog_set_default_response ( GTK_DIALOG ( dialog ), GTK_RESPONSE_OK );
}
if ( difference >= 120 )
{
- time_elapsed = g_strdup_printf ( _( "%d minutes and %d seconds" ),
- difference / 60, difference % 60 );
+ time_elapsed = g_strdup_printf ( _( "%d minutes and %d seconds" ),
+ difference / 60, difference % 60 );
}
else if ( difference >= 60 )
{
- time_elapsed = g_strdup_printf ( _( "1 minute and %d seconds" ),
- difference % 60 );
+ time_elapsed = g_strdup_printf ( _( "1 minute and %d seconds" ), difference % 60 );
}
else
{
- time_elapsed = g_strdup_printf ( _( "%d seconds" ), difference );
+ time_elapsed = g_strdup_printf ( _( "%d seconds" ), difference );
}
+
tmpstr1 = message;
tmpstr2 = g_strdup_printf ( _("If you close without saving, all of your changes "
- "since %s will be discarded."),
- time_elapsed );
+ "since %s will be discarded."),
+ time_elapsed );
+
message = g_strconcat ( tmpstr1, tmpstr2 , NULL );
g_free ( tmpstr1 );
g_free ( tmpstr2 );
g_free ( time_elapsed );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog)->label ),
- make_hint ( hint, message ) );
+ gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG ( dialog ) ), make_hint ( hint, message ) );
g_free ( message );
g_free ( hint );
- gtk_window_set_modal ( GTK_WINDOW ( dialog ), TRUE );
- result = gtk_dialog_run (GTK_DIALOG (dialog));
+ result = gtk_dialog_run ( GTK_DIALOG ( dialog ) );
+
gtk_widget_destroy ( dialog );
return result;
@@ -1127,7 +1130,6 @@ void gsb_file_remove_name_from_opened_list ( gchar *filename )
void gsb_file_save_remove_old_file ( gchar *filename )
{
GtkWidget *dialog;
- GtkWidget *content_area;
GtkWidget *hbox;
GtkWidget *image;
GtkWidget *label;
@@ -1145,16 +1147,14 @@ void gsb_file_save_remove_old_file ( gchar *filename )
gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
gtk_window_set_resizable ( GTK_WINDOW ( dialog ), FALSE );
- content_area = GTK_DIALOG(dialog) -> vbox;
hbox = gtk_hbox_new ( FALSE, 5);
gtk_container_set_border_width ( GTK_CONTAINER( hbox ), 6 );
- gtk_box_pack_start ( GTK_BOX ( content_area ), hbox, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 5 );
- image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
- GTK_ICON_SIZE_DIALOG );
+ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG );
gtk_box_pack_start ( GTK_BOX ( hbox ), image, FALSE, FALSE, 5 );
- tmpstr = g_strdup_printf (
+ tmpstr = g_strdup_printf (
_("Caution, you are about to delete a file copy\n"
"from a previous version of grisbi.\n"
"\n<b>Do you want to delete this file:\n%s ?</b>"),
diff --git a/src/gsb_file_config.c b/src/gsb_file_config.c
index f4c4ffc..f373fee 100644
--- a/src/gsb_file_config.c
+++ b/src/gsb_file_config.c
@@ -494,10 +494,10 @@ gboolean gsb_file_config_save_config ( void )
#endif
/* get the geometry */
- if ( GTK_WIDGET ( run.window ) -> window )
+ if ( gtk_widget_get_window ( GTK_WIDGET ( run.window ) ) )
gtk_window_get_size ( GTK_WINDOW ( run.window ),
&conf.main_width, &conf.main_height);
- else
+ else
{
conf.main_width = 0;
conf.main_height = 0;
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 48f0bfb..2de88b8 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -880,6 +880,9 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
if ( !strcmp ( attribute_names[i], "Export_file_format" ) )
etat.export_file_format = utils_str_atoi ( attribute_values[i] );
+ else if ( !strcmp ( attribute_names[i], "Export_files_traitement" ) )
+ etat.export_files_traitement = utils_str_atoi ( attribute_values[i] );
+
else
unknown = 1;
break;
@@ -1009,6 +1012,10 @@ void gsb_file_load_general_part ( const gchar **attribute_names,
case 'R':
if ( !strcmp ( attribute_names[i], "Reconcile_end_date" ) )
etat.reconcile_end_date = utils_str_atoi ( attribute_values[i] );
+
+ else if ( !strcmp ( attribute_names[i], "Remind_display_per_account" ) )
+ etat.retient_affichage_par_compte = utils_str_atoi ( attribute_values[i] );
+
else
unknown = 1;
break;
diff --git a/src/gsb_file_save.c b/src/gsb_file_save.c
index 0bc9643..eacc358 100644
--- a/src/gsb_file_save.c
+++ b/src/gsb_file_save.c
@@ -758,7 +758,6 @@ gulong gsb_file_save_general_part ( gulong iterator,
"\t\tOne_line_showed=\"%d\"\n"
"\t\tTwo_lines_showed=\"%d\"\n"
"\t\tThree_lines_showed=\"%d\"\n"
- "\t\tRemind_form_per_account=\"%d\"\n"
"\t\tTransaction_column_width=\"%s\"\n"
"\t\tTransaction_column_align=\"%s\"\n"
"\t\tScheduler_column_width=\"%s\"\n"
@@ -812,7 +811,6 @@ gulong gsb_file_save_general_part ( gulong iterator,
display_one_line,
display_two_lines,
display_three_lines,
- 0,
my_safe_null_str(transaction_column_width_write),
my_safe_null_str ( transaction_column_align_write ),
my_safe_null_str(scheduler_column_width_write),
diff --git a/src/gsb_form.c b/src/gsb_form.c
index d8416a0..c348bca 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -208,7 +208,7 @@ GtkWidget *gsb_form_get_scheduler_part ( void )
void gsb_form_create_widgets ( void )
{
GtkWidget * hbox, * label, * separator, * hbox_buttons, * hbox_buttons_inner;
- GtkWidget * child = gtk_bin_get_child ( GTK_BIN(form_expander) );
+ GtkWidget * child = gtk_bin_get_child ( GTK_BIN ( form_expander ) );
GtkWidget *event_box;
gchar* tmpstr;
diff --git a/src/gsb_form_config.c b/src/gsb_form_config.c
index 3c1c1c5..5e7a71a 100644
--- a/src/gsb_form_config.c
+++ b/src/gsb_form_config.c
@@ -53,26 +53,26 @@
static gboolean gsb_form_config_add_column ( void );
static gboolean gsb_form_config_add_line ( void );
static gboolean gsb_form_config_change_account_choice ( GtkWidget *combobox,
- gpointer null );
+ gpointer null );
static gboolean gsb_form_config_change_column_size ( GtkWidget *tree_view,
- GtkAllocation *allocation,
- gpointer null );
+ GtkAllocation *allocation,
+ gpointer null );
static gboolean gsb_form_config_check_for_removing ( gint account_number,
- gint removing_row );
+ gint removing_row );
static GtkWidget *gsb_form_config_create_buttons_table ( void );
static GtkWidget *gsb_form_config_create_sizing_buttons_line ( void );
static GtkListStore *gsb_form_config_create_store ( void );
static GtkWidget *gsb_form_config_create_tree_view ( GtkListStore *store );
static gboolean gsb_form_config_drag_begin ( GtkWidget *tree_view,
- GdkDragContext *drag_context,
- gpointer null );
+ GdkDragContext *drag_context,
+ gpointer null );
static gboolean gsb_form_config_drag_end ( GtkWidget *tree_view,
- GdkDragContext *drag_context,
- gpointer null );
+ GdkDragContext *drag_context,
+ gpointer null );
static gboolean gsb_form_config_fill_store ( gint account_number );
static void gsb_form_config_make_configuration_box ( GtkWidget *vbox_parent );
static gboolean gsb_form_config_realized ( GtkWidget *tree_view,
- gpointer null );
+ gpointer null );
static gboolean gsb_form_config_remove_column ( void );
static gboolean gsb_form_config_remove_line ( void );
static gboolean gsb_form_config_toggle_element_button ( GtkWidget *toggle_button );
@@ -530,7 +530,7 @@ gboolean gsb_form_config_update_form_config ( gint account_number )
* \return FALSE
* */
gboolean gsb_form_config_change_account_choice ( GtkWidget *combobox,
- gpointer null )
+ gpointer null )
{
gint account_number;
@@ -780,31 +780,30 @@ gboolean gsb_form_config_fill_store ( gint account_number )
* \return FALSE
* */
gboolean gsb_form_config_realized ( GtkWidget *tree_view,
- gpointer null )
+ gpointer null )
{
gint column;
gint account_number;
- gint width;
+ GtkAllocation allocation;
if ( !assert_account_loaded())
return FALSE;
account_number = gsb_account_get_combo_account_number ( accounts_combobox );
- width = tree_view -> allocation.width;
+
+ gtk_widget_get_allocation ( tree_view, &allocation );
/* fill and update the form list and buttons */
- gsb_form_config_update_form_config(account_number);
+ gsb_form_config_update_form_config ( account_number );
- for ( column=0 ; column < gsb_data_form_get_nb_columns (account_number) ; column++ )
+ for ( column=0 ; column < gsb_data_form_get_nb_columns ( account_number ) ; column++ )
{
- gtk_tree_view_column_set_fixed_width ( gtk_tree_view_get_column ( GTK_TREE_VIEW ( tree_view ),
- column ),
- gsb_data_form_get_width_column ( account_number,
- column ) * width / 100 );
+ gtk_tree_view_column_set_fixed_width (
+ gtk_tree_view_get_column ( GTK_TREE_VIEW ( tree_view ), column ),
+ gsb_data_form_get_width_column ( account_number, column ) * allocation.width / 100 );
}
- gdk_window_set_cursor ( tree_view -> window,
- gdk_cursor_new ( GDK_FLEUR ) );
+ gdk_window_set_cursor ( gtk_widget_get_window ( tree_view ), gdk_cursor_new ( GDK_FLEUR ) );
return FALSE;
}
@@ -821,12 +820,13 @@ gboolean gsb_form_config_realized ( GtkWidget *tree_view,
* \return FALSE
* */
gboolean gsb_form_config_change_column_size ( GtkWidget *tree_view,
- GtkAllocation *allocation,
- gpointer null )
+ GtkAllocation *allocation,
+ gpointer null )
{
gint column;
gint account_number;
gint i;
+ GtkAllocation *tmp_allocation = NULL;
if ( !gtk_widget_get_realized ( tree_view ) )
return FALSE;
@@ -835,24 +835,26 @@ gboolean gsb_form_config_change_column_size ( GtkWidget *tree_view,
for (i=0 ; i<gsb_data_account_get_accounts_amount () ; i++)
{
- for ( column=0 ; column < gsb_data_form_get_nb_columns (i) ; column++ )
- {
- gint size_column;
-
- size_column = gtk_tree_view_column_get_width ( gtk_tree_view_get_column ( GTK_TREE_VIEW ( tree_view ),
- column ));
- gsb_data_form_set_width_column ( i,
- column,
- size_column * 100 / allocation -> width );
- }
+ for ( column=0 ; column < gsb_data_form_get_nb_columns (i) ; column++ )
+ {
+ gint size_column;
+
+ size_column = gtk_tree_view_column_get_width (
+ gtk_tree_view_get_column ( GTK_TREE_VIEW ( tree_view ), column ) );
+ gsb_data_form_set_width_column ( i,
+ column,
+ size_column * 100 / allocation -> width );
+ }
}
gsb_file_set_modified ( TRUE );
/* update the form if needed */
- saved_allocation_size = 0;
- gsb_form_allocate_size ( NULL, &(form_transaction_part -> allocation), NULL );
- gsb_form_create_widgets ();
+ saved_allocation_size = 0;
+ gtk_widget_get_allocation ( form_transaction_part, tmp_allocation );
+ gsb_form_allocate_size ( NULL, tmp_allocation, NULL );
+
+ gsb_form_create_widgets ();
return FALSE;
}
@@ -1137,8 +1139,8 @@ gboolean gsb_form_config_check_for_removing ( gint account_number,
* \return FALSE
* */
gboolean gsb_form_config_drag_begin ( GtkWidget *tree_view,
- GdkDragContext *drag_context,
- gpointer null )
+ GdkDragContext *drag_context,
+ gpointer null )
{
gint x, y;
GtkTreePath *path;
@@ -1199,8 +1201,8 @@ gboolean gsb_form_config_drag_begin ( GtkWidget *tree_view,
* \return FALSE
* */
gboolean gsb_form_config_drag_end ( GtkWidget *tree_view,
- GdkDragContext *drag_context,
- gpointer null )
+ GdkDragContext *drag_context,
+ gpointer null )
{
gint x, y;
GtkTreePath *path;
diff --git a/src/gsb_payment_method_config.c b/src/gsb_payment_method_config.c
index 6e7fcda..5cee45d 100644
--- a/src/gsb_payment_method_config.c
+++ b/src/gsb_payment_method_config.c
@@ -1289,7 +1289,7 @@ gboolean gsb_payment_method_config_switch_payment ( gint payment_number )
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, _("Payment method is used by transactions") );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
diff --git a/src/gsb_scheduler_list.c b/src/gsb_scheduler_list.c
index d662a14..6b177d6 100644
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@ -2055,7 +2055,7 @@ gboolean gsb_scheduler_list_delete_scheduled_transaction ( gint scheduled_number
_("Only this one"), 0,
NULL );
- vbox = GTK_DIALOG(dialog) -> vbox;
+ vbox = gtk_dialog_get_content_area ( GTK_DIALOG ( dialog ) );
checkbox = gtk_check_button_new_with_label ( _("Do not show this message again") );
g_signal_connect ( G_OBJECT ( checkbox ),
@@ -2165,7 +2165,7 @@ gboolean gsb_scheduler_list_popup_custom_periodicity_dialog (void)
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, _("Scheduler frequency") );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
diff --git a/src/gsb_select_icon.c b/src/gsb_select_icon.c
index ef50611..bf64537 100644
--- a/src/gsb_select_icon.c
+++ b/src/gsb_select_icon.c
@@ -148,7 +148,6 @@ gboolean gsb_select_icon_init_logo_variables ( void )
* */
gchar *gsb_select_icon_create_window ( gchar *name_icon )
{
- GtkWidget *content_area;
GtkWidget *hbox;
GtkWidget *chooser_button;
GtkWidget *scroll;
@@ -177,12 +176,11 @@ gchar *gsb_select_icon_create_window ( gchar *name_icon )
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT);
gtk_widget_set_size_request ( dialog, 400, 450 );
- content_area = GTK_DIALOG ( dialog ) -> vbox;
/* création hbox pour GtkEntry répertoire et bouton sélection des répertoires */
hbox = gtk_hbox_new ( FALSE, 5);
gtk_container_set_border_width ( GTK_CONTAINER( hbox ), 6 );
- gtk_box_pack_start ( GTK_BOX ( content_area ), hbox, FALSE, FALSE, 5 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 5 );
/* création du GtkComboBox pour la saisie du répertoire */
entry_text = gsb_select_icon_create_entry_text ( name_icon );
@@ -196,7 +194,7 @@ gchar *gsb_select_icon_create_window ( gchar *name_icon )
scroll = gtk_scrolled_window_new ( NULL, NULL);
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW ( scroll ),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start ( GTK_BOX ( content_area ), scroll, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), scroll, TRUE, TRUE, 0 );
icon_view = gsb_select_icon_create_icon_view ( name_icon );
gtk_container_set_border_width ( GTK_CONTAINER( scroll ), 6 );
gtk_container_add ( GTK_CONTAINER ( scroll ), icon_view );
@@ -444,7 +442,7 @@ void gsb_select_icon_create_file_chooser ( GtkWidget *button,
gtk_icon_view_scroll_to_path (GTK_ICON_VIEW ( icon_view ),
path, TRUE, 0.5, 0 );
gsb_select_icon_add_path ( );
- gtk_entry_set_text ( GTK_ENTRY (GTK_BIN (entry_text)->child ),
+ gtk_entry_set_text ( GTK_ENTRY ( gtk_bin_get_child ( GTK_BIN ( entry_text ) ) ),
path_icon );
gtk_widget_set_sensitive (bouton_OK, FALSE );
}
diff --git a/src/gsb_status.c b/src/gsb_status.c
index 1c6357f..1288b14 100644
--- a/src/gsb_status.c
+++ b/src/gsb_status.c
@@ -65,7 +65,7 @@ static gint timer_id;
*/
/** Window under cursor at the time the cursor animation changed. */
-static GdkWindow * tracked_window;
+static GdkWindow *tracked_window;
/**
@@ -77,7 +77,7 @@ static GdkWindow * tracked_window;
GtkWidget * gsb_new_statusbar ()
{
main_statusbar = gtk_statusbar_new ();
- context_id = gtk_statusbar_get_context_id ( GTK_STATUSBAR (main_statusbar), "Grisbi" );
+ context_id = gtk_statusbar_get_context_id ( GTK_STATUSBAR ( main_statusbar ), "Grisbi" );
message_id = -1;
gtk_widget_show_all ( main_statusbar );
@@ -95,10 +95,10 @@ GtkWidget * gsb_new_statusbar ()
void gsb_status_message ( gchar * message )
{
if ( ! main_statusbar || ! GTK_IS_STATUSBAR ( main_statusbar ) )
- return;
+ return;
gsb_status_clear ();
- message_id = gtk_statusbar_push ( GTK_STATUSBAR (main_statusbar), context_id, message );
+ message_id = gtk_statusbar_push ( GTK_STATUSBAR ( main_statusbar ), context_id, message );
/* force status message to be displayed NOW */
update_gui ( );
@@ -112,12 +112,12 @@ void gsb_status_message ( gchar * message )
void gsb_status_clear ( )
{
if ( ! main_statusbar || ! GTK_IS_STATUSBAR ( main_statusbar ) )
- return;
+ return;
if ( message_id >= 0 )
{
- gtk_statusbar_remove ( GTK_STATUSBAR (main_statusbar), context_id, message_id );
- message_id = -1;
+ gtk_statusbar_remove ( GTK_STATUSBAR ( main_statusbar ), context_id, message_id );
+ message_id = -1;
}
/* force status message to be displayed NOW */
@@ -135,35 +135,37 @@ void gsb_status_clear ( )
*/
void gsb_status_wait ( gboolean force_update )
{
- GdkWindow * current_window;
+ GdkWindow *current_window;
+ GdkWindow *run_window;
- gdk_window_set_cursor ( run.window -> window,
- gdk_cursor_new_for_display ( gdk_display_get_default ( ),
- GDK_WATCH ) );
+ run_window = gtk_widget_get_window ( run.window );
- current_window = gdk_display_get_window_at_pointer ( gdk_display_get_default ( ),
- NULL, NULL );
+ gdk_window_set_cursor ( run_window,
+ gdk_cursor_new_for_display ( gdk_display_get_default ( ),
+ GDK_WATCH ) );
+
+ current_window = gdk_display_get_window_at_pointer ( gdk_display_get_default ( ), NULL, NULL );
if ( current_window && GDK_IS_WINDOW ( current_window )
&&
- current_window != run.window -> window )
+ current_window != run_window )
{
- GdkWindow * parent = gdk_window_get_toplevel ( current_window );
-
- if ( parent && parent != current_window )
- {
- current_window = parent;
- }
-
- gdk_window_set_cursor ( current_window,
- gdk_cursor_new_for_display ( gdk_display_get_default ( ),
- GDK_WATCH ) );
-
- tracked_window = current_window;
+ GdkWindow *parent = gdk_window_get_toplevel ( current_window );
+
+ if ( parent && parent != current_window )
+ {
+ current_window = parent;
+ }
+
+ gdk_window_set_cursor ( current_window,
+ gdk_cursor_new_for_display ( gdk_display_get_default ( ),
+ GDK_WATCH ) );
+
+ tracked_window = current_window;
}
if ( force_update )
- update_gui ( );
+ update_gui ( );
}
@@ -176,19 +178,19 @@ void gsb_status_wait ( gboolean force_update )
*/
void gsb_status_stop_wait ( gboolean force_update )
{
- if ( ! run.window )
- return;
+ if ( !run.window )
+ return;
- gdk_window_set_cursor ( run.window -> window, NULL );
+ gdk_window_set_cursor ( gtk_widget_get_window ( run.window ), NULL );
if ( tracked_window && gdk_window_is_visible ( tracked_window ) )
{
- gdk_window_set_cursor ( tracked_window, NULL );
- tracked_window = NULL;
+ gdk_window_set_cursor ( tracked_window, NULL );
+ tracked_window = NULL;
}
if ( force_update )
- update_gui ( );
+ update_gui ( );
}
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index 7cbee16..f0ce674 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -706,17 +706,22 @@ void update_titres_tree_view ( void )
for ( i = 0 ; i < CUSTOM_MODEL_VISIBLE_COLUMNS ; i++ )
{
- gtk_tree_view_column_set_title ( GTK_TREE_VIEW_COLUMN (
- transactions_tree_view_columns[i] ),
- _(titres_colonnes_liste_operations[i] ) );
+ GtkTreeViewColumn *col;
+ GtkWidget *button;
- if ( GTK_TREE_VIEW_COLUMN ( transactions_tree_view_columns[i] )->button )
+ col = GTK_TREE_VIEW_COLUMN ( transactions_tree_view_columns[i] );
+ gtk_tree_view_column_set_title ( col, ( titres_colonnes_liste_operations[i] ) );
+
+/* for gtk3
+ * button = gtk_tree_view_column_get_button ( col );
+ */
+ button = col->button;
+ if ( button )
{
- gtk_widget_set_tooltip_text ( GTK_WIDGET ( GTK_TREE_VIEW_COLUMN (
- transactions_tree_view_columns[i] )->button ),
- tips_col_liste_operations[i] );
+ gtk_widget_set_tooltip_text ( button, tips_col_liste_operations[i] );
}
}
+ /* return */
}
@@ -764,30 +769,36 @@ GtkWidget *gsb_transactions_list_create_tree_view ( GtkTreeModel *model )
for ( i = 0 ; i < CUSTOM_MODEL_VISIBLE_COLUMNS ; i++ )
{
- gtk_tree_view_append_column ( GTK_TREE_VIEW ( tree_view ),
- transactions_tree_view_columns[i] );
-
- gtk_tree_view_column_set_clickable ( transactions_tree_view_columns[i],
- TRUE );
+ GtkWidget *button;
+ GtkTreeViewColumn *col;
- /* set the tooltips */
- gtk_widget_set_tooltip_text ( GTK_WIDGET (transactions_tree_view_columns[i] -> button),
- tips_col_liste_operations[i] );
+ col = GTK_TREE_VIEW_COLUMN ( transactions_tree_view_columns[i] );
+ gtk_tree_view_append_column ( GTK_TREE_VIEW ( tree_view ), col );
- g_signal_connect ( G_OBJECT ( transactions_tree_view_columns[i] -> button),
- "button-press-event",
- G_CALLBACK ( gsb_transactions_list_title_column_button_press ),
- GINT_TO_POINTER ( i ) );
+ gtk_tree_view_column_set_clickable ( col, TRUE );
- /* use the click to sort the list */
- g_signal_connect ( G_OBJECT ( transactions_tree_view_columns[i] ),
- "clicked",
- G_CALLBACK ( gsb_transactions_list_change_sort_column ),
- GINT_TO_POINTER ( i ) );
+ /* set the tooltips */
+/* for gtk3
+ * button = gtk_tree_view_column_get_button ( col );
+ */
+ button = col->button;
+ gtk_widget_set_tooltip_text ( button, tips_col_liste_operations[i] );
+
+ g_signal_connect ( G_OBJECT ( button ),
+ "button-press-event",
+ G_CALLBACK ( gsb_transactions_list_title_column_button_press ),
+ GINT_TO_POINTER ( i ) );
+
+ /* use the click to sort the list */
+ g_signal_connect ( G_OBJECT ( col ),
+ "clicked",
+ G_CALLBACK ( gsb_transactions_list_change_sort_column ),
+ GINT_TO_POINTER ( i ) );
}
- gtk_tree_view_set_model ( GTK_TREE_VIEW ( tree_view ),
- GTK_TREE_MODEL ( model ) );
+ gtk_tree_view_set_model ( GTK_TREE_VIEW ( tree_view ), GTK_TREE_MODEL ( model ) );
+
+ /* return */
return tree_view;
}
@@ -2041,7 +2052,7 @@ gint gsb_transactions_list_choose_reconcile ( gint account_number,
label = gtk_label_new ( _("Select the reconciliation to associate to the selected transaction: ") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
- gtk_box_pack_start ( GTK_BOX (GTK_DIALOG (dialog) -> vbox),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ),
label,
FALSE, FALSE, 10 );
gtk_widget_show (label);
@@ -2050,7 +2061,7 @@ gint gsb_transactions_list_choose_reconcile ( gint account_number,
gtk_scrolled_window_set_policy ( GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC );
- gtk_box_pack_start ( GTK_BOX (GTK_DIALOG (dialog) -> vbox),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ),
scrolled_window,
TRUE, TRUE, 0 );
gtk_widget_show (scrolled_window);
diff --git a/src/gtk_combofix.c b/src/gtk_combofix.c
index 6f3eb2d..4efdae6 100644
--- a/src/gtk_combofix.c
+++ b/src/gtk_combofix.c
@@ -609,9 +609,10 @@ static void gtk_combofix_init ( GtkComboFix *combofix )
GtkCellRenderer *cell_renderer;
GtkTreeViewColumn *tree_view_column;
GtkWidget *scrolled_window;
- GtkComboFixPrivate *priv = GTK_COMBOFIX_GET_PRIVATE ( combofix );
+ GtkComboFixPrivate *priv;
- combofix -> priv = priv;
+ combofix -> priv = GTK_COMBOFIX_GET_PRIVATE ( combofix );
+ priv = combofix -> priv;
/* set the fields of the combofix */
priv -> force = FALSE;
@@ -1289,6 +1290,7 @@ static gboolean gtk_combofix_set_popup_position ( GtkComboFix *combofix )
gint x, y;
gint height;
GdkRectangle rectangle;
+ GtkAllocation allocation;
gint horizontal_separator;
GtkComboFixPrivate *priv;
@@ -1297,11 +1299,11 @@ static gboolean gtk_combofix_set_popup_position ( GtkComboFix *combofix )
priv = combofix -> priv;
/* get the position of the combofix */
- gdk_window_get_origin ( GTK_WIDGET ( combofix->entry ) -> window, &x, &y );
+ gdk_window_get_origin ( gtk_widget_get_window ( combofix->entry ), &x, &y );
- gtk_widget_style_get(GTK_WIDGET ( priv -> tree_view ),
- "horizontal-separator", &horizontal_separator,
- NULL );
+ gtk_widget_style_get ( GTK_WIDGET ( priv -> tree_view ),
+ "horizontal-separator", &horizontal_separator,
+ NULL );
if ( gtk_widget_get_realized ( priv -> tree_view ) )
{
@@ -1313,14 +1315,20 @@ static gboolean gtk_combofix_set_popup_position ( GtkComboFix *combofix )
height = ( priv -> visible_items ) * ( rectangle.height + horizontal_separator ) + 4;
}
else
- height = ( priv -> visible_items ) * ( GTK_WIDGET (
- combofix -> entry ) -> allocation.height + horizontal_separator) + 4;
+ {
+ gtk_widget_get_allocation ( combofix -> entry, &allocation );
+
+ height = ( priv -> visible_items ) * ( allocation.height + horizontal_separator ) + 4;
+
+ }
/* if the popup is too small to contain all, we check to set it on the bottom or on the top
* if the place on the top is more than 2 times bigger than the bottom, we set it on the top */
- if ( ( ( gdk_screen_height ( ) - y - GTK_WIDGET ( combofix ) -> allocation.height ) < height )
- &&
- ( ( ( gdk_screen_height () - y ) * 3 ) < y ) )
+ gtk_widget_get_allocation ( GTK_WIDGET ( combofix ), &allocation );
+
+ if ( ( ( gdk_screen_height ( ) - y - allocation.height ) < height )
+ &&
+ ( ( ( gdk_screen_height () - y ) * 3 ) < y ) )
{
/* popup on the top */
if ( y > height )
@@ -1334,16 +1342,14 @@ static gboolean gtk_combofix_set_popup_position ( GtkComboFix *combofix )
else
{
/* popup on the bottom */
- y += GTK_WIDGET ( combofix ) -> allocation.height;
+ y += allocation.height;
if ( ( gdk_screen_height ( ) - y ) < height )
height = gdk_screen_height ( ) - y;
}
gtk_window_move ( GTK_WINDOW ( priv -> popup ), x, y );
- gtk_widget_set_size_request ( GTK_WIDGET ( priv -> popup ),
- GTK_WIDGET ( combofix ) -> allocation.width,
- height );
+ gtk_widget_set_size_request ( GTK_WIDGET ( priv -> popup ), allocation.width, height );
return FALSE;
}
@@ -1364,17 +1370,21 @@ static gboolean gtk_combofix_button_press ( GtkWidget *popup,
GdkEventButton *ev,
GtkComboFix *combofix )
{
- if ( ( ev -> x_root > ( GTK_WIDGET (popup) -> allocation.x ))
- &&
- ( ev -> x_root < ( GTK_WIDGET (popup) -> allocation.x + GTK_WIDGET (popup) -> allocation. width ))
- &&
- ( ev -> y_root > ( GTK_WIDGET (popup) -> allocation.y ))
- &&
- ( ev -> x_root < ( GTK_WIDGET (popup) -> allocation.y + GTK_WIDGET (popup) -> allocation. height)))
- return TRUE;
+ GtkAllocation allocation;
+
+ gtk_widget_get_allocation ( popup, &allocation );
+
+ if ( ( ev -> x_root > allocation.x )
+ &&
+ ( ev -> x_root < ( allocation.x + allocation. width ) )
+ &&
+ ( ev -> y_root > allocation.y )
+ &&
+ ( ev -> x_root < ( allocation.y +allocation. height ) ) )
+ return TRUE;
gdk_pointer_ungrab ( GDK_CURRENT_TIME );
- gtk_widget_hide (popup);
+ gtk_widget_hide ( popup );
return FALSE;
}
@@ -1828,7 +1838,11 @@ static gint gtk_combofix_get_rows_number_by_page ( GtkComboFix *combofix )
priv = combofix -> priv;
adjustment = gtk_tree_view_get_vadjustment ( GTK_TREE_VIEW ( priv -> tree_view ) );
- return_value = priv -> visible_items * adju GTK_TREE_VIEW ( priv -> tree_view ) ); bofix ) t))) ); and save it with another name or activate the \"%s\" option in setup."), è»ú=+ À»Aÿ Þú=+ °°Aÿ ¯Aÿ kðù=+ 6 è è! è! P»Aÿ À»Aÿ x¤»ú=+ °±Aÿ Òù=+ ðù=+ P»Aÿ `Òù=+ »Aÿ Àû=+ uÚù=+ û=+ Øû=+ ¨û=+ úù=+ x¤»ú=+ °±Aÿ °Aÿ kðù=+ à! à! P»Aÿ À»Aÿ Hnú=+ ²Aÿ Òù=+ ðù=+ P»Aÿ `Òù=+ »Aÿ »Aÿ x»Aÿ 8û¿ù=+ p À»Aÿ uÚù=+ úù=+ ²Aÿ `±Aÿ kðù=+ G H I J K M N O P P»Aÿ À»Aÿ H%rú=+ 0´Aÿ Òù=+ ðù=+ P»Aÿ 0û=+ uÚù=+ °»ú=+ YOú=+ û=+ Øû=+ ¨û=+ úù=+ H%rú=+ 0´Aÿ
p²Aÿ kðù=+ 8%rú=+ 0´Aÿ ²Aÿ kðù=+ (%rú=+ 0´Aÿ вAÿ kðù=+ %rú=+ 0´Aÿ ³Aÿ kðù=+ ¨û=+ uÚù=+ ¨û=+ Aÿ ¨Oú=+ eÙù=+ Øû=+ ³Aÿ y¨Oú=+ eÙù=+ û=+ гAÿ Z¨Oú=+ eÙù=+ ØTOú=+ °»ú=+ YOú=+ û=+ Ø´»ú=+ Øû=+ ¨û=+ úù=+ 8û¿ù=+ ú=+ À»Aÿ pëNú=+ µAÿ P´Aÿ kðù=+ 5 6 7 8 : < = > ? @ B D P»Aÿ À»Aÿ àú=+ À»Aÿ uÚù=+ õ¿ù=+ ´Aÿ ú=+ eÙù=+ õ¿ù=+ Õ_ at fÆS Qöl±íÁ3çù=+ À»Aÿ àú=+ ¶Aÿ `µAÿ kðù=+ u]ÞÓ 4Q ÷U^Qʧ ¶uª¹ñìò*ÄvP»Aÿ À»Aÿ Hnäù=+ ´ ú=+ ½Aÿ ¦Àû=+ ¦Àû=+ ú=+ »Aÿ À¼Aÿ x»Aÿ à·Aÿ ¿»ú=+ uÚù=+ Ø´»ú=+ @¾Aÿ ¢Àû=+ ½Aÿ ¸A
ÿ ÿÿÿÿÿÿÿÿ¢Àû=+ È»Aÿ stment -> page_size / adjustment -> upper;
+ return_value = priv -> visible_items
+ *
+ gtk_adjustment_get_page_size ( adjustment)
+ /
+ gtk_adjustment_get_upper ( adjustment );
return return_value;
}
@@ -2077,8 +2091,8 @@ void gtk_combofix_dialog ( gchar *text, gchar *hint )
dialog = gtk_message_dialog_new ( NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
- "%s", tmp_str );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG (dialog)->label ), tmp_str );
+ NULL );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), tmp_str );
g_free ( tmp_str );
diff --git a/src/import.c b/src/import.c
index 5c41b7e..a3d57f5 100644
--- a/src/import.c
+++ b/src/import.c
@@ -1425,12 +1425,12 @@ gint gsb_import_add_currency ( struct struct_compte_importation * compte )
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO,
- "%s", text );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG ( dialog ) ->label ), text );
+ NULL );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), text );
- vbox = GTK_DIALOG(dialog) -> vbox;
+ vbox = gtk_dialog_get_content_area ( GTK_DIALOG ( dialog ) );
- checkbox = gtk_check_button_new_with_label (
+ checkbox = gtk_check_button_new_with_label (
_("Use this currency for totals for the payees categories\n"
"and budgetary lines") );
gtk_box_pack_start ( GTK_BOX ( vbox ), checkbox, TRUE, TRUE, 6 );
@@ -1438,7 +1438,7 @@ gint gsb_import_add_currency ( struct struct_compte_importation * compte )
gtk_widget_show_all ( checkbox );
gtk_window_set_modal ( GTK_WINDOW ( dialog ), TRUE );
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ response = gtk_dialog_run ( GTK_DIALOG ( dialog ) );
if ( response == GTK_RESPONSE_YES
&&
@@ -2292,7 +2292,7 @@ void confirmation_enregistrement_ope_import ( struct struct_compte_importation *
}
label = gtk_label_new ( tmpstr );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )-> vbox ),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ),
label,
FALSE,
FALSE,
@@ -2302,7 +2302,7 @@ void confirmation_enregistrement_ope_import ( struct struct_compte_importation *
/* set the decoration */
frame = gtk_frame_new (NULL);
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )-> vbox ), frame, TRUE, TRUE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), frame, TRUE, TRUE, 0 );
gtk_widget_show ( frame );
vbox = gtk_vbox_new ( FALSE, 0 );
@@ -3253,7 +3253,7 @@ void gsb_import_show_orphan_transactions ( GSList *orphan_list,
label = gtk_label_new ( _("Mark transactions you want to add to the list and click the "
"OK button"));
gtk_misc_set_alignment ( GTK_MISC ( label ), 0.0, 0.0 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ),
label,
FALSE,
FALSE,
@@ -3297,7 +3297,7 @@ void gsb_import_show_orphan_transactions ( GSList *orphan_list,
scrolled_window = gtk_scrolled_window_new ( FALSE, FALSE );
gtk_widget_set_size_request ( scrolled_window, -1, 300 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ),
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ),
scrolled_window,
TRUE,
TRUE,
@@ -4564,7 +4564,7 @@ gchar **gsb_import_by_rule_ask_filename ( gint rule )
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, tmpstr );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
diff --git a/src/imputation_budgetaire.c b/src/imputation_budgetaire.c
index d5747ae..cee85cb 100644
--- a/src/imputation_budgetaire.c
+++ b/src/imputation_budgetaire.c
@@ -756,7 +756,7 @@ gboolean edit_budgetary_line ( GtkTreeView * view )
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, title );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
diff --git a/src/metatree.c b/src/metatree.c
index 2f44ffb..4abb699 100644
--- a/src/metatree.c
+++ b/src/metatree.c
@@ -1743,7 +1743,7 @@ gboolean find_destination_blob ( MetatreeInterface * iface,
g_free ( tmpstr2 );
hbox = gtk_hbox_new ( FALSE, 6 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), hbox,
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox,
FALSE, FALSE, 0 );
if ( iface -> content == 0 )
@@ -1843,7 +1843,7 @@ gboolean find_destination_blob ( MetatreeInterface * iface,
/* other choice, just remove the division */
hbox = gtk_hbox_new ( FALSE, 6 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), hbox,
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox,
FALSE, FALSE, 0 );
if ( iface -> content == 0 )
@@ -2855,11 +2855,11 @@ gboolean metatree_find_destination_blob ( MetatreeInterface *iface,
g_free ( tmp_str_2 );
g_free ( tmp_str_3 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), button, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), button, FALSE, FALSE, 0 );
/* create the list containing division and sub-division without the current division */
hbox = gtk_hbox_new ( FALSE, 6 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
label = gtk_label_new ( _("Select the destination: ") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0 );
@@ -2880,7 +2880,7 @@ gboolean metatree_find_destination_blob ( MetatreeInterface *iface,
button_action_selected = 0;
hbox = gtk_hbox_new ( FALSE, 6 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox ), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
label = gtk_label_new ( _("Select the destination: ") );
gtk_misc_set_alignment ( GTK_MISC ( label ), 0, 0 );
diff --git a/src/navigation.c b/src/navigation.c
index 054366c..53dd585 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -209,6 +209,8 @@ GtkWidget *gsb_gui_navigation_create_navigation_pane ( void )
GtkTreeDragSourceIface * navigation_src_iface;
GtkTreeViewColumn * column;
gint i;
+ gint xpad;
+ gint ypad;
vbox = gtk_vbox_new ( FALSE, 6 );
@@ -299,25 +301,27 @@ GtkWidget *gsb_gui_navigation_create_navigation_pane ( void )
/* Pixbuf renderer. */
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), renderer, FALSE);
- gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
- "pixbuf", NAVIGATION_PIX);
- gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
- "visible", NAVIGATION_PIX_VISIBLE);
+ gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
+ "pixbuf", NAVIGATION_PIX);
+ gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
+ "visible", NAVIGATION_PIX_VISIBLE);
gtk_tree_view_column_set_expand ( column, FALSE );
/* Text renderer. */
- renderer = gtk_cell_renderer_text_new();
- renderer -> xpad = 6;
+ renderer = gtk_cell_renderer_text_new ( );
+
+ gtk_cell_renderer_get_padding ( GTK_CELL_RENDERER ( renderer ), &xpad, &ypad );
+ gtk_cell_renderer_set_padding ( GTK_CELL_RENDERER ( renderer ), 6, ypad );
+
gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column), renderer, TRUE);
- gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
- "text", NAVIGATION_TEXT);
- gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
- "weight", NAVIGATION_FONT);
- gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
- "sensitive", NAVIGATION_SENSITIVE);
-
- gtk_tree_view_append_column ( GTK_TREE_VIEW ( navigation_tree_view ),
- GTK_TREE_VIEW_COLUMN ( column ) );
+ gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
+ "text", NAVIGATION_TEXT );
+ gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
+ "weight", NAVIGATION_FONT);
+ gtk_tree_view_column_add_attribute(GTK_TREE_VIEW_COLUMN(column), renderer,
+ "sensitive", NAVIGATION_SENSITIVE);
+
+ gtk_tree_view_append_column ( GTK_TREE_VIEW ( navigation_tree_view ), GTK_TREE_VIEW_COLUMN ( column ) );
/* crée les pages dans le panneau de gauche */
tmp_queue = gsb_gui_navigation_get_pages_list ( );
diff --git a/src/parametres.c b/src/parametres.c
index ef342cd..2b3af4c 100644
--- a/src/parametres.c
+++ b/src/parametres.c
@@ -573,7 +573,7 @@ gboolean preferences ( gint page )
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 ( dialog_get_content_area ( fenetre_preferences ) ),
hpaned, TRUE, TRUE, 0);
/* balance estimate subtree */
diff --git a/src/plugins/openssl/openssl.c b/src/plugins/openssl/openssl.c
index b05e84a..d13db07 100644
--- a/src/plugins/openssl/openssl.c
+++ b/src/plugins/openssl/openssl.c
@@ -328,7 +328,7 @@ gchar *gsb_file_util_ask_for_crypt_key ( gchar * file_name, gchar * additional_m
gtk_dialog_set_default_response ( GTK_DIALOG ( dialog ), GTK_RESPONSE_OK );
hbox = gtk_hbox_new ( FALSE, 6 );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog ) -> vbox), hbox, TRUE, TRUE, 6 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, TRUE, TRUE, 6 );
/* Ugly dance to force alignement. */
vbox = gtk_vbox_new ( FALSE, 6 );
diff --git a/src/print_report.c b/src/print_report.c
index 27957fa..ec8ffef 100644
--- a/src/print_report.c
+++ b/src/print_report.c
@@ -44,26 +44,26 @@
/*START_STATIC*/
-static GtkWidget * print_config_show_config ( GtkPrintOperation * operation,
- gpointer null );
-static gboolean print_config_show_config_apply ( GtkPrintOperation * operation,
- GtkWidget * widget,
- gpointer null );
+static GtkWidget * print_config_show_config ( GtkPrintOperation *operation,
+ gpointer null );
+static gboolean print_config_show_config_apply ( GtkPrintOperation *operation,
+ GtkWidget * widget,
+ gpointer null );
static gboolean print_report_begin ( GtkPrintOperation *operation,
- GtkPrintContext *context,
- gpointer null );
+ GtkPrintContext *context,
+ gpointer null );
static void print_report_draw_column ( GtkTableChild *child,
- gint line_position );
+ gint line_position );
static void print_report_draw_line ( GtkTableChild *child,
- gint line_position );
+ gint line_position );
static gboolean print_report_draw_page ( GtkPrintOperation *operation,
- GtkPrintContext *context,
- gint page,
- gpointer null );
+ GtkPrintContext *context,
+ gint page,
+ gpointer null );
static void print_report_draw_row ( GtkPrintContext *context,
- GtkTableChild *child,
- gint line_position,
- gint is_title );
+ GtkTableChild *child,
+ gint line_position,
+ gint is_title );
/*END_STATIC*/
/*START_EXTERN*/
@@ -95,7 +95,7 @@ static gint current_child_line = 0;
* \return FALSE
* */
gboolean print_report ( GtkWidget *button,
- gpointer null )
+ gpointer null )
{
if (!table_etat)
{
@@ -124,35 +124,41 @@ gboolean print_report ( GtkWidget *button,
* \return FALSE
* */
gboolean print_report_begin ( GtkPrintOperation *operation,
- GtkPrintContext *context,
- gpointer null )
+ GtkPrintContext *context,
+ gpointer null )
{
gint nb_pages;
gint i;
gint table_size = 0;
+ guint nrows;
+ guint ncols;
devel_debug (NULL);
/* initialize globals variables */
+ gtk_table_get_size ( GTK_TABLE ( table_etat ), &nrows, &ncols );
+
cr = gtk_print_context_get_cairo_context (context);
size_row = pango_font_description_get_size (gsb_data_print_config_get_report_font_transactions ())/PANGO_SCALE;
size_title = pango_font_description_get_size (gsb_data_print_config_get_report_font_title ())/PANGO_SCALE;
/* get the size of a complete transaction and an archive */
/* the heigh of a page decrease of 1 line if we use the columns titles */
- page_height = gtk_print_context_get_height (context);
- page_width = gtk_print_context_get_width (context);
+ page_height = gtk_print_context_get_height ( context );
+ page_width = gtk_print_context_get_width ( context );
/* get the width of each columns */
- if (columns_width)
- g_free (columns_width);
- columns_width = g_malloc0 (GTK_TABLE (table_etat) -> ncols * sizeof (gdouble));
+ if ( columns_width )
+ g_free ( columns_width );
+
+ columns_width = g_malloc0 ( ncols * sizeof ( gdouble ) );
/* get first the size of the table */
- for (i=0 ; i<GTK_TABLE (table_etat) -> ncols ; i++)
- table_size = table_size + (GTK_TABLE (table_etat) -> cols)[i].allocation;
- for (i=0 ; i<GTK_TABLE (table_etat) -> ncols ; i++)
- columns_width[i] = (page_width * (GTK_TABLE (table_etat) -> cols)[i].allocation) / table_size;
+ for ( i = 0; i < ncols ; i++ )
+ table_size = table_size + ( GTK_TABLE ( table_etat ) -> cols)[i].allocation;
+
+ for ( i = 0; i < ncols ; i++ )
+ columns_width[i] = ( page_width * ( GTK_TABLE ( table_etat ) -> cols)[i].allocation ) / table_size;
/* calculate the nb of rows in 1 page and in the first page */
nb_rows_per_page = page_height / size_row;
@@ -161,10 +167,9 @@ gboolean print_report_begin ( GtkPrintOperation *operation,
/* calculate the number of pages,
* it's not too difficult because each line has the same size
* except the title */
- nb_pages = ceil (((GTK_TABLE (table_etat) -> nrows - 1)*size_row + size_title) / page_height);
+ nb_pages = ceil ( ( ( nrows - 1 ) * size_row + size_title ) / page_height );
- gtk_print_operation_set_n_pages ( GTK_PRINT_OPERATION (operation),
- nb_pages );
+ gtk_print_operation_set_n_pages ( GTK_PRINT_OPERATION ( operation ), nb_pages );
current_child_table = NULL;
current_child_line = 0;
@@ -187,75 +192,74 @@ gboolean print_report_begin ( GtkPrintOperation *operation,
* \return FALSE
* */
gboolean print_report_draw_page ( GtkPrintOperation *operation,
- GtkPrintContext *context,
- gint page,
- gpointer null )
+ GtkPrintContext *context,
+ gint page,
+ gpointer null )
{
GList *children;
- gint nb_columns;
- gint nb_lines;
+ guint nb_columns;
+ guint nb_lines;
gint rows_drawed = 0;
gint previous_line = -1;
gboolean is_title = FALSE;
devel_debug_int (page);
- nb_columns = GTK_TABLE (table_etat) -> ncols;
- nb_lines = GTK_TABLE (table_etat) -> nrows;
+ gtk_table_get_size ( GTK_TABLE ( table_etat ), &nb_lines, &nb_columns );
/* children begins with the last GtkTableChild added, so we need to inverse */
if (page)
- children = current_child_table;
+ children = current_child_table;
else
{
- children = g_list_last (GTK_TABLE (table_etat) -> children);
- is_title = TRUE;
+ children = g_list_last ( GTK_TABLE ( table_etat ) -> children );
+ is_title = TRUE;
}
- while (children)
+ while ( children )
{
- GtkTableChild *child;
- gint line_position;
-
- child = children -> data;
-
- /* if at the to of the page, set previous_line to the first line
- * else we check if the page is not finished */
- if (previous_line == -1)
- previous_line = child -> top_attach;
- else
- if (child -> top_attach != previous_line)
- {
- if ((rows_drawed == nb_rows_per_page && page)
- ||
- (rows_drawed == nb_rows_first_page && !page))
- {
- current_child_table = children;
- current_child_line = child -> top_attach;
- break;
- }
- rows_drawed++;
- previous_line = child -> top_attach;
- }
-
- /* calculate the line position, if first page, add the size title except for the title itself */
- line_position = (child -> top_attach - current_child_line) * size_row + (!page * !is_title * size_title);
-
- if (GTK_IS_LABEL (child -> widget) || GTK_IS_EVENT_BOX (child -> widget))
- /* we are on a label, draw the text */
- print_report_draw_row (context, child, line_position, is_title);
- else
- {
- /* we are on a separator, draw it */
- if (GTK_IS_VSEPARATOR (child->widget))
- print_report_draw_column (child, line_position);
- else
- print_report_draw_line (child, line_position);
- }
- if (is_title)
- is_title = FALSE;
-
- children = children -> prev;
+ GtkTableChild *child;
+ gint line_position;
+
+ child = children -> data;
+
+ /* if at the to of the page, set previous_line to the first line
+ * else we check if the page is not finished */
+ if (previous_line == -1)
+ previous_line = child -> top_attach;
+ else
+ if (child -> top_attach != previous_line)
+ {
+ if ((rows_drawed == nb_rows_per_page && page)
+ ||
+ (rows_drawed == nb_rows_first_page && !page))
+ {
+ current_child_table = children;
+ current_child_line = child -> top_attach;
+ break;
+ }
+ rows_drawed++;
+ previous_line = child -> top_attach;
+ }
+
+ /* calculate the line position, if first page, add the size title except for the title itself */
+ line_position = ( child -> top_attach - current_child_line) * size_row + (!page * !is_title * size_title);
+
+ if (GTK_IS_LABEL (child -> widget) || GTK_IS_EVENT_BOX (child -> widget))
+ /* we are on a label, draw the text */
+ print_report_draw_row (context, child, line_position, is_title);
+ else
+ {
+ /* we are on a separator, draw it */
+ if ( GTK_IS_VSEPARATOR ( child->widget))
+ print_report_draw_column ( child, line_position );
+ else
+ print_report_draw_line (child, line_position);
+ }
+ if (is_title)
+ is_title = FALSE;
+
+ children = children -> prev;
}
return FALSE;
}
@@ -272,7 +276,7 @@ gboolean print_report_draw_page ( GtkPrintOperation *operation,
* \return the new line position
* */
static void print_report_draw_line ( GtkTableChild *child,
- gint line_position )
+ gint line_position )
{
/* add +1 is to avoid to have the line sticked with the text )*/
line_position = line_position + 1;
@@ -292,7 +296,7 @@ static void print_report_draw_line ( GtkTableChild *child,
* \return the new column position
* */
static void print_report_draw_column ( GtkTableChild *child,
- gint line_position )
+ gint line_position )
{
gint column_position = 0;
gint i;
@@ -316,9 +320,9 @@ static void print_report_draw_column ( GtkTableChild *child,
* \return the new line_position
* */
static void print_report_draw_row ( GtkPrintContext *context,
- GtkTableChild *child,
- gint line_position,
- gint is_title )
+ GtkTableChild *child,
+ gint line_position,
+ gint is_title )
{
PangoLayout *layout;
gint column_position = 0;
@@ -398,7 +402,7 @@ static void print_report_draw_row ( GtkPrintContext *context,
* \return A newly allocated widget.
*/
GtkWidget * print_config_show_config ( GtkPrintOperation * operation,
- gpointer null )
+ gpointer null )
{
GtkWidget * hbox, * label, * paddingbox;
GtkWidget * font_button_transactions, * vbox, * font_button_title;
@@ -473,8 +477,8 @@ GtkWidget * print_config_show_config ( GtkPrintOperation * operation,
* \return NULL
*/
gboolean print_config_show_config_apply ( GtkPrintOperation * operation,
- GtkWidget * widget,
- gpointer null )
+ GtkWidget * widget,
+ gpointer null )
{
GtkFontButton * font_button_transactions, * font_button_title;
diff --git a/src/tiers_onglet.c b/src/tiers_onglet.c
index 1acaf6e..30a236b 100644
--- a/src/tiers_onglet.c
+++ b/src/tiers_onglet.c
@@ -652,7 +652,7 @@ gboolean edit_payee ( GtkTreeView * view )
/* Ugly dance to avoid side effects on dialog's vbox. */
hbox = gtk_hbox_new ( FALSE, 0 );
- gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 0 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), hbox, FALSE, FALSE, 0 );
paddingbox = new_paddingbox_with_title ( hbox, TRUE, title );
gtk_container_set_border_width ( GTK_CONTAINER(hbox), 6 );
gtk_container_set_border_width ( GTK_CONTAINER(paddingbox), 6 );
diff --git a/src/tip.c b/src/tip.c
index 8f0f12e..1ebde9b 100644
--- a/src/tip.c
+++ b/src/tip.c
@@ -137,9 +137,9 @@ void display_tip ( gboolean force )
g_dgettext(NULL, tips[etat.last_tip]) ) );
gtk_window_set_modal ( GTK_WINDOW ( dialog ), FALSE );
- checkbox = gsb_automem_checkbutton_new ( _("Display tips at next start"),
+ checkbox = gsb_automem_checkbutton_new ( _("Display tips at next start"),
&(etat.show_tip), NULL, NULL );
- gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG(dialog) -> vbox ), checkbox, FALSE, FALSE, 6 );
+ gtk_box_pack_start ( GTK_BOX ( dialog_get_content_area ( dialog ) ), checkbox, FALSE, FALSE, 6 );
gtk_widget_show ( checkbox );
btn_back = gtk_dialog_add_button (GTK_DIALOG(dialog), GTK_STOCK_GO_BACK, 1);
@@ -167,8 +167,8 @@ void display_tip ( gboolean force )
g_dgettext (NULL, tips[etat.last_tip] ),
NULL );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog) -> label ),
- tmpstr );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), tmpstr );
+
g_free ( tmpstr );
break;
@@ -178,13 +178,13 @@ void display_tip ( gboolean force )
tmpstr = g_strconcat ( make_pango_attribut (
"size=\"larger\" weight=\"bold\"", _("Did you know that...") ),
"\n\n",
- g_dgettext (NULL, tips[etat.last_tip] ),
+ g_dgettext ( NULL, tips[etat.last_tip] ),
NULL );
- gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog) -> label ),
- tmpstr );
+ gtk_message_dialog_set_markup ( GTK_MESSAGE_DIALOG ( dialog ), tmpstr );
+
g_free ( tmpstr );
- gtk_widget_set_sensitive (btn_back, TRUE);
+ gtk_widget_set_sensitive ( btn_back, TRUE );
break;
default:
diff --git a/src/utils.c b/src/utils.c
index c48ce96..2e9577b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -64,7 +64,7 @@ gboolean met_en_prelight ( GtkWidget *event_box,
gpointer pointeur )
{
if ( pointeur == NULL )
- gtk_widget_set_state ( GTK_WIDGET ( GTK_BIN (event_box)->child ), GTK_STATE_PRELIGHT );
+ gtk_widget_set_state ( gtk_bin_get_child ( GTK_BIN ( event_box ) ), GTK_STATE_PRELIGHT );
else
{
GSList *list = ( GSList* ) pointeur;
@@ -74,7 +74,7 @@ gboolean met_en_prelight ( GtkWidget *event_box,
GtkWidget *widget;
widget = list -> data;
- gtk_widget_set_state ( GTK_WIDGET ( GTK_BIN ( widget )->child ), GTK_STATE_PRELIGHT );
+ gtk_widget_set_state ( gtk_bin_get_child ( GTK_BIN ( widget ) ), GTK_STATE_PRELIGHT );
list = list -> next;
}
@@ -93,7 +93,7 @@ gboolean met_en_normal ( GtkWidget *event_box,
gpointer pointeur )
{
if ( pointeur == NULL )
- gtk_widget_set_state ( GTK_WIDGET ( GTK_BIN (event_box)->child ), GTK_STATE_NORMAL );
+ gtk_widget_set_state ( gtk_bin_get_child ( GTK_BIN ( event_box ) ), GTK_STATE_NORMAL );
else
{
GSList *list = ( GSList* ) pointeur;
@@ -104,7 +104,7 @@ gboolean met_en_normal ( GtkWidget *event_box,
widget = list -> data;
- gtk_widget_set_state ( GTK_WIDGET ( GTK_BIN ( widget )->child ), GTK_STATE_NORMAL );
+ gtk_widget_set_state ( gtk_bin_get_child ( GTK_BIN ( widget ) ), GTK_STATE_NORMAL );
list = list -> next;
}
diff --git a/src/utils_buttons.c b/src/utils_buttons.c
index 709572b..8b3c331 100644
--- a/src/utils_buttons.c
+++ b/src/utils_buttons.c
@@ -150,28 +150,30 @@ void set_popup_position (GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpo
{
GtkWidget *widget;
GtkRequisition requisition;
+ GtkAllocation allocation;
gint screen_width, menu_xpos, menu_ypos, menu_width;
- widget = GTK_WIDGET (user_data);
+ widget = GTK_WIDGET ( user_data );
- gtk_widget_get_child_requisition (GTK_WIDGET (menu), &requisition);
+ gtk_widget_get_child_requisition ( GTK_WIDGET ( menu ), &requisition );
menu_width = requisition.width;
- gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos);
+ gdk_window_get_origin ( gtk_widget_get_window ( widget ), &menu_xpos, &menu_ypos );
- menu_xpos += widget->allocation.x;
- menu_ypos += widget->allocation.y + widget->allocation.height - 2;
+ gtk_widget_get_allocation ( widget, &allocation );
+ menu_xpos += allocation.x;
+ menu_ypos += allocation.y + allocation.height - 2;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- menu_xpos = menu_xpos + widget->allocation.width - menu_width;
+ if ( gtk_widget_get_direction ( widget) == GTK_TEXT_DIR_RTL )
+ menu_xpos = menu_xpos + allocation.width - menu_width;
/* Clamp the position on screen */
- screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
+ screen_width = gdk_screen_get_width ( gtk_widget_get_screen ( widget ) );
if (menu_xpos < 0)
- menu_xpos = 0;
- else if ((menu_xpos + menu_width) > screen_width)
- menu_xpos -= ((menu_xpos + menu_width) - screen_width);
+ menu_xpos = 0;
+ else if ( ( menu_xpos + menu_width ) > screen_width )
+ menu_xpos -= ((menu_xpos + menu_width) - screen_width);
*x = menu_xpos;
*y = menu_ypos;
diff --git a/src/utils_files.c b/src/utils_files.c
index 487b599..8add66e 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -496,7 +496,7 @@ gchar *utils_files_create_sel_charset ( GtkWidget *assistant,
vbox = gtk_vbox_new ( FALSE, 6 );
gtk_container_set_border_width ( GTK_CONTAINER(vbox), 12 );
- gtk_container_add ( GTK_CONTAINER ( GTK_DIALOG ( dialog ) -> vbox ), vbox );
+ gtk_container_add ( GTK_CONTAINER ( dialog_get_content_area ( dialog ) ), vbox );
/* Warning label */
hbox = gtk_hbox_new ( FALSE, 6 );
hooks/post-receive
--
grisbi
More information about the cvs
mailing list