[Gnucash-changes] foo4
David Hampton
hampton at cvs.gnucash.org
Sat Apr 16 14:22:46 EDT 2005
Log Message:
-----------
foo4
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
configure.in
gnucash/src/business/business-gnome:
gnc-plugin-business.c
gnucash/src/gnome:
dialog-scheduledxaction.c
dialog-sxsincelast.c
gnc-embedded-window.c
gnc-embedded-window.h
gnc-main-window.c
gnc-main-window.h
gnc-plugin-account-tree.c
gnc-plugin-file-history.c
gnc-plugin-page-account-tree.c
gnc-plugin-page-register.c
gnc-plugin-page.c
gnc-plugin-page.h
gnc-plugin-register.c
gnc-plugin.c
gnc-plugin.h
gnucash/src/gnome-utils:
gnc-gnome-utils.c
gnc-gnome-utils.h
gnc-icons.c
gnc-menu-extensions.c
gnc-menu-extensions.h
gnc-tree-view-account.c
gnc-tree-view-account.h
gnc-tree-view-commodity.c
gnc-tree-view-commodity.h
gnc-tree-view-price.c
gnc-tree-view-price.h
gnucash/src/import-export/hbci:
gnc-plugin-hbci.c
gnucash/src/import-export/log-replay:
gnc-plugin-log-replay.c
gnucash/src/import-export/mt940:
gnc-plugin-mt940.c
gnucash/src/import-export/ofx:
gnc-plugin-ofx.c
gnucash/src/import-export/qif-import:
gnc-plugin-qif-import.c
gnucash/src/report/report-gnome:
gnc-plugin-page-report.c
gnucash/src/report/stylesheets:
gnc-plugin-stylesheets.c
Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.42
retrieving revision 1.359.2.43
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.42 -r1.359.2.43
--- configure.in
+++ configure.in
@@ -103,8 +103,8 @@
AC_MSG_ERROR([Cannot find ltdl.h -- libtool-devel not installed?])
fi
-AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([
-*** GLIB >= 2.0 is required to build Gnucash; please make sure you have the
+AM_PATH_GLIB_2_0(2.6.0,,AC_MSG_ERROR([
+*** GLIB >= 2.6 is required to build Gnucash; please make sure you have the
*** development headers installed. The latest version of GLIB is
*** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/.]),
gthread gobject)
@@ -844,8 +844,8 @@
GNOME_COMPILE_WARNINGS
# Look for libgnomeui by pkg-config
- PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.2
- gtk+-2.0 >= 2.2)
+ PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.8
+ gtk+-2.0 >= 2.4)
AS_SCRUB_INCLUDE(GNOME_CFLAGS)
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)
@@ -886,7 +886,7 @@
### ----------------------------------------------------------------------
### Check for glade, gtkhtml
- PKG_CHECK_MODULES(GLADE, libglade-2.0)
+ PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.4)
AS_SCRUB_INCLUDE(GLADE_CFLAGS)
AC_SUBST(GLADE_CFLAGS)
AC_SUBST(GLADE_LIBS)
@@ -1110,7 +1110,6 @@
doc/examples/Makefile
intl-scm/Makefile
lib/Makefile
- lib/egg/Makefile
lib/guile-www/Makefile
lib/srfi/Makefile
lib/libc/Makefile
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.189
retrieving revision 1.1487.2.190
diff -LChangeLog -LChangeLog -u -r1.1487.2.189 -r1.1487.2.190
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,10 @@
+2005-04-16 David Hampton <hampton at employees.org>
+
+ * lots of file: Switch from a requirement of Gtk-2.2 to Gtk-2.4.
+ This replaces all EggAction references with GtkAction, and
+ EggMenuMerge with GtkUIManager. It also drops all the files in
+ lib/egg since they are no longer needed.
+
2005-04-11 Neil Williams <linux at codehelp.co.uk>
* src/app-file/gnc-file.c: Added handlers for
write errors and made show_session_error()
@@ -24,6 +31,9 @@
2005-04-03 David Hampton <hampton at employees.org>
+ * src/gnome-utils/transfer.glade: Make all input fields expand on
+ the X axis.
+
* configure.in: Remove reqirement for Berkeley DB. The G2 branch
compiles and runs fine without it.
Index: gnc-plugin-qif-import.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-import/Attic/gnc-plugin-qif-import.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Lsrc/import-export/qif-import/gnc-plugin-qif-import.c -Lsrc/import-export/qif-import/gnc-plugin-qif-import.c -u -r1.1.2.9 -r1.1.2.10
--- src/import-export/qif-import/gnc-plugin-qif-import.c
+++ src/import-export/qif-import/gnc-plugin-qif-import.c
@@ -38,18 +38,18 @@
static void gnc_plugin_qif_import_finalize (GObject *object);
/* Command callbacks */
-static void gnc_plugin_qif_import_cmd_new_qif_import (EggAction *action, GncMainWindowActionData *data);
-static void gnc_plugin_qif_test_druid (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_qif_import_cmd_new_qif_import (GtkAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_qif_test_druid (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-qif-import-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-qif-import-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "QIFImportAction", N_("Import _QIF..."), GTK_STOCK_CONVERT, "<control>i",
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "QIFImportAction", GTK_STOCK_CONVERT, N_("Import _QIF..."), "<control>i",
N_("Import a Quicken QIF file"),
G_CALLBACK (gnc_plugin_qif_import_cmd_new_qif_import) },
- { "QIFTestDruid", "Test Druid", GTK_STOCK_CONVERT, NULL,
+ { "QIFTestDruid", GTK_STOCK_CONVERT, "Test Druid", NULL,
"Test the new Druid", G_CALLBACK(gnc_plugin_qif_test_druid) },
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
@@ -168,14 +168,14 @@
************************************************************/
static void
-gnc_plugin_qif_import_cmd_new_qif_import (EggAction *action,
+gnc_plugin_qif_import_cmd_new_qif_import (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_ui_qif_import_druid_make ();
}
static void
-gnc_plugin_qif_test_druid (EggAction *action, GncMainWindowActionData *data)
+gnc_plugin_qif_test_druid (GtkAction *action, GncMainWindowActionData *data)
{
gnc_druid_gnome_test();
}
Index: gnc-plugin-page-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-register.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -Lsrc/gnome/gnc-plugin-page-register.c -Lsrc/gnome/gnc-plugin-page-register.c -u -r1.1.2.20 -r1.1.2.21
--- src/gnome/gnc-plugin-page-register.c
+++ src/gnome/gnc-plugin-page-register.c
@@ -35,8 +35,6 @@
#include "dialog-transfer.h"
#include "dialog-utils.h"
#include "druid-stock-split.h"
-#include "egg-action-group.h"
-#include "egg-radio-action.h"
#include "global-options.h"
#include "gnc-book.h"
#include "gnc-date.h"
@@ -69,8 +67,8 @@
static GtkWidget *gnc_plugin_page_register_create_widget (GncPluginPage *plugin_page);
static void gnc_plugin_page_register_destroy_widget (GncPluginPage *plugin_page);
-static void gnc_plugin_page_register_merge_actions (GncPluginPage *plugin_page, EggMenuMerge *ui_merge);
-static void gnc_plugin_page_register_unmerge_actions (GncPluginPage *plugin_page, EggMenuMerge *ui_merge);
+static void gnc_plugin_page_register_merge_actions (GncPluginPage *plugin_page, GtkUIManager *ui_merge);
+static void gnc_plugin_page_register_unmerge_actions (GncPluginPage *plugin_page, GtkUIManager *ui_merge);
static gchar *gnc_plugin_page_register_get_tab_name (GncPluginPage *plugin_page);
@@ -84,29 +82,29 @@
void gnc_plugin_page_register_today_cb(GtkButton *buttontoggle, gpointer data);
/* Command callbacks */
-static void gnc_plugin_page_register_cmd_print_check (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_date_show_all (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_date_set_range (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_status_all (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_status_one (EggToggleAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_sort_changed (EggAction *action, EggRadioAction *current, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_style_changed (EggAction *action, EggRadioAction *current, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_style_double_line (EggToggleAction *action, GncPluginPageRegister *plugin_page);
-
-static void gnc_plugin_page_register_cmd_reconcile (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_transfer (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_stock_split (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_lots (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_enter_transaction (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_cancel_transaction (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_delete_transaction (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_blank_transaction (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_duplicate_transaction (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_reinitialize_transaction (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_expand_transaction (EggToggleAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_exchange_rate (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_jump (EggAction *action, GncPluginPageRegister *plugin_page);
-static void gnc_plugin_page_register_cmd_schedule (EggAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_print_check (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_date_show_all (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_date_set_range (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_status_all (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_status_one (GtkToggleAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_sort_changed (GtkAction *action, GtkRadioAction *current, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_style_changed (GtkAction *action, GtkRadioAction *current, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_style_double_line (GtkToggleAction *action, GncPluginPageRegister *plugin_page);
+
+static void gnc_plugin_page_register_cmd_reconcile (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_transfer (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_stock_split (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_lots (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_enter_transaction (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_cancel_transaction (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_delete_transaction (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_blank_transaction (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_duplicate_transaction (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_reinitialize_transaction (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_expand_transaction (GtkToggleAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_exchange_rate (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_jump (GtkAction *action, GncPluginPageRegister *plugin_page);
+static void gnc_plugin_page_register_cmd_schedule (GtkAction *action, GncPluginPageRegister *plugin_page);
static void gnc_plugin_page_help_changed_cb( GNCSplitReg *gsr, GncPluginPageRegister *register_page );
@@ -114,74 +112,74 @@
/* Actions */
/************************************************************/
-static EggActionEntry gnc_plugin_page_register_actions [] =
+static GtkActionEntry gnc_plugin_page_register_actions [] =
{
/* Toplevel */
- { "FakeToplevel", "", NULL, NULL, NULL, NULL },
- { "SelectTransactionsAction", N_("Select _Transactions"), NULL, NULL, NULL, NULL },
- { "TransDateRangeAction", N_("_Date Range"), NULL, NULL, NULL, NULL },
- { "TransStatusAction", N_("_Status"), NULL, NULL, NULL, NULL },
- { "SortOrderAction", N_("Sort _Order"), NULL, NULL, NULL, NULL },
- { "StyleAction", N_("St_yle"), NULL, NULL, NULL, NULL },
+ { "FakeToplevel", NULL, "", NULL, NULL, NULL },
+ { "SelectTransactionsAction", NULL, N_("Select _Transactions"), NULL, NULL, NULL },
+ { "TransDateRangeAction", NULL, N_("_Date Range"), NULL, NULL, NULL },
+ { "TransStatusAction", NULL, N_("_Status"), NULL, NULL, NULL },
+ { "SortOrderAction", NULL, N_("Sort _Order"), NULL, NULL, NULL },
+ { "StyleAction", NULL, N_("St_yle"), NULL, NULL, NULL },
/* File menu */
- { "FilePrintCheckAction", N_("Print Check"), NULL, NULL, NULL,
+ { "FilePrintCheckAction", NULL, N_("Print Check"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_print_check) },
/* View menu */
- { "TransDateShowAllAction", N_("Show _All"), NULL, NULL, NULL,
+ { "TransDateShowAllAction", NULL, N_("Show _All"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_date_show_all) },
- { "TransDateSetRangeAction", N_("Set _Range..."), NULL, NULL, NULL,
+ { "TransDateSetRangeAction", NULL, N_("Set _Range..."), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_date_set_range) },
- { "StatusAllAction", N_("_All"), NULL, NULL, NULL,
+ { "StatusAllAction", NULL, N_("_All"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_status_all) },
/* Actions menu */
- { "ActionsTransferAction", N_("_Transfer..."), GTK_STOCK_MISSING_IMAGE, "<control>t",
+ { "ActionsTransferAction", GTK_STOCK_MISSING_IMAGE, N_("_Transfer..."), "<control>t",
N_("Transfer funds from one account to another"),
G_CALLBACK (gnc_plugin_page_register_cmd_transfer) },
- { "ActionsReconcileAction", N_("_Reconcile..."), NULL, "<control>r",
+ { "ActionsReconcileAction", NULL, N_("_Reconcile..."), "<control>r",
N_("Reconcile the selected account"),
G_CALLBACK (gnc_plugin_page_register_cmd_reconcile) },
- { "ActionsStockSplitAction", N_("Stock S_plit..."), NULL, NULL,
+ { "ActionsStockSplitAction", NULL, N_("Stock S_plit..."), NULL,
N_("Record a stock split or a stock merger"),
G_CALLBACK (gnc_plugin_page_register_cmd_stock_split) },
- { "ActionsLotsAction", N_("_Lot Viewer..."), NULL, NULL,
+ { "ActionsLotsAction", NULL, N_("_Lot Viewer..."), NULL,
N_("Bring up the lot viewer/editor window"),
G_CALLBACK (gnc_plugin_page_register_cmd_lots) },
- { "RecordTransactionAction", N_("_Enter Transaction"), GTK_STOCK_ADD, NULL,
+ { "RecordTransactionAction", GTK_STOCK_ADD, N_("_Enter Transaction"), NULL,
N_("Record the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_enter_transaction) },
- { "CancelTransactionAction", N_("_Cancel Transaction"), GTK_STOCK_CANCEL, NULL,
+ { "CancelTransactionAction", GTK_STOCK_CANCEL, N_("_Cancel Transaction"), NULL,
N_("_Cancel the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_cancel_transaction) },
- { "DeleteTransactionAction", N_("_Delete Transaction"), GTK_STOCK_DELETE, NULL,
+ { "DeleteTransactionAction", GTK_STOCK_DELETE, N_("_Delete Transaction"), NULL,
N_("Delete the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_delete_transaction) },
- { "BlankTransactionAction", N_("_Blank Transaction"), GTK_STOCK_MISSING_IMAGE, NULL,
+ { "BlankTransactionAction", GTK_STOCK_MISSING_IMAGE, N_("_Blank Transaction"), NULL,
N_("Move to the blank transaction at the bottom of the register"),
G_CALLBACK (gnc_plugin_page_register_cmd_blank_transaction) },
- { "DuplicateTransactionAction", N_("D_uplicate Transaction"), GTK_STOCK_COPY, NULL,
+ { "DuplicateTransactionAction", GTK_STOCK_COPY, N_("D_uplicate Transaction"), NULL,
N_("Make a copy of the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_duplicate_transaction) },
- { "RemoveTransactionSplitsAction", N_("Remove Transaction Splits"), GTK_STOCK_CLEAR, NULL,
+ { "RemoveTransactionSplitsAction", GTK_STOCK_CLEAR, N_("Remove Transaction Splits"), NULL,
N_("Remove all splits in the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_reinitialize_transaction) },
- { "EditExchangeRateAction", N_("Edit Exchange Rate"), GTK_STOCK_MISSING_IMAGE, NULL,
+ { "EditExchangeRateAction", GTK_STOCK_MISSING_IMAGE, N_("Edit Exchange Rate"), NULL,
N_("Exit the exchange rate for the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_exchange_rate) },
- { "JumpTransactionAction", N_("_Jump"), GTK_STOCK_JUMP_TO, NULL,
+ { "JumpTransactionAction", GTK_STOCK_JUMP_TO, N_("_Jump"), NULL,
N_("Jump to the corresponding transaction in the other account"),
G_CALLBACK (gnc_plugin_page_register_cmd_jump) },
- { "ScheduleTransactionAction", N_("Schedule..."), GTK_STOCK_COPY, NULL,
+ { "ScheduleTransactionAction", GTK_STOCK_COPY, N_("Schedule..."), NULL,
N_("Edit scheduled transactions"),
G_CALLBACK (gnc_plugin_page_register_cmd_schedule) },
};
static guint gnc_plugin_page_register_n_actions = G_N_ELEMENTS (gnc_plugin_page_register_actions);
-static EggToggleActionEntry toggle_entries[] = {
+static GtkToggleActionEntry toggle_entries[] = {
{ "StatusReconciledAction", NULL, N_("_Reconciled"), NULL, NULL,
G_CALLBACK (gnc_plugin_page_register_cmd_status_one), TRUE },
{ "StatusClearedAction", NULL, N_("_Cleared"), NULL, NULL,
@@ -202,7 +200,7 @@
};
static guint n_toggle_entries = G_N_ELEMENTS (toggle_entries);
-static EggRadioActionEntry radio_entries_1 [] =
+static GtkRadioActionEntry radio_entries_1 [] =
{
{ "SortStandardAction", NULL, N_("_Standard"), NULL, NULL, BY_STANDARD },
{ "SortDateAction", NULL, N_("_Date"), NULL, NULL, BY_DATE },
@@ -217,7 +215,7 @@
};
static guint n_radio_entries_1 = G_N_ELEMENTS (radio_entries_1);
-static EggRadioActionEntry radio_entries_2 [] =
+static GtkRadioActionEntry radio_entries_2 [] =
{
{ "StyleBasicAction", NULL, N_("_Basic Ledger"), NULL, NULL, REG_STYLE_LEDGER },
{ "StyleAutoSplitAction", NULL, N_("_Auto-Split Ledger"), NULL, NULL, REG_STYLE_AUTO_LEDGER },
@@ -231,7 +229,7 @@
NULL
};
-/* DRH - Suggest this be added to libegg */
+/* DRH - Suggest short_labels be added to libegg */
static action_short_labels short_labels[] = {
{ "ActionsTransferAction", N_("Transfer") },
{ "RecordTransactionAction", N_("Enter") },
@@ -265,9 +263,9 @@
struct GncPluginPageRegisterPrivate
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
guint merge_id;
- EggMenuMerge *ui_merge;
+ GtkUIManager *ui_merge;
GNCLedgerDisplay *ledger;
GNCSplitReg *gsr;
@@ -434,14 +432,14 @@
}
static void
-gnc_plugin_page_register_init_values (EggActionGroup *action_group)
+gnc_plugin_page_register_init_values (GtkActionGroup *action_group)
{
- EggAction *action;
+ GtkAction *action;
gint i;
for (i = 0; status_actions[i].action_name; i++) {
/* Add a couple of short labels for the toolbar */
- action = egg_action_group_get_action (action_group,
+ action = gtk_action_group_get_action (action_group,
status_actions[i].action_name);
g_object_set_data (G_OBJECT(action), CLEARED_VALUE,
GINT_TO_POINTER(status_actions[i].value));
@@ -453,7 +451,7 @@
{
GncPluginPageRegisterPrivate *priv;
GncPluginPage *parent;
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
priv = g_new0 (GncPluginPageRegisterPrivate, 1);
plugin_page->priv = priv;
@@ -465,19 +463,19 @@
parent->uri = g_strdup("default:");
/* Create menu and toolbar information */
- action_group = egg_action_group_new ("GncPluginPageRegisterActions");
+ action_group = gtk_action_group_new ("GncPluginPageRegisterActions");
priv->action_group = action_group;
- egg_action_group_add_actions (action_group, gnc_plugin_page_register_actions,
+ gtk_action_group_add_actions (action_group, gnc_plugin_page_register_actions,
gnc_plugin_page_register_n_actions, plugin_page);
- egg_action_group_add_toggle_actions (action_group,
+ gtk_action_group_add_toggle_actions (action_group,
toggle_entries, n_toggle_entries,
plugin_page);
- egg_action_group_add_radio_actions (action_group,
+ gtk_action_group_add_radio_actions (action_group,
radio_entries_1, n_radio_entries_1,
REG_STYLE_LEDGER,
G_CALLBACK(gnc_plugin_page_register_cmd_sort_changed),
plugin_page);
- egg_action_group_add_radio_actions (action_group,
+ gtk_action_group_add_radio_actions (action_group,
radio_entries_2, n_radio_entries_2,
REG_STYLE_LEDGER,
G_CALLBACK(gnc_plugin_page_register_cmd_style_changed),
@@ -539,7 +537,7 @@
GncPluginPageRegisterPrivate *priv ;
Account *account;
SplitRegister *sr;
- EggAction *action;
+ GtkAction *action;
priv = page->priv;
account = gnc_plugin_page_register_get_account (page);
@@ -547,10 +545,10 @@
"sensitive", account != NULL);
sr = gnc_ledger_display_get_split_register(priv->ledger);
- action = egg_action_group_get_action (priv->action_group,
+ action = gtk_action_group_get_action (priv->action_group,
"StyleDoubleLineAction");
g_signal_handlers_block_by_func(action, gnc_plugin_page_register_cmd_style_double_line, page);
- egg_toggle_action_set_active (EGG_TOGGLE_ACTION(action), sr->use_double_line);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(action), sr->use_double_line);
g_signal_handlers_unblock_by_func(action, gnc_plugin_page_register_cmd_style_double_line, page);
}
@@ -621,7 +619,7 @@
static void
gnc_plugin_page_register_merge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge)
+ GtkUIManager *ui_merge)
{
GncPluginPageRegister *register_page;
GncPluginPageRegisterPrivate *priv;
@@ -640,7 +638,7 @@
static void
gnc_plugin_page_register_unmerge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge)
+ GtkUIManager *ui_merge)
{
GncPluginPageRegister *plugin_page_register = GNC_PLUGIN_PAGE_REGISTER(plugin_page);
@@ -648,8 +646,8 @@
g_return_if_fail (plugin_page_register->priv->merge_id != 0);
g_return_if_fail (plugin_page_register->priv->action_group != NULL);
- egg_menu_merge_remove_ui (ui_merge, plugin_page_register->priv->merge_id);
- egg_menu_merge_remove_action_group (ui_merge, plugin_page_register->priv->action_group);
+ gtk_ui_manager_remove_ui (ui_merge, plugin_page_register->priv->merge_id);
+ gtk_ui_manager_remove_action_group (ui_merge, plugin_page_register->priv->action_group);
plugin_page_register->priv->ui_merge = NULL;
}
@@ -706,7 +704,7 @@
if (event->button == 3 && page->priv->ui_merge != NULL) {
/* Maybe show a different popup menu if no account is selected. */
- menu = egg_menu_merge_get_widget (page->priv->ui_merge, "/RegisterPopup");
+ menu = gtk_ui_manager_get_widget (page->priv->ui_merge, "/RegisterPopup");
if (menu)
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
event->button, event->time);
@@ -917,7 +915,7 @@
/************************************************************/
static void
-gnc_plugin_page_register_cmd_print_check (EggAction *action,
+gnc_plugin_page_register_cmd_print_check (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -955,7 +953,7 @@
}
static void
-gnc_plugin_page_register_cmd_date_set_range (EggAction *action,
+gnc_plugin_page_register_cmd_date_set_range (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -983,7 +981,7 @@
}
static void
-gnc_plugin_page_register_cmd_date_show_all (EggAction *action,
+gnc_plugin_page_register_cmd_date_show_all (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1015,12 +1013,12 @@
}
static void
-gnc_plugin_page_register_cmd_status_all (EggAction *action,
+gnc_plugin_page_register_cmd_status_all (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
GSList *param_list = NULL;
- EggAction *other_action;
+ GtkAction *other_action;
Query *query;
gint i;
@@ -1037,10 +1035,10 @@
/* Turn off all the other check menu items */
for (i = 0; status_actions[i].action_name; i++) {
- other_action = egg_action_group_get_action (priv->action_group,
+ other_action = gtk_action_group_get_action (priv->action_group,
status_actions[i].action_name);
g_signal_handlers_block_by_func(other_action, gnc_plugin_page_register_cmd_status_one, plugin_page);
- egg_toggle_action_set_active (EGG_TOGGLE_ACTION(other_action), TRUE);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION(other_action), TRUE);
g_signal_handlers_unblock_by_func(other_action, gnc_plugin_page_register_cmd_status_one, plugin_page);
}
@@ -1055,7 +1053,7 @@
}
static void
-gnc_plugin_page_register_cmd_status_one (EggToggleAction *action,
+gnc_plugin_page_register_cmd_status_one (GtkToggleAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1064,7 +1062,7 @@
gint value;
ENTER("(toggle action %p (%s), plugin_page %p)",
- action, action ? action->parent.name : "<no name>",
+ action, action ? gtk_action_get_name(GTK_ACTION(action)) : "<no name>",
plugin_page);
g_return_if_fail(GNC_IS_PLUGIN_PAGE_REGISTER(plugin_page));
@@ -1078,7 +1076,7 @@
/* Compute the new match status */
value = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), CLEARED_VALUE));
- if (egg_toggle_action_get_active (action))
+ if (gtk_toggle_action_get_active (action))
priv->cleared_match |= value;
else
priv->cleared_match &= ~value;
@@ -1099,8 +1097,8 @@
}
static void
-gnc_plugin_page_register_cmd_sort_changed (EggAction *action,
- EggRadioAction *current,
+gnc_plugin_page_register_cmd_sort_changed (GtkAction *action,
+ GtkRadioAction *current,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1109,19 +1107,19 @@
ENTER("(action %p, radio action %p, plugin_page %p)",
action, current, plugin_page);
- g_return_if_fail(EGG_IS_ACTION(action));
- g_return_if_fail(EGG_IS_RADIO_ACTION(current));
+ g_return_if_fail(GTK_IS_ACTION(action));
+ g_return_if_fail(GTK_IS_RADIO_ACTION(current));
g_return_if_fail(GNC_IS_PLUGIN_PAGE_REGISTER(plugin_page));
priv = plugin_page->priv;
- value = egg_radio_action_get_current_value(current);
+ value = gtk_radio_action_get_current_value(current);
gnc_split_reg_set_sort_type(priv->gsr, value);
LEAVE(" ");
}
static void
-gnc_plugin_page_register_cmd_style_changed (EggAction *action,
- EggRadioAction *current,
+gnc_plugin_page_register_cmd_style_changed (GtkAction *action,
+ GtkRadioAction *current,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1130,18 +1128,18 @@
ENTER("(action %p, radio action %p, plugin_page %p)",
action, current, plugin_page);
- g_return_if_fail(EGG_IS_ACTION(action));
- g_return_if_fail(EGG_IS_RADIO_ACTION(current));
+ g_return_if_fail(GTK_IS_ACTION(action));
+ g_return_if_fail(GTK_IS_RADIO_ACTION(current));
g_return_if_fail(GNC_IS_PLUGIN_PAGE_REGISTER(plugin_page));
priv = plugin_page->priv;
- value = egg_radio_action_get_current_value(current);
+ value = gtk_radio_action_get_current_value(current);
gnc_split_reg_change_style(priv->gsr, value);
LEAVE(" ");
}
static void
-gnc_plugin_page_register_cmd_style_double_line (EggToggleAction *action,
+gnc_plugin_page_register_cmd_style_double_line (GtkToggleAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1150,13 +1148,13 @@
ENTER("(action %p, plugin_page %p)", action, plugin_page);
- g_return_if_fail(EGG_IS_ACTION(action));
+ g_return_if_fail(GTK_IS_ACTION(action));
g_return_if_fail(GNC_IS_PLUGIN_PAGE_REGISTER(plugin_page));
priv = plugin_page->priv;
reg = gnc_ledger_display_get_split_register (priv->ledger);
- use_double_line = egg_toggle_action_get_active (action);
+ use_double_line = gtk_toggle_action_get_active (action);
if (use_double_line != reg->use_double_line) {
gnc_split_register_config(reg, reg->type, reg->style, use_double_line);
gnc_ledger_display_refresh(priv->ledger);
@@ -1165,7 +1163,7 @@
}
static void
-gnc_plugin_page_register_cmd_transfer (EggAction *action,
+gnc_plugin_page_register_cmd_transfer (GtkAction *action,
GncPluginPageRegister *page)
{
Account *account;
@@ -1182,7 +1180,7 @@
}
static void
-gnc_plugin_page_register_cmd_reconcile (EggAction *action,
+gnc_plugin_page_register_cmd_reconcile (GtkAction *action,
GncPluginPageRegister *page)
{
Account *account;
@@ -1202,7 +1200,7 @@
}
static void
-gnc_plugin_page_register_cmd_stock_split (EggAction *action,
+gnc_plugin_page_register_cmd_stock_split (GtkAction *action,
GncPluginPageRegister *page)
{
Account *account;
@@ -1217,7 +1215,7 @@
}
static void
-gnc_plugin_page_register_cmd_lots (EggAction *action,
+gnc_plugin_page_register_cmd_lots (GtkAction *action,
GncPluginPageRegister *page)
{
Account *account;
@@ -1232,7 +1230,7 @@
}
static void
-gnc_plugin_page_register_cmd_enter_transaction (EggAction *action,
+gnc_plugin_page_register_cmd_enter_transaction (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1247,7 +1245,7 @@
}
static void
-gnc_plugin_page_register_cmd_cancel_transaction (EggAction *action,
+gnc_plugin_page_register_cmd_cancel_transaction (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1263,7 +1261,7 @@
}
static void
-gnc_plugin_page_register_cmd_delete_transaction (EggAction *action,
+gnc_plugin_page_register_cmd_delete_transaction (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1279,7 +1277,7 @@
}
static void
-gnc_plugin_page_register_cmd_blank_transaction (EggAction *action,
+gnc_plugin_page_register_cmd_blank_transaction (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1299,7 +1297,7 @@
}
static void
-gnc_plugin_page_register_cmd_duplicate_transaction (EggAction *action,
+gnc_plugin_page_register_cmd_duplicate_transaction (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1315,7 +1313,7 @@
}
static void
-gnc_plugin_page_register_cmd_reinitialize_transaction (EggAction *action,
+gnc_plugin_page_register_cmd_reinitialize_transaction (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1330,7 +1328,7 @@
}
static void
-gnc_plugin_page_register_cmd_expand_transaction (EggToggleAction *action,
+gnc_plugin_page_register_cmd_expand_transaction (GtkToggleAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1343,13 +1341,13 @@
priv = plugin_page->priv;
reg = gnc_ledger_display_get_split_register (priv->ledger);
- expand = egg_toggle_action_get_active (action);
+ expand = gtk_toggle_action_get_active (action);
gnc_split_register_expand_current_trans (reg, expand);
LEAVE(" ");
}
static void
-gnc_plugin_page_register_cmd_exchange_rate (EggAction *action,
+gnc_plugin_page_register_cmd_exchange_rate (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1368,7 +1366,7 @@
}
static void
-gnc_plugin_page_register_cmd_jump (EggAction *action,
+gnc_plugin_page_register_cmd_jump (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
@@ -1442,7 +1440,7 @@
}
static void
-gnc_plugin_page_register_cmd_schedule (EggAction *action,
+gnc_plugin_page_register_cmd_schedule (GtkAction *action,
GncPluginPageRegister *plugin_page)
{
GncPluginPageRegisterPrivate *priv;
Index: gnc-plugin-account-tree.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-account-tree.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Lsrc/gnome/gnc-plugin-account-tree.c -Lsrc/gnome/gnc-plugin-account-tree.c -u -r1.1.2.10 -r1.1.2.11
--- src/gnome/gnc-plugin-account-tree.c
+++ src/gnome/gnc-plugin-account-tree.c
@@ -41,14 +41,14 @@
static GncPluginPage *gnc_plugin_account_tree_create_page (GncPlugin *plugin, const gchar *uri);
/* Command callbacks */
-static void gnc_plugin_account_tree_cmd_new_account_tree (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_account_tree_cmd_new_account_tree (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-account-tree-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-account-tree-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "FileNewAccountTreeAction", N_("New Account Tree"), NULL, NULL,
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "FileNewAccountTreeAction", NULL, N_("New Account Tree"), NULL,
N_("Open a new Account Tree page"),
G_CALLBACK (gnc_plugin_account_tree_cmd_new_account_tree) },
};
@@ -192,7 +192,7 @@
************************************************************/
static void
-gnc_plugin_account_tree_cmd_new_account_tree (EggAction *action,
+gnc_plugin_account_tree_cmd_new_account_tree (GtkAction *action,
GncMainWindowActionData *data)
{
g_return_if_fail (data != NULL);
Index: gnc-plugin-page.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page.c,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Lsrc/gnome/gnc-plugin-page.c -Lsrc/gnome/gnc-plugin-page.c -u -r1.1.2.10 -r1.1.2.11
--- src/gnome/gnc-plugin-page.c
+++ src/gnome/gnc-plugin-page.c
@@ -24,6 +24,7 @@
#include "config.h"
+#include <gtk/gtk.h>
#include "gnc-plugin-page.h"
static gpointer parent_class = NULL;
@@ -116,7 +117,7 @@
void
gnc_plugin_page_merge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge)
+ GtkUIManager *ui_merge)
{
GncPluginPageClass *klass;
@@ -131,7 +132,7 @@
void
gnc_plugin_page_unmerge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge)
+ GtkUIManager *ui_merge)
{
GncPluginPageClass *klass;
Index: gnc-main-window.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-main-window.h,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Lsrc/gnome/gnc-main-window.h -Lsrc/gnome/gnc-main-window.h -u -r1.1.2.10 -r1.1.2.11
--- src/gnome/gnc-main-window.h
+++ src/gnome/gnc-main-window.h
@@ -28,8 +28,6 @@
#include <gtk/gtk.h>
-#include "egg-menu-merge.h"
-
#include "gnc-plugin-page.h"
G_BEGIN_DECLS
@@ -50,7 +48,7 @@
typedef struct {
GtkWindow parent;
- EggMenuMerge *ui_merge;
+ GtkUIManager *ui_merge;
GncMainWindowPrivate *priv;
} GncMainWindow;
@@ -85,14 +83,14 @@
void gnc_main_window_merge_actions (GncMainWindow *window,
const gchar *group_name,
- EggActionEntry *entries,
+ GtkActionEntry *entries,
guint n_entries,
const gchar *filename,
gpointer user_data);
void gnc_main_window_unmerge_actions (GncMainWindow *window,
const gchar *group_name);
void gnc_main_window_actions_updated (GncMainWindow *window);
-EggActionGroup *gnc_main_window_get_action_group (GncMainWindow *window,
+GtkActionGroup *gnc_main_window_get_action_group (GncMainWindow *window,
const gchar *group_name);
void gnc_main_window_update_title (GncMainWindow *window);
Index: gnc-plugin.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome/gnc-plugin.h -Lsrc/gnome/gnc-plugin.h -u -r1.1.2.6 -r1.1.2.7
--- src/gnome/gnc-plugin.h
+++ src/gnome/gnc-plugin.h
@@ -53,7 +53,7 @@
const gchar *plugin_name;
const gchar *actions_name;
- EggActionEntry *actions;
+ GtkActionEntry *actions;
guint n_actions;
const gchar *ui_filename;
Index: gnc-main-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-main-window.c,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -Lsrc/gnome/gnc-main-window.c -Lsrc/gnome/gnc-main-window.c -u -r1.1.2.35 -r1.1.2.36
--- src/gnome/gnc-main-window.c
+++ src/gnome/gnc-main-window.c
@@ -28,11 +28,6 @@
#include <gdk/gdkpixbuf.h>
#include <gtk/gtk.h>
-#include "eggtoolbar.h"
-#include "egg-action-group.h"
-#include "egg-menu-merge.h"
-#include "egg-toggle-action.h"
-
#include "gnc-main-window.h"
#include "dialog-budget-list.h"
@@ -87,49 +82,49 @@
static void gnc_window_main_window_init (GncWindowIface *iface);
/* Callbacks */
-static void gnc_main_window_add_widget (EggMenuMerge *merge, GtkWidget *widget, GncMainWindow *window);
+static void gnc_main_window_add_widget (GtkUIManager *merge, GtkWidget *widget, GncMainWindow *window);
static void gnc_main_window_change_current_page (GtkNotebook *notebook, gint pos, GncMainWindow *window);
static void gnc_main_window_switch_page (GtkNotebook *notebook, GtkNotebookPage *notebook_page, gint pos, GncMainWindow *window);
static void gnc_main_window_plugin_added (GncPlugin *manager, GncPlugin *plugin, GncMainWindow *window);
static void gnc_main_window_plugin_removed (GncPlugin *manager, GncPlugin *plugin, GncMainWindow *window);
/* Command callbacks */
-static void gnc_main_window_cmd_file_new (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_open (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_open_new_window (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_save (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_save_as (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_qsf_import (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_export_accounts (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_chart_export (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_print (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_properties (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_close (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_file_quit (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_edit_cut (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_edit_copy (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_edit_paste (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_edit_preferences (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_edit_tax_options (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_view_refresh (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_view_toolbar (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_view_summary (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_view_statusbar (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_actions_scheduled_transaction_editor (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_actions_budget_workbench(EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_actions_since_last_run (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_actions_mortgage_loan (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_actions_close_books (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_tools_price_editor (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_tools_commodity_editor (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_tools_financial_calculator (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_tools_find_transactions (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_help_tutorial (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_help_totd (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_help_contents (EggAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_help_about (EggAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_new (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_open_new_window (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_chart_export (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_print (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_properties (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_close (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_file_quit (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_edit_cut (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_edit_copy (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_edit_paste (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_edit_preferences (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_view_refresh (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_view_toolbar (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_view_summary (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_view_statusbar (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_actions_scheduled_transaction_editor (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_actions_budget_workbench(GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_actions_since_last_run (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_actions_mortgage_loan (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_actions_close_books (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_tools_price_editor (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_tools_commodity_editor (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_tools_financial_calculator (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_tools_find_transactions (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_help_tutorial (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_help_totd (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_help_contents (GtkAction *action, GncMainWindow *window);
+static void gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window);
-static void gnc_main_window_cmd_test( EggAction *action, GncMainWindow *window );
+static void gnc_main_window_cmd_test( GtkAction *action, GncMainWindow *window );
struct GncMainWindowPrivate
{
@@ -141,7 +136,7 @@
GtkWidget *gncSummaryBar;
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
GncPluginPage *current_page;
GList *installed_pages;
@@ -153,141 +148,141 @@
typedef struct {
guint merge_id;
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
} MergedActionEntry;
static guint main_window_signals[LAST_SIGNAL] = { 0 };
-static EggActionEntry gnc_menu_entries [] =
+static GtkActionEntry gnc_menu_entries [] =
{
/* Toplevel */
- { "FileAction", N_("_File"), NULL, NULL, NULL, NULL, },
- { "EditAction", N_("_Edit"), NULL, NULL, NULL, NULL },
- { "ViewAction", N_("_View"), NULL, NULL, NULL, NULL },
- { "ActionsAction", N_("_Actions"), NULL, NULL, NULL, NULL },
- { "ToolsAction", N_("_Tools"), NULL, NULL, NULL, NULL },
- { "HelpAction", N_("_Help"), NULL, NULL, NULL, NULL },
- { "MiscAction", N_("_Misc"), NULL, NULL, NULL, NULL },
+ { "FileAction", NULL, N_("_File"), NULL, NULL, NULL, },
+ { "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
+ { "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
+ { "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
+ { "ToolsAction", NULL, N_("_Tools"), NULL, NULL, NULL },
+ { "HelpAction", NULL, N_("_Help"), NULL, NULL, NULL },
+ { "MiscAction", NULL, N_("_Misc"), NULL, NULL, NULL },
/* File menu */
- { "FileNewAction", N_("_New File"), GTK_STOCK_NEW, "<control>n",
+ { "FileNewAction", GTK_STOCK_NEW, N_("_New File"), "<control>n",
N_("Create a new file"),
G_CALLBACK (gnc_main_window_cmd_file_new) },
- { "FileOpenAction", N_("_Open"), GTK_STOCK_OPEN, NULL,
+ { "FileOpenAction", GTK_STOCK_OPEN, N_("_Open"), NULL,
NULL,
G_CALLBACK (gnc_main_window_cmd_file_open) },
- { "FileOpenNewWindowAction", N_("Open in a New Window"), NULL, NULL,
+ { "FileOpenNewWindowAction", NULL, N_("Open in a New Window"), NULL,
N_("Open a new top-level GnuCash window for the current view"),
G_CALLBACK (gnc_main_window_cmd_file_open_new_window) },
- { "FileSaveAction", N_("_Save"), GTK_STOCK_SAVE, "<control>s",
+ { "FileSaveAction", GTK_STOCK_SAVE, N_("_Save"), "<control>s",
NULL,
G_CALLBACK (gnc_main_window_cmd_file_save) },
- { "FileSaveAsAction", N_("Save _As..."), GTK_STOCK_SAVE_AS, "<shift><control>s",
+ { "FileSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save _As..."), "<shift><control>s",
NULL,
G_CALLBACK (gnc_main_window_cmd_file_save_as) },
- { "FileImportAction", N_("_Import"), NULL, NULL, NULL, NULL },
- { "FileImportQSFAction", N_("_QSF Import"),
- GTK_STOCK_CONVERT, NULL,
+ { "FileImportAction", NULL, N_("_Import"), NULL, NULL, NULL },
+ { "FileImportQSFAction", GTK_STOCK_CONVERT,
+ N_("_QSF Import"), NULL,
N_("Import a QSF object file"),
G_CALLBACK (gnc_main_window_cmd_file_qsf_import) },
- { "FileExportAction", N_("_Export"), NULL, NULL, NULL, NULL },
- { "FileExportAccountsAction", N_("Export _Accounts"),
- GTK_STOCK_CONVERT, NULL,
+ { "FileExportAction", NULL, N_("_Export"), NULL, NULL, NULL },
+ { "FileExportAccountsAction", GTK_STOCK_CONVERT,
+ N_("Export _Accounts"), NULL,
N_("Export the account hierarchy to a new file"),
G_CALLBACK (gnc_main_window_cmd_file_export_accounts) },
- { "FileExportChartAction", N_("Export _Chart of Accounts"),
- GTK_STOCK_CONVERT, NULL,
+ { "FileExportChartAction", GTK_STOCK_CONVERT,
+ N_("Export _Chart of Accounts"), NULL,
N_("Export the chart of accounts for a date with balances"),
G_CALLBACK (gnc_main_window_cmd_chart_export) },
- { "FilePrintAction", N_("_Print..."), GTK_STOCK_PRINT, "<control>p",
+ { "FilePrintAction", GTK_STOCK_PRINT, N_("_Print..."), "<control>p",
NULL,
G_CALLBACK (gnc_main_window_cmd_file_print) },
- { "FilePropertiesAction", N_("Properties..."), GTK_STOCK_PROPERTIES, NULL,
+ { "FilePropertiesAction", GTK_STOCK_PROPERTIES, N_("Properties..."), NULL,
NULL,
G_CALLBACK (gnc_main_window_cmd_file_properties) },
- { "FileCloseAction", N_("_Close"), GTK_STOCK_CLOSE, "<control>w",
+ { "FileCloseAction", GTK_STOCK_CLOSE, N_("_Close"), "<control>w",
NULL,
G_CALLBACK (gnc_main_window_cmd_file_close) },
- { "FileQuitAction", N_("_Quit"), GTK_STOCK_QUIT, NULL,
+ { "FileQuitAction", GTK_STOCK_QUIT, N_("_Quit"), NULL,
NULL,
G_CALLBACK (gnc_main_window_cmd_file_quit) },
/* Edit menu */
- { "EditCutAction", N_("Cu_t"), GTK_STOCK_CUT, "<control>x",
+ { "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), "<control>x",
NULL,
G_CALLBACK (gnc_main_window_cmd_edit_cut) },
- { "EditCopyAction", N_("_Copy"), GTK_STOCK_COPY, "<control>c",
+ { "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), "<control>c",
NULL,
G_CALLBACK (gnc_main_window_cmd_edit_copy) },
- { "EditPasteAction", N_("_Paste"), GTK_STOCK_PASTE, "<control>v",
+ { "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), "<control>v",
NULL,
G_CALLBACK (gnc_main_window_cmd_edit_paste) },
- { "EditPreferencesAction", N_("_Preferences"), GTK_STOCK_PREFERENCES, NULL,
+ { "EditPreferencesAction", GTK_STOCK_PREFERENCES, N_("_Preferences"), NULL,
NULL,
G_CALLBACK (gnc_main_window_cmd_edit_preferences) },
- { "EditTaxOptionsAction", N_("Ta_x Options"), NULL, NULL,
+ { "EditTaxOptionsAction", NULL, N_("Ta_x Options"), NULL,
N_("Setup tax information for all income and expense accounts"),
G_CALLBACK (gnc_main_window_cmd_edit_tax_options) },
/* View menu */
- { "ViewRefreshAction", N_("_Refresh"), GTK_STOCK_REFRESH, "<control>r",
+ { "ViewRefreshAction", GTK_STOCK_REFRESH, N_("_Refresh"), "<control>r",
N_("Refresh this window"),
G_CALLBACK (gnc_main_window_cmd_view_refresh) },
/* Actions menu */
- { "ActionsScheduledTransactionsAction", N_("_Scheduled Transactions"), NULL, NULL, NULL, NULL },
- { "ActionsScheduledTransactionEditorAction", N_("_Scheduled Transaction Editor"), NULL, "NULL",
+ { "ActionsScheduledTransactionsAction", NULL, N_("_Scheduled Transactions"), NULL, NULL, NULL },
+ { "ActionsScheduledTransactionEditorAction", NULL, N_("_Scheduled Transaction Editor"), NULL,
N_("The list of Scheduled Transactions"),
G_CALLBACK (gnc_main_window_cmd_actions_scheduled_transaction_editor) },
- { "ActionsSinceLastRunAction", N_("_Since Last Run..."), NULL, "NULL",
+ { "ActionsSinceLastRunAction", NULL, N_("_Since Last Run..."), NULL,
N_("Create Scheduled Transactions since the last time run"),
G_CALLBACK (gnc_main_window_cmd_actions_since_last_run) },
- { "ActionsMortgageLoanAction", N_("_Mortgage & Loan Repayment..."), NULL, "NULL",
+ { "ActionsMortgageLoanAction", NULL, N_("_Mortgage & Loan Repayment..."), NULL,
N_("Setup scheduled transactions for repayment of a loan"),
G_CALLBACK (gnc_main_window_cmd_actions_mortgage_loan) },
- { "ActionsBudgetWorkbenchAction", N_("_Budget Workbench (Experimental)"), NULL, NULL,
+ { "ActionsBudgetWorkbenchAction", NULL, N_("_Budget Workbench (Experimental)"), NULL,
N_("Create, Manage, and Monitor Budgets." ),
G_CALLBACK(gnc_main_window_cmd_actions_budget_workbench) },
- { "ActionsCloseBooksAction", N_("Close Books"), NULL, "NULL",
+ { "ActionsCloseBooksAction", NULL, N_("Close Books"), NULL,
N_("Archive old data using accounting periods"),
G_CALLBACK (gnc_main_window_cmd_actions_close_books) },
/* Tools menu */
- { "ToolsPriceEditorAction", N_("_Price Editor"), NULL, NULL,
+ { "ToolsPriceEditorAction", NULL, N_("_Price Editor"), NULL,
N_("View and edit the prices for stocks and mutual funds"),
G_CALLBACK (gnc_main_window_cmd_tools_price_editor) },
- { "ToolsCommodityEditorAction", N_("Commodity _Editor"), NULL, NULL,
+ { "ToolsCommodityEditorAction", NULL, N_("Commodity _Editor"), NULL,
N_("View and edit the commodities for stocks and mutual funds"),
G_CALLBACK (gnc_main_window_cmd_tools_commodity_editor) },
- { "ToolsFinancialCalculatorAction", N_("Financial _Calculator"), NULL, NULL,
+ { "ToolsFinancialCalculatorAction", NULL, N_("Financial _Calculator"), NULL,
N_("Use the financial calculator"),
G_CALLBACK (gnc_main_window_cmd_tools_financial_calculator) },
- { "ToolsFindTransactionsAction", N_("_Find Transactions"), GTK_STOCK_FIND, "<control>f",
+ { "ToolsFindTransactionsAction", GTK_STOCK_FIND, N_("_Find Transactions"), "<control>f",
N_("Find transactions with a search"),
G_CALLBACK (gnc_main_window_cmd_tools_find_transactions) },
/* Help menu */
- { "HelpTutorialAction", N_("Tutorial and Concepts _Guide"), GNOME_STOCK_BOOK_BLUE, NULL,
+ { "HelpTutorialAction", GNOME_STOCK_BOOK_BLUE, N_("Tutorial and Concepts _Guide"), NULL,
N_("Open the GnuCash Tutorial"),
G_CALLBACK (gnc_main_window_cmd_help_tutorial) },
- { "HelpTipsOfTheDayAction", N_("_Tips Of The Day"), NULL, NULL,
+ { "HelpTipsOfTheDayAction", NULL, N_("_Tips Of The Day"), NULL,
N_("View the Tips of the Day"),
G_CALLBACK (gnc_main_window_cmd_help_totd) },
- { "HelpContentsAction", N_("_Contents"), GTK_STOCK_HELP, NULL,
+ { "HelpContentsAction", GTK_STOCK_HELP, N_("_Contents"), NULL,
N_("Open the GnuCash Help"),
G_CALLBACK (gnc_main_window_cmd_help_contents) },
- { "HelpAboutAction", N_("_About"), GNOME_STOCK_ABOUT, NULL,
+ { "HelpAboutAction", GNOME_STOCK_ABOUT, N_("_About"), NULL,
NULL,
G_CALLBACK (gnc_main_window_cmd_help_about) },
/* Misc menu */
- { "MiscTestAction", N_("TEST"), NULL, "NULL",
+ { "MiscTestAction", NULL, N_("TEST"), NULL,
N_("Testing stuff"), G_CALLBACK (gnc_main_window_cmd_test) },
};
static guint gnc_menu_n_entries = G_N_ELEMENTS (gnc_menu_entries);
-static EggToggleActionEntry toggle_entries [] =
+static GtkToggleActionEntry toggle_entries [] =
{
{ "ViewToolbarAction", NULL, N_("_Toolbar"), "<shift><control>t",
N_("Show/hide the toolbar on this window"),
@@ -531,7 +526,7 @@
gnc_plugin_page_removed (page);
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_ui_manager_ensure_update (window->ui_merge);
gnc_window_set_status (GNC_WINDOW(window), page, NULL);
gnc_plugin_page_destroy_widget (page);
@@ -554,7 +549,7 @@
void
gnc_main_window_merge_actions (GncMainWindow *window,
const gchar *group_name,
- EggActionEntry *actions,
+ GtkActionEntry *actions,
guint n_actions,
const gchar *filename,
gpointer user_data)
@@ -579,13 +574,13 @@
return;
entry = g_new0 (MergedActionEntry, 1);
- entry->action_group = egg_action_group_new (group_name);
- egg_action_group_add_actions (entry->action_group, actions, n_actions, data);
- egg_menu_merge_insert_action_group (window->ui_merge, entry->action_group, 0);
- entry->merge_id = egg_menu_merge_add_ui_from_file (window->ui_merge, pathname, &error);
+ entry->action_group = gtk_action_group_new (group_name);
+ gtk_action_group_add_actions (entry->action_group, actions, n_actions, data);
+ gtk_ui_manager_insert_action_group (window->ui_merge, entry->action_group, 0);
+ entry->merge_id = gtk_ui_manager_add_ui_from_file (window->ui_merge, pathname, &error);
g_assert(entry->merge_id || error);
if (entry->merge_id) {
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_ui_manager_ensure_update (window->ui_merge);
g_hash_table_insert (window->priv->merged_actions_table, g_strdup (group_name), entry);
} else {
g_critical("Failed to load ui file.\n Filename %s\n Error %s",
@@ -610,9 +605,9 @@
if (entry == NULL)
return;
- egg_menu_merge_remove_action_group (window->ui_merge, entry->action_group);
- egg_menu_merge_remove_ui (window->ui_merge, entry->merge_id);
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_ui_manager_remove_action_group (window->ui_merge, entry->action_group);
+ gtk_ui_manager_remove_ui (window->ui_merge, entry->merge_id);
+ gtk_ui_manager_ensure_update (window->ui_merge);
g_hash_table_remove (window->priv->merged_actions_table, group_name);
}
@@ -620,22 +615,22 @@
void
gnc_main_window_actions_updated (GncMainWindow *window)
{
- EggActionGroup *force;
+ GtkActionGroup *force;
g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
- /* Unfortunately egg_menu_merge_ensure_update doesn't work
+ /* Unfortunately gtk_ui_manager_ensure_update doesn't work
* here. Force a full update by adding and removing an empty
* action group.
*/
- force = egg_action_group_new("force_update");
- egg_menu_merge_insert_action_group (window->ui_merge, force, 0);
- egg_menu_merge_ensure_update (window->ui_merge);
- egg_menu_merge_remove_action_group (window->ui_merge, force);
+ force = gtk_action_group_new("force_update");
+ gtk_ui_manager_insert_action_group (window->ui_merge, force, 0);
+ gtk_ui_manager_ensure_update (window->ui_merge);
+ gtk_ui_manager_remove_action_group (window->ui_merge, force);
g_object_unref(force);
}
-EggActionGroup *
+GtkActionGroup *
gnc_main_window_get_action_group (GncMainWindow *window,
const gchar *group_name)
{
@@ -796,16 +791,16 @@
gtk_box_pack_start (GTK_BOX (priv->statusbar), priv->progressbar,
FALSE, TRUE, 0);
- window->ui_merge = egg_menu_merge_new ();
+ window->ui_merge = gtk_ui_manager_new ();
/* Create menu and toolbar information */
- priv->action_group = egg_action_group_new ("MainWindowActions");
- egg_action_group_add_actions (priv->action_group, gnc_menu_entries,
+ priv->action_group = gtk_action_group_new ("MainWindowActions");
+ gtk_action_group_add_actions (priv->action_group, gnc_menu_entries,
gnc_menu_n_entries, window);
- egg_action_group_add_toggle_actions (priv->action_group,
+ gtk_action_group_add_toggle_actions (priv->action_group,
toggle_entries, n_toggle_entries,
window);
- egg_menu_merge_insert_action_group (window->ui_merge, priv->action_group, 0);
+ gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0);
g_signal_connect (G_OBJECT (window->ui_merge), "add_widget",
G_CALLBACK (gnc_main_window_add_widget), window);
@@ -814,13 +809,14 @@
/* Can't do much without a ui. */
g_assert (filename);
- merge_id = egg_menu_merge_add_ui_from_file (window->ui_merge,
+ merge_id = gtk_ui_manager_add_ui_from_file (window->ui_merge,
filename, &error);
g_free(filename);
g_assert(merge_id || error);
if (merge_id) {
- gtk_window_add_accel_group (GTK_WINDOW (window), window->ui_merge->accel_group);
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_window_add_accel_group (GTK_WINDOW (window),
+ gtk_ui_manager_get_accel_group(window->ui_merge));
+ gtk_ui_manager_ensure_update (window->ui_merge);
} else {
g_critical("Failed to load ui file.\n Filename %s\n Error %s",
filename, error->message);
@@ -831,28 +827,28 @@
/* Testing */
{
guint new_merge_id;
- EggActionGroup *eag;
- EggActionEntry newEntry[] =
+ GtkActionGroup *eag;
+ GtkActionEntry newEntry[] =
{
- { "BarAction", N_("_GtkHtml3 test"), NULL, "<control>3", NULL, G_CALLBACK (gnc_main_window_cmd_test) }
+ { "BarAction", NULL, N_("_GtkHtml3 test"), "<control>3", NULL, G_CALLBACK (gnc_main_window_cmd_test) }
};
- eag = egg_action_group_new ("MainWindowActions2");
+ eag = gtk_action_group_new ("MainWindowActions2");
- egg_action_group_add_actions (eag, newEntry,
+ gtk_action_group_add_actions (eag, newEntry,
G_N_ELEMENTS (newEntry), window);
- egg_menu_merge_insert_action_group( window->ui_merge, eag, 0 );
+ gtk_ui_manager_insert_action_group( window->ui_merge, eag, 0 );
- new_merge_id = egg_menu_merge_new_merge_id( window->ui_merge );
+ new_merge_id = gtk_ui_manager_new_merge_id( window->ui_merge );
- egg_menu_merge_add_ui( window->ui_merge, new_merge_id,
+ gtk_ui_manager_add_ui( window->ui_merge, new_merge_id,
//"/menubar/Actions",
//"/menubar/Actions/ActionsPlaceholder",
// "/menubar/AdditionalMenusPlaceholder/AReportAction",
"/menubar/AdditionalMenusPlaceholder",
"BarAction",
- "BarAction", EGG_MENU_MERGE_MENUITEM, FALSE );
- egg_menu_merge_ensure_update( window->ui_merge );
+ "BarAction", GTK_UI_MANAGER_MENUITEM, FALSE );
+ gtk_ui_manager_ensure_update( window->ui_merge );
}
/* Now update the extension-menus */
@@ -871,11 +867,11 @@
}
static void
-gnc_main_window_add_widget (EggMenuMerge *merge,
+gnc_main_window_add_widget (GtkUIManager *merge,
GtkWidget *widget,
GncMainWindow *window)
{
- if (EGG_IS_TOOLBAR (widget)) {
+ if (GTK_IS_TOOLBAR (widget)) {
window->priv->toolbar_dock = widget;
}
@@ -955,14 +951,14 @@
/* Command callbacks */
static void
-gnc_main_window_cmd_file_new (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_new (GtkAction *action, GncMainWindow *window)
{
gnc_file_new ();
/* FIXME GNOME 2 Port (update the title etc.) */
}
static void
-gnc_main_window_cmd_file_open (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_open (GtkAction *action, GncMainWindow *window)
{
gnc_window_set_progressbar_window (GNC_WINDOW(window));
gnc_file_open ();
@@ -972,7 +968,7 @@
}
static void
-gnc_main_window_cmd_file_open_new_window (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_open_new_window (GtkAction *action, GncMainWindow *window)
{
GncMainWindowPrivate *priv;
GncMainWindow *new_window;
@@ -997,7 +993,7 @@
gtk_notebook_remove_page (notebook, page_num);
priv->installed_pages = g_list_remove (priv->installed_pages, page);
gnc_plugin_page_removed (page);
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_ui_manager_ensure_update (window->ui_merge);
gnc_window_set_status (GNC_WINDOW(window), page, NULL);
/* Create the new window */
@@ -1020,7 +1016,7 @@
}
static void
-gnc_main_window_cmd_file_save (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_save (GtkAction *action, GncMainWindow *window)
{
gnc_window_set_progressbar_window (GNC_WINDOW(window));
gnc_file_save ();
@@ -1029,7 +1025,7 @@
}
static void
-gnc_main_window_cmd_file_save_as (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_save_as (GtkAction *action, GncMainWindow *window)
{
gnc_window_set_progressbar_window (GNC_WINDOW(window));
gnc_file_save_as ();
@@ -1059,7 +1055,7 @@
}
static void
-gnc_main_window_cmd_file_qsf_import (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_qsf_import (GtkAction *action, GncMainWindow *window)
{
GtkWidget *file_select;
@@ -1074,7 +1070,7 @@
}
static void
-gnc_main_window_cmd_file_export_accounts (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_export_accounts (GtkAction *action, GncMainWindow *window)
{
gnc_window_set_progressbar_window (GNC_WINDOW(window));
gnc_file_export_file (NULL);
@@ -1084,7 +1080,7 @@
}
static void
-gnc_main_window_cmd_chart_export (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_chart_export (GtkAction *action, GncMainWindow *window)
{
gnc_window_set_progressbar_window (GNC_WINDOW(window));
gnc_main_window_chart_export();
@@ -1094,12 +1090,12 @@
}
static void
-gnc_main_window_cmd_file_print (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_print (GtkAction *action, GncMainWindow *window)
{
}
static void
-gnc_main_window_cmd_file_properties (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_properties (GtkAction *action, GncMainWindow *window)
{
SCM func = scm_c_eval_string("gnc:main-window-properties-cb");
if (!SCM_PROCEDUREP (func)) {
@@ -1110,7 +1106,7 @@
}
static void
-gnc_main_window_cmd_file_close (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_close (GtkAction *action, GncMainWindow *window)
{
if (window->priv->current_page != NULL) {
gnc_main_window_close_page (window, window->priv->current_page);
@@ -1118,47 +1114,47 @@
}
static void
-gnc_main_window_cmd_file_quit (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_file_quit (GtkAction *action, GncMainWindow *window)
{
gnc_shutdown (0);
}
static void
-gnc_main_window_cmd_edit_cut (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_edit_cut (GtkAction *action, GncMainWindow *window)
{
}
static void
-gnc_main_window_cmd_edit_copy (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_edit_copy (GtkAction *action, GncMainWindow *window)
{
}
static void
-gnc_main_window_cmd_edit_paste (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_edit_paste (GtkAction *action, GncMainWindow *window)
{
}
static void
-gnc_main_window_cmd_edit_preferences (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_edit_preferences (GtkAction *action, GncMainWindow *window)
{
gnc_show_options_dialog ();
}
static void
-gnc_main_window_cmd_edit_tax_options (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_edit_tax_options (GtkAction *action, GncMainWindow *window)
{
gnc_tax_info_dialog (GTK_WIDGET (window));
}
static void
-gnc_main_window_cmd_view_refresh (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_view_refresh (GtkAction *action, GncMainWindow *window)
{
}
static void
-gnc_main_window_cmd_view_toolbar (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_view_toolbar (GtkAction *action, GncMainWindow *window)
{
- if (EGG_TOGGLE_ACTION (action)->active) {
+ if (gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))) {
gtk_widget_show (window->priv->toolbar_dock);
} else {
gtk_widget_hide (window->priv->toolbar_dock);
@@ -1166,14 +1162,14 @@
}
static void
-gnc_main_window_cmd_view_summary (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_view_summary (GtkAction *action, GncMainWindow *window)
{
}
static void
-gnc_main_window_cmd_view_statusbar (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_view_statusbar (GtkAction *action, GncMainWindow *window)
{
- if (EGG_TOGGLE_ACTION (action)->active) {
+ if (gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(action))) {
gtk_widget_show (window->priv->statusbar);
} else {
gtk_widget_hide (window->priv->statusbar);
@@ -1181,13 +1177,13 @@
}
static void
-gnc_main_window_cmd_actions_scheduled_transaction_editor (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_actions_scheduled_transaction_editor (GtkAction *action, GncMainWindow *window)
{
gnc_ui_scheduled_xaction_dialog_create ();
}
static void
-gnc_main_window_cmd_actions_since_last_run (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_actions_since_last_run (GtkAction *action, GncMainWindow *window)
{
gint ret;
const char *nothing_to_do_msg =
@@ -1211,55 +1207,55 @@
}
static void
-gnc_main_window_cmd_actions_mortgage_loan (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_actions_mortgage_loan (GtkAction *action, GncMainWindow *window)
{
gnc_ui_sx_loan_druid_create ();
}
static void
-gnc_main_window_cmd_actions_budget_workbench(EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_actions_budget_workbench(GtkAction *action, GncMainWindow *window)
{
gnc_budget_list_dialog_create();
}
static void
-gnc_main_window_cmd_actions_close_books (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_actions_close_books (GtkAction *action, GncMainWindow *window)
{
gnc_acct_period_dialog();
}
static void
-gnc_main_window_cmd_tools_price_editor (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_tools_price_editor (GtkAction *action, GncMainWindow *window)
{
gnc_prices_dialog (NULL);
}
static void
-gnc_main_window_cmd_tools_commodity_editor (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_tools_commodity_editor (GtkAction *action, GncMainWindow *window)
{
gnc_commodities_dialog (NULL);
}
static void
-gnc_main_window_cmd_tools_financial_calculator (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_tools_financial_calculator (GtkAction *action, GncMainWindow *window)
{
gnc_ui_fincalc_dialog_create();
}
static void
-gnc_main_window_cmd_tools_find_transactions (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_tools_find_transactions (GtkAction *action, GncMainWindow *window)
{
gnc_ui_find_transactions_dialog_create (NULL);
}
static void
-gnc_main_window_cmd_help_tutorial (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_help_tutorial (GtkAction *action, GncMainWindow *window)
{
gnc_gnome_help (HF_GUIDE, NULL);
}
static void
-gnc_main_window_cmd_help_totd (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_help_totd (GtkAction *action, GncMainWindow *window)
{
GtkWidget *dialog;
@@ -1269,13 +1265,13 @@
}
static void
-gnc_main_window_cmd_help_contents (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_help_contents (GtkAction *action, GncMainWindow *window)
{
gnc_gnome_help (HF_HELP, NULL);
}
static void
-gnc_main_window_cmd_test( EggAction *action, GncMainWindow *window )
+gnc_main_window_cmd_test( GtkAction *action, GncMainWindow *window )
{
GtkWindow *w = GTK_WINDOW(gtk_window_new( GTK_WINDOW_TOPLEVEL ));
gnc_html *gnchtml = gnc_html_new( w );
@@ -1288,7 +1284,7 @@
}
static void
-gnc_main_window_cmd_help_about (EggAction *action, GncMainWindow *window)
+gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window)
{
GtkWidget *about;
const gchar *message = _("The GnuCash personal finance manager.\n"
Index: gnc-plugin.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/gnome/gnc-plugin.c -Lsrc/gnome/gnc-plugin.c -u -r1.1.2.7 -r1.1.2.8
--- src/gnome/gnc-plugin.c
+++ src/gnome/gnc-plugin.c
@@ -177,7 +177,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE,
1,
- EGG_TYPE_MENU_MERGE);
+ GTK_TYPE_MENU_MERGE);
signals[UNMERGE_ACTIONS] = g_signal_new ("unmerge-actions",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_FIRST,
@@ -186,7 +186,7 @@
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE,
1,
- EGG_TYPE_MENU_MERGE);
+ GTK_TYPE_MENU_MERGE);
}
}
#endif
Index: gnc-plugin-register.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-register.c,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -Lsrc/gnome/gnc-plugin-register.c -Lsrc/gnome/gnc-plugin-register.c -u -r1.1.2.7 -r1.1.2.8
--- src/gnome/gnc-plugin-register.c
+++ src/gnome/gnc-plugin-register.c
@@ -41,13 +41,13 @@
static GncPluginPage *gnc_plugin_register_create_page (GncPlugin *plugin, const gchar *uri);
/* Command callbacks */
-static void gnc_plugin_register_cmd_general_ledger (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_register_cmd_general_ledger (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-register-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-register-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "ToolsGeneralLedgerAction", N_("_General Ledger"), NULL, NULL,
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "ToolsGeneralLedgerAction", NULL, N_("_General Ledger"), NULL,
N_("Open a general ledger window"),
G_CALLBACK (gnc_plugin_register_cmd_general_ledger) },
};
@@ -190,7 +190,7 @@
************************************************************/
static void
-gnc_plugin_register_cmd_general_ledger (EggAction *action,
+gnc_plugin_register_cmd_general_ledger (GtkAction *action,
GncMainWindowActionData *data)
{
GncPluginPage *page;
@@ -203,7 +203,7 @@
#if 0
static void
-gnc_main_window_cmd_tools_general_ledger (EggAction *action,
+gnc_main_window_cmd_tools_general_ledger (GtkAction *action,
GncMainWindow *window)
{
GNCLedgerDisplay *ld;
Index: gnc-embedded-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-embedded-window.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome/gnc-embedded-window.c -Lsrc/gnome/gnc-embedded-window.c -u -r1.1.2.6 -r1.1.2.7
--- src/gnome/gnc-embedded-window.c
+++ src/gnome/gnc-embedded-window.c
@@ -27,11 +27,6 @@
#include <gtk/gtk.h>
-#include "eggtoolbar.h"
-#include "egg-action-group.h"
-#include "egg-menu-merge.h"
-#include "egg-toggle-action.h"
-
#include "gnc-embedded-window.h"
#include "gnc-engine.h"
@@ -67,7 +62,7 @@
GtkWidget *toolbar_dock;
GtkWidget *statusbar;
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
GncPluginPage *page;
GtkWidget *parent_window;
@@ -149,7 +144,7 @@
gnc_plugin_page_removed (page);
gnc_plugin_page_unmerge_actions (page, window->ui_merge);
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_ui_manager_ensure_update (window->ui_merge);
gnc_plugin_page_destroy_widget (page);
g_object_unref(page);
@@ -228,12 +223,12 @@
}
static void
-gnc_embedded_window_add_widget (EggMenuMerge *merge,
+gnc_embedded_window_add_widget (GtkUIManager *merge,
GtkWidget *widget,
GncEmbeddedWindow *window)
{
ENTER("merge %p, new widget %p, window %p", merge, widget, window);
- if (EGG_IS_TOOLBAR (widget)) {
+ if (GTK_IS_TOOLBAR (widget)) {
window->priv->toolbar_dock = widget;
}
@@ -262,7 +257,7 @@
gtk_widget_show (priv->statusbar);
gtk_box_pack_end (GTK_BOX (window), priv->statusbar, FALSE, TRUE, 0);
- window->ui_merge = egg_menu_merge_new ();
+ window->ui_merge = gtk_ui_manager_new ();
g_signal_connect (G_OBJECT (window->ui_merge), "add_widget",
G_CALLBACK (gnc_embedded_window_add_widget), window);
@@ -272,7 +267,7 @@
GncEmbeddedWindow *
gnc_embedded_window_new (const gchar *action_group_name,
- EggActionEntry *action_entries,
+ GtkActionEntry *action_entries,
gint n_action_entries,
const gchar *ui_filename,
GtkWidget *enclosing_win,
@@ -295,11 +290,11 @@
ui_fullname = gnc_gnome_locate_ui_file(ui_filename);
/* Create menu and toolbar information */
- priv->action_group = egg_action_group_new (action_group_name);
- egg_action_group_add_actions (priv->action_group, action_entries,
+ priv->action_group = gtk_action_group_new (action_group_name);
+ gtk_action_group_add_actions (priv->action_group, action_entries,
n_action_entries, user_data);
- egg_menu_merge_insert_action_group (window->ui_merge, priv->action_group, 0);
- merge_id = egg_menu_merge_add_ui_from_file (window->ui_merge, ui_fullname,
+ gtk_ui_manager_insert_action_group (window->ui_merge, priv->action_group, 0);
+ merge_id = gtk_ui_manager_add_ui_from_file (window->ui_merge, ui_fullname,
&error);
/* Error checking */
@@ -316,9 +311,9 @@
/* Add accelerators (if wanted) */
if (add_accelerators)
gtk_window_add_accel_group (GTK_WINDOW(enclosing_win),
- window->ui_merge->accel_group);
+ gtk_ui_manager_get_accel_group(window->ui_merge));
- egg_menu_merge_ensure_update (window->ui_merge);
+ gtk_ui_manager_ensure_update (window->ui_merge);
g_free(ui_fullname);
LEAVE("window %p", window);
return window;
Index: gnc-embedded-window.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-embedded-window.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome/gnc-embedded-window.h -Lsrc/gnome/gnc-embedded-window.h -u -r1.1.2.2 -r1.1.2.3
--- src/gnome/gnc-embedded-window.h
+++ src/gnome/gnc-embedded-window.h
@@ -28,8 +28,6 @@
#include <gtk/gtkwindow.h>
-#include "egg-menu-merge.h"
-
#include "gnc-plugin-page.h"
G_BEGIN_DECLS
@@ -52,7 +50,7 @@
GncEmbeddedWindowPrivate *priv;
- EggMenuMerge *ui_merge;
+ GtkUIManager *ui_merge;
} GncEmbeddedWindow;
typedef struct {
@@ -60,8 +58,8 @@
} GncEmbeddedWindowClass;
typedef struct gnc_embedded_window {
- EggMenuMerge *ui_merge;
- EggActionGroup *action_group;
+ GtkUIManager *ui_merge;
+ GtkActionGroup *action_group;
GtkWidget *main_vbox;
GtkWidget *menu_dock;
GtkWidget *toolbar_dock;
@@ -71,7 +69,7 @@
GType gnc_embedded_window_get_type (void);
GncEmbeddedWindow * gnc_embedded_window_new (const gchar *action_group_name,
- EggActionEntry *action_entries,
+ GtkActionEntry *action_entries,
gint n_action_entries,
const gchar *ui_filename,
GtkWidget *enclosing_win,
Index: gnc-plugin-page-account-tree.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page-account-tree.c,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -Lsrc/gnome/gnc-plugin-page-account-tree.c -Lsrc/gnome/gnc-plugin-page-account-tree.c -u -r1.1.2.35 -r1.1.2.36
--- src/gnome/gnc-plugin-page-account-tree.c
+++ src/gnome/gnc-plugin-page-account-tree.c
@@ -25,7 +25,6 @@
#include "config.h"
#include <gtk/gtk.h>
-#include "egg-action-group.h"
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-page-register.h"
@@ -78,8 +77,8 @@
static GtkWidget *gnc_plugin_page_account_tree_create_widget (GncPluginPage *plugin_page);
static void gnc_plugin_page_account_tree_destroy_widget (GncPluginPage *plugin_page);
-static void gnc_plugin_page_account_tree_merge_actions (GncPluginPage *plugin_page, EggMenuMerge *ui_merge);
-static void gnc_plugin_page_account_tree_unmerge_actions (GncPluginPage *plugin_page, EggMenuMerge *ui_merge);
+static void gnc_plugin_page_account_tree_merge_actions (GncPluginPage *plugin_page, GtkUIManager *ui_merge);
+static void gnc_plugin_page_account_tree_unmerge_actions (GncPluginPage *plugin_page, GtkUIManager *ui_merge);
/* Callbacks */
static gboolean gnc_plugin_page_account_tree_popup_menu_cb (GtkTreeView *treeview,
@@ -96,20 +95,20 @@
GncPluginPageAccountTree *page);
/* Command callbacks */
-static void gnc_plugin_page_account_tree_cmd_new_account (EggAction *action, GncPluginPageAccountTree *plugin_page);
-static void gnc_plugin_page_account_tree_cmd_file_hierarchy_merge (EggAction *action, GncPluginPageAccountTree *plugin_page);
-static void gnc_plugin_page_account_tree_cmd_open_account (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_open_subaccounts (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_edit_account (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_delete_account (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_view_options (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_reconcile (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_transfer (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_stock_split (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_lots (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_scrub (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_scrub_sub (EggAction *action, GncPluginPageAccountTree *page);
-static void gnc_plugin_page_account_tree_cmd_scrub_all (EggAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_new_account (GtkAction *action, GncPluginPageAccountTree *plugin_page);
+static void gnc_plugin_page_account_tree_cmd_file_hierarchy_merge (GtkAction *action, GncPluginPageAccountTree *plugin_page);
+static void gnc_plugin_page_account_tree_cmd_open_account (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_open_subaccounts (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_edit_account (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_view_options (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_reconcile (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_transfer (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_stock_split (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_lots (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_scrub (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_scrub_sub (GtkAction *action, GncPluginPageAccountTree *page);
+static void gnc_plugin_page_account_tree_cmd_scrub_all (GtkAction *action, GncPluginPageAccountTree *page);
static void gnc_plugin_page_acct_tree_options_new(GncPluginPageAccountTreePrivate *priv);
@@ -119,57 +118,57 @@
static guint plugin_page_signals[LAST_SIGNAL] = { 0 };
-static EggActionEntry gnc_plugin_page_account_tree_actions [] = {
+static GtkActionEntry gnc_plugin_page_account_tree_actions [] = {
/* Toplevel */
- { "FakeToplevel", "", NULL, NULL, NULL, NULL },
+ { "FakeToplevel", NULL, "", NULL, NULL, NULL },
/* File menu */
- { "FileNewAccountAction", N_("New Account..."), GNC_STOCK_NEW_ACCOUNT, NULL,
+ { "FileNewAccountAction", GNC_STOCK_NEW_ACCOUNT, N_("New Account..."), NULL,
N_("Create a new Account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_new_account) },
- { "FileAddAccountHierarchyDruidAction", N_("Add New Account _Hierarchy..."), NULL, NULL,
+ { "FileAddAccountHierarchyDruidAction", NULL, N_("Add New Account _Hierarchy..."), NULL,
N_("Extend the current book by merging with new account type categories"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_file_hierarchy_merge) },
- { "FileOpenAccountAction", N_("Open Account"), GNC_STOCK_OPEN_ACCOUNT, "<control>o",
+ { "FileOpenAccountAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open Account"), "<control>o",
N_("Open the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_account) },
- { "FileOpenSubaccountsAction", N_("Open _Subaccounts"), GNC_STOCK_OPEN_ACCOUNT, NULL,
+ { "FileOpenSubaccountsAction", GNC_STOCK_OPEN_ACCOUNT, N_("Open _Subaccounts"), NULL,
N_("Open the selected account and all its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts) },
/* Edit menu */
- { "EditEditAccountAction", N_("_Edit Account"), GNC_STOCK_EDIT_ACCOUNT, "<control>e",
+ { "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("_Edit Account"), "<control>e",
N_("Edit the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_edit_account) },
- { "EditDeleteAccountAction", N_("_Delete Account"), GNC_STOCK_DELETE_ACCOUNT, NULL,
+ { "EditDeleteAccountAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete Account"), NULL,
N_("Delete selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_delete_account) },
- { "EditAccountViewOptionsAction", N_("Account Tree Options"), GTK_STOCK_PROPERTIES, NULL,
+ { "EditAccountViewOptionsAction", GTK_STOCK_PROPERTIES, N_("Account Tree Options"), NULL,
N_("Edit the account view options"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_view_options) },
/* Actions menu */
- { "ActionsReconcileAction", N_("_Reconcile..."), NULL, "<control>r",
+ { "ActionsReconcileAction", NULL, N_("_Reconcile..."), "<control>r",
N_("Reconcile the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_reconcile) },
- { "ActionsTransferAction", N_("_Transfer..."), NULL, "<control>t",
+ { "ActionsTransferAction", NULL, N_("_Transfer..."), "<control>t",
N_("Transfer funds from one account to another"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_transfer) },
- { "ActionsStockSplitAction", N_("Stock S_plit..."), NULL, NULL,
+ { "ActionsStockSplitAction", NULL, N_("Stock S_plit..."), NULL,
N_("Record a stock split or a stock merger"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_stock_split) },
- { "ActionsLotsAction", N_("View _Lots..."), NULL, NULL,
+ { "ActionsLotsAction", NULL, N_("View _Lots..."), NULL,
N_("Bring up the lot viewer/editor window"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_lots) },
- { "ScrubMenuAction", N_("Check & Repair"), NULL, NULL, NULL, NULL },
- { "ScrubAction", N_("Check & Repair A_ccount"), NULL, NULL,
+ { "ScrubMenuAction", NULL, N_("Check & Repair"), NULL, NULL, NULL },
+ { "ScrubAction", NULL, N_("Check & Repair A_ccount"), NULL,
N_("Check for and repair unbalanced transactions and orphan splits " "in this account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub) },
- { "ScrubSubAction", N_("Check & Repair Su_baccount"), NULL, NULL,
+ { "ScrubSubAction", NULL, N_("Check & Repair Su_baccount"), NULL,
N_("Check for and repair unbalanced transactions and orphan splits "
"in this account and its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub_sub) },
- { "ScrubAllAction", N_("Check & Repair A_ll"), NULL, NULL,
+ { "ScrubAllAction", NULL, N_("Check & Repair A_ll"), NULL,
N_("Check for and repair unbalanced transactions and orphan splits " "in all accounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub_all) },
};
@@ -185,7 +184,7 @@
NULL
};
-/* DRH - Suggest this be added to libegg */
+/* DRH - Suggest short_labels be added to libegg */
static action_short_labels short_labels[] = {
{ "FileOpenAccountAction", N_("Open") },
{ "EditEditAccountAction", N_("Edit") },
@@ -197,9 +196,9 @@
struct GncPluginPageAccountTreePrivate
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
guint merge_id;
- EggMenuMerge *ui_merge;
+ GtkUIManager *ui_merge;
GtkWidget *widget;
GtkTreeView *tree_view;
@@ -323,7 +322,7 @@
static void
gnc_plugin_page_account_tree_init (GncPluginPageAccountTree *plugin_page)
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
GncPluginPageAccountTreePrivate *priv;
GncPluginPage *parent;
const gchar *url = NULL;
@@ -345,9 +344,9 @@
gnc_plugin_page_add_book(parent, gnc_get_current_book());
/* Create menu and toolbar information */
- action_group = egg_action_group_new ("GncPluginPageAccountTreeActions");
+ action_group = gtk_action_group_new ("GncPluginPageAccountTreeActions");
priv->action_group = action_group;
- egg_action_group_add_actions (action_group,
+ gtk_action_group_add_actions (action_group,
gnc_plugin_page_account_tree_actions,
gnc_plugin_page_account_tree_n_actions,
plugin_page);
@@ -554,7 +553,7 @@
static void
gnc_plugin_page_account_tree_merge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge)
+ GtkUIManager *ui_merge)
{
GncPluginPageAccountTree *account_page;
GncPluginPageAccountTreePrivate *priv;
@@ -576,7 +575,7 @@
static void
gnc_plugin_page_account_tree_unmerge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge)
+ GtkUIManager *ui_merge)
{
GncPluginPageAccountTree *plugin_page_account_tree = GNC_PLUGIN_PAGE_ACCOUNT_TREE(plugin_page);
@@ -589,8 +588,8 @@
g_return_if_fail (plugin_page_account_tree->priv->merge_id != 0);
g_return_if_fail (plugin_page_account_tree->priv->action_group != NULL);
- egg_menu_merge_remove_ui (ui_merge, plugin_page_account_tree->priv->merge_id);
- egg_menu_merge_remove_action_group (ui_merge, plugin_page_account_tree->priv->action_group);
+ gtk_ui_manager_remove_ui (ui_merge, plugin_page_account_tree->priv->merge_id);
+ gtk_ui_manager_remove_action_group (ui_merge, plugin_page_account_tree->priv->action_group);
plugin_page_account_tree->priv->ui_merge = NULL;
LEAVE(" ");
@@ -623,7 +622,7 @@
time = event ? event->time : 0;
/* Maybe show a different popup menu if no account is selected. */
- menu = egg_menu_merge_get_widget (page->priv->ui_merge, "/AccountPopup");
+ menu = gtk_ui_manager_get_widget (page->priv->ui_merge, "/AccountPopup");
if (!menu) {
LEAVE("no menu");
return FALSE;
@@ -670,8 +669,8 @@
gnc_plugin_page_account_tree_selection_changed_cb (GtkTreeSelection *selection,
GncPluginPageAccountTree *page)
{
- EggActionGroup *action_group;
- EggAction *action;
+ GtkActionGroup *action_group;
+ GtkAction *action;
GtkTreeView *view;
Account *account = NULL;
GValue value = { 0 };
@@ -695,7 +694,7 @@
g_value_set_boolean (&value, sensitive);
action_group = page->priv->action_group;
for (i = 0; actions_requiring_account[i]; i++) {
- action = egg_action_group_get_action (action_group,
+ action = gtk_action_group_get_action (action_group,
actions_requiring_account[i]);
g_object_set_property (G_OBJECT(action), "sensitive", &value);
}
@@ -706,7 +705,7 @@
/* Command callbacks */
static void
-gnc_plugin_page_account_tree_cmd_new_account (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_new_account (GtkAction *action, GncPluginPageAccountTree *page)
{
Account *account = gnc_plugin_page_account_tree_get_current_account (page);
@@ -714,13 +713,13 @@
}
static void
-gnc_plugin_page_account_tree_cmd_file_hierarchy_merge (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_file_hierarchy_merge (GtkAction *action, GncPluginPageAccountTree *page)
{
gnc_ui_qof_book_merge_druid();
}
static void
-gnc_plugin_page_account_tree_cmd_open_account (EggAction *action,
+gnc_plugin_page_account_tree_cmd_open_account (GtkAction *action,
GncPluginPageAccountTree *page)
{
GtkWidget *window;
@@ -738,7 +737,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_open_subaccounts (EggAction *action,
+gnc_plugin_page_account_tree_cmd_open_subaccounts (GtkAction *action,
GncPluginPageAccountTree *page)
{
GtkWidget *window;
@@ -756,7 +755,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_edit_account (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_edit_account (GtkAction *action, GncPluginPageAccountTree *page)
{
Account *account;
@@ -806,7 +805,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_delete_account (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_delete_account (GtkAction *action, GncPluginPageAccountTree *page)
{
Account *account = gnc_plugin_page_account_tree_get_current_account (page);
@@ -954,7 +953,7 @@
/*********************/
static void
-gnc_plugin_page_account_tree_cmd_view_options (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_view_options (GtkAction *action, GncPluginPageAccountTree *page)
{
GncPluginPageAccountTreePrivate *priv;
@@ -980,7 +979,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_reconcile (EggAction *action,
+gnc_plugin_page_account_tree_cmd_reconcile (GtkAction *action,
GncPluginPageAccountTree *page)
{
GtkWidget *window;
@@ -996,7 +995,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_transfer (EggAction *action,
+gnc_plugin_page_account_tree_cmd_transfer (GtkAction *action,
GncPluginPageAccountTree *page)
{
GtkWidget *window;
@@ -1008,7 +1007,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_stock_split (EggAction *action,
+gnc_plugin_page_account_tree_cmd_stock_split (GtkAction *action,
GncPluginPageAccountTree *page)
{
GtkWidget *window;
@@ -1020,7 +1019,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_lots (EggAction *action,
+gnc_plugin_page_account_tree_cmd_lots (GtkAction *action,
GncPluginPageAccountTree *page)
{
Account *account;
@@ -1030,7 +1029,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_scrub (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_scrub (GtkAction *action, GncPluginPageAccountTree *page)
{
Account *account = gnc_plugin_page_account_tree_get_current_account (page);
@@ -1045,7 +1044,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_scrub_sub (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_scrub_sub (GtkAction *action, GncPluginPageAccountTree *page)
{
Account *account = gnc_plugin_page_account_tree_get_current_account (page);
@@ -1060,7 +1059,7 @@
}
static void
-gnc_plugin_page_account_tree_cmd_scrub_all (EggAction *action, GncPluginPageAccountTree *page)
+gnc_plugin_page_account_tree_cmd_scrub_all (GtkAction *action, GncPluginPageAccountTree *page)
{
AccountGroup *group = gnc_get_current_group ();
Index: gnc-plugin-file-history.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-file-history.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -Lsrc/gnome/gnc-plugin-file-history.c -Lsrc/gnome/gnc-plugin-file-history.c -u -r1.1.2.5 -r1.1.2.6
--- src/gnome/gnc-plugin-file-history.c
+++ src/gnome/gnc-plugin-file-history.c
@@ -45,14 +45,24 @@
static void gnc_plugin_file_history_add_to_window (GncPlugin *plugin, GncMainWindow *window, GQuark type);
/* Command callbacks */
-static void gnc_plugin_file_history_cmd_open_file (EggAction *action, GncPlugin *plugin);
+static void gnc_plugin_file_history_cmd_open_file (GtkAction *action, GncPlugin *plugin);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-file-history-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-file-history-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "FileOpenRecentAction", N_("Open _Recent"), NULL, NULL, NULL, NULL },
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "FileOpenRecentAction", NULL, N_("Open _Recent"), NULL, NULL, NULL },
+ { "RecentFile0Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile1Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile2Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile3Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile4Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile5Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile6Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile7Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile8Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
+ { "RecentFile9Action", NULL, "", NULL, NULL, G_CALLBACK (gnc_plugin_file_history_cmd_open_file) },
};
static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
@@ -95,17 +105,13 @@
gnc_history_update_menus (GncPlugin *plugin)
{
GncMainWindow *window;
- EggActionGroup *action_group;
- EggAction *action;
+ GtkActionGroup *action_group;
+ GtkAction *action;
gchar action_name[40], *label_name, *old_filename;
const GList *history_list, *tmp;
GValue label = { 0 };
guint i;
- static EggActionEntry new_actions =
- { NULL, "", NULL, NULL, NULL,
- G_CALLBACK (gnc_plugin_file_history_cmd_open_file) };
-
/* Get the history list */
history_list = gnc_history_get_file_list();
if (history_list == NULL)
@@ -121,18 +127,12 @@
for (tmp = history_list, i = 1; tmp; tmp = g_list_next(tmp), i++) {
/* Find or create the action object */
g_sprintf(action_name, "RecentFile%dAction", i % 10);
- action = egg_action_group_get_action (action_group, action_name);
- if (action == NULL) {
- new_actions.name = action_name;
- egg_action_group_add_actions (action_group, &new_actions, 1, plugin);
- action = egg_action_group_get_action (action_group, action_name);
- }
+ action = gtk_action_group_get_action (action_group, action_name);
/* set the menu label (w/accelerator) */
label_name = gnc_history_generate_label(i, tmp->data);
g_value_set_string (&label, label_name);
g_object_set_property (G_OBJECT(action), "label", &label);
- g_value_unset(&label);
g_free(label_name);
/* set the filename for the callback function */
@@ -141,6 +141,7 @@
g_free(old_filename);
g_object_set_data(G_OBJECT(action), FILENAME_STRING, g_strdup(tmp->data));
}
+ g_value_unset(&label);
gnc_main_window_actions_updated (window);
}
@@ -290,12 +291,12 @@
************************************************************/
static void
-gnc_plugin_file_history_cmd_open_file (EggAction *action,
+gnc_plugin_file_history_cmd_open_file (GtkAction *action,
GncPlugin *plugin)
{
gchar *filename;
- g_return_if_fail(EGG_IS_ACTION(action));
+ g_return_if_fail(GTK_IS_ACTION(action));
g_return_if_fail(GNC_IS_PLUGIN(plugin));
filename = g_object_get_data(G_OBJECT(action), FILENAME_STRING);
Index: dialog-sxsincelast.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-sxsincelast.c,v
retrieving revision 1.65.4.8
retrieving revision 1.65.4.9
diff -Lsrc/gnome/dialog-sxsincelast.c -Lsrc/gnome/dialog-sxsincelast.c -u -r1.65.4.8 -r1.65.4.9
--- src/gnome/dialog-sxsincelast.c
+++ src/gnome/dialog-sxsincelast.c
@@ -63,8 +63,6 @@
#include "SX-book.h"
#include "SX-book-p.h"
#include "dialog-utils.h"
-#include "egg-action-group.h"
-#include "eggtoolbar.h"
#include "finvar.h"
#include "gnc-book.h"
#include "gnc-date.h"
@@ -294,7 +292,7 @@
static void create_created_ledger( sxSinceLastData *sxsld );
static void create_to_create_ledger( sxSinceLastData *sxsld );
static void gnc_sxsld_commit_ledgers( sxSinceLastData *sxsld );
-static void sxsld_jump_to_real_txn( EggAction *action, sxSinceLastData *sxsld );
+static void sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld );
static gint sxsincelast_populate( sxSinceLastData *sxsld );
static void sxsincelast_druid_cancelled( GnomeDruid *druid, gpointer ud );
@@ -384,30 +382,30 @@
toCreateInstance *tci );
static gint sxsld_get_future_created_txn_count( sxSinceLastData *sxsld );
-static void gnc_sxsld_cmd_edit_cut (EggAction *action, sxSinceLastData *sxsld);
-static void gnc_sxsld_cmd_edit_copy (EggAction *action, sxSinceLastData *sxsld);
-static void gnc_sxsld_cmd_edit_paste (EggAction *action, sxSinceLastData *sxsld);
+static void gnc_sxsld_cmd_edit_cut (GtkAction *action, sxSinceLastData *sxsld);
+static void gnc_sxsld_cmd_edit_copy (GtkAction *action, sxSinceLastData *sxsld);
+static void gnc_sxsld_cmd_edit_paste (GtkAction *action, sxSinceLastData *sxsld);
-static EggActionEntry gnc_sxsld_menu_entries [] =
+static GtkActionEntry gnc_sxsld_menu_entries [] =
{
/* Toplevel */
- { "EditAction", N_("_Edit"), NULL, NULL, NULL, NULL },
- { "ViewAction", N_("_View"), NULL, NULL, NULL, NULL },
- { "ActionsAction", N_("_Actions"), NULL, NULL, NULL, NULL },
+ { "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
+ { "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
+ { "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
/* Edit menu */
- { "EditCutAction", N_("Cu_t"), GTK_STOCK_CUT, "<control>x",
+ { "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), "<control>x",
NULL,
G_CALLBACK (gnc_sxsld_cmd_edit_cut) },
- { "EditCopyAction", N_("_Copy"), GTK_STOCK_COPY, "<control>c",
+ { "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), "<control>c",
NULL,
G_CALLBACK (gnc_sxsld_cmd_edit_copy) },
- { "EditPasteAction", N_("_Paste"), GTK_STOCK_PASTE, "<control>v",
+ { "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), "<control>v",
NULL,
G_CALLBACK (gnc_sxsld_cmd_edit_paste) },
/* Actions menu */
- { "JumpTransactionAction", N_("_Jump"), GTK_STOCK_JUMP_TO, NULL,
+ { "JumpTransactionAction", GTK_STOCK_JUMP_TO, N_("_Jump"), NULL,
N_("Jump to the corresponding transaction in the other account"),
G_CALLBACK (sxsld_jump_to_real_txn) },
};
@@ -3649,7 +3647,7 @@
static
void
-sxsld_jump_to_real_txn( EggAction *action, sxSinceLastData *sxsld )
+sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld )
{
SplitRegister *reg;
GNCSplitReg *gsr;
@@ -3921,16 +3919,16 @@
/* Command callbacks */
static void
-gnc_sxsld_cmd_edit_cut (EggAction *action, sxSinceLastData *sxsld)
+gnc_sxsld_cmd_edit_cut (GtkAction *action, sxSinceLastData *sxsld)
{
}
static void
-gnc_sxsld_cmd_edit_copy (EggAction *action, sxSinceLastData *sxsld)
+gnc_sxsld_cmd_edit_copy (GtkAction *action, sxSinceLastData *sxsld)
{
}
static void
-gnc_sxsld_cmd_edit_paste (EggAction *action, sxSinceLastData *sxsld)
+gnc_sxsld_cmd_edit_paste (GtkAction *action, sxSinceLastData *sxsld)
{
}
Index: gnc-plugin-page.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin-page.h,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -Lsrc/gnome/gnc-plugin-page.h -Lsrc/gnome/gnc-plugin-page.h -u -r1.1.2.12 -r1.1.2.13
--- src/gnome/gnc-plugin-page.h
+++ src/gnome/gnc-plugin-page.h
@@ -26,7 +26,6 @@
#ifndef __GNC_PLUGIN_PAGE_H
#define __GNC_PLUGIN_PAGE_H
-#include "egg-menu-merge.h"
#include "guid.h"
#include "qofbook.h"
@@ -73,8 +72,8 @@
GtkWidget *(* create_widget) (GncPluginPage *plugin_page);
void (* destroy_widget) (GncPluginPage *plugin_page);
- void (* merge_actions) (GncPluginPage *plugin_page, EggMenuMerge *merge);
- void (* unmerge_actions) (GncPluginPage *plugin_page, EggMenuMerge *merge);
+ void (* merge_actions) (GncPluginPage *plugin_page, GtkUIManager *merge);
+ void (* unmerge_actions) (GncPluginPage *plugin_page, GtkUIManager *merge);
} GncPluginPageClass;
/* function prototypes */
@@ -84,9 +83,9 @@
void gnc_plugin_page_destroy_widget (GncPluginPage *plugin_page);
void gnc_plugin_page_merge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *merge);
+ GtkUIManager *merge);
void gnc_plugin_page_unmerge_actions (GncPluginPage *plugin_page,
- EggMenuMerge *merge);
+ GtkUIManager *merge);
const gchar * gnc_plugin_page_get_name (GncPluginPage *plugin_page);
Index: dialog-scheduledxaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-scheduledxaction.c,v
retrieving revision 1.71.2.10
retrieving revision 1.71.2.11
diff -Lsrc/gnome/dialog-scheduledxaction.c -Lsrc/gnome/dialog-scheduledxaction.c -u -r1.71.2.10 -r1.71.2.11
--- src/gnome/dialog-scheduledxaction.c
+++ src/gnome/dialog-scheduledxaction.c
@@ -33,8 +33,6 @@
#include "SX-book-p.h"
#include "dialog-scheduledxaction.h"
#include "dialog-utils.h"
-#include "egg-action-group.h"
-#include "eggtoolbar.h"
#include "gnc-book.h"
#include "gnc-component-manager.h"
#include "gnc-date.h"
@@ -230,25 +228,25 @@
static void _clear_runtime_info_row( gpointer key, gpointer value, gpointer user_data );
-static void gnc_sxed_cmd_edit_cut (EggAction *action, SchedXactionEditorDialog *sxed);
-static void gnc_sxed_cmd_edit_copy (EggAction *action, SchedXactionEditorDialog *sxed);
-static void gnc_sxed_cmd_edit_paste (EggAction *action, SchedXactionEditorDialog *sxed);
+static void gnc_sxed_cmd_edit_cut (GtkAction *action, SchedXactionEditorDialog *sxed);
+static void gnc_sxed_cmd_edit_copy (GtkAction *action, SchedXactionEditorDialog *sxed);
+static void gnc_sxed_cmd_edit_paste (GtkAction *action, SchedXactionEditorDialog *sxed);
-static EggActionEntry gnc_sxed_menu_entries [] =
+static GtkActionEntry gnc_sxed_menu_entries [] =
{
/* Toplevel */
- { "EditAction", N_("_Edit"), NULL, NULL, NULL, NULL },
- { "ViewAction", N_("_View"), NULL, NULL, NULL, NULL },
- { "ActionsAction", N_("_Actions"), NULL, NULL, NULL, NULL },
+ { "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
+ { "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
+ { "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
/* Edit menu */
- { "EditCutAction", N_("Cu_t"), GTK_STOCK_CUT, "<control>x",
+ { "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), "<control>x",
NULL,
G_CALLBACK (gnc_sxed_cmd_edit_cut) },
- { "EditCopyAction", N_("_Copy"), GTK_STOCK_COPY, "<control>c",
+ { "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), "<control>c",
NULL,
G_CALLBACK (gnc_sxed_cmd_edit_copy) },
- { "EditPasteAction", N_("_Paste"), GTK_STOCK_PASTE, "<control>v",
+ { "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), "<control>v",
NULL,
G_CALLBACK (gnc_sxed_cmd_edit_paste) },
@@ -2467,17 +2465,17 @@
/* Command callbacks */
static void
-gnc_sxed_cmd_edit_cut (EggAction *action, SchedXactionEditorDialog *sxed)
+gnc_sxed_cmd_edit_cut (GtkAction *action, SchedXactionEditorDialog *sxed)
{
}
static void
-gnc_sxed_cmd_edit_copy (EggAction *action, SchedXactionEditorDialog *sxed)
+gnc_sxed_cmd_edit_copy (GtkAction *action, SchedXactionEditorDialog *sxed)
{
}
static void
-gnc_sxed_cmd_edit_paste (EggAction *action, SchedXactionEditorDialog *sxed)
+gnc_sxed_cmd_edit_paste (GtkAction *action, SchedXactionEditorDialog *sxed)
{
}
Index: gnc-plugin-ofx.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/ofx/Attic/gnc-plugin-ofx.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/ofx/gnc-plugin-ofx.c -Lsrc/import-export/ofx/gnc-plugin-ofx.c -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/ofx/gnc-plugin-ofx.c
+++ src/import-export/ofx/gnc-plugin-ofx.c
@@ -35,14 +35,14 @@
static void gnc_plugin_ofx_finalize (GObject *object);
/* Command callbacks */
-static void gnc_plugin_ofx_cmd_import (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_ofx_cmd_import (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-ofx-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-ofx-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "OfxImportAction", N_("Import OFX/QFX"), GTK_STOCK_CONVERT, NULL,
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "OfxImportAction", GTK_STOCK_CONVERT, N_("Import OFX/QFX"), NULL,
N_("Process an OFX/QFX response file"),
G_CALLBACK (gnc_plugin_ofx_cmd_import) },
};
@@ -162,7 +162,7 @@
************************************************************/
static void
-gnc_plugin_ofx_cmd_import (EggAction *action,
+gnc_plugin_ofx_cmd_import (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_file_ofx_import ();
Index: gnc-plugin-log-replay.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/log-replay/Attic/gnc-plugin-log-replay.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/log-replay/gnc-plugin-log-replay.c -Lsrc/import-export/log-replay/gnc-plugin-log-replay.c -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/log-replay/gnc-plugin-log-replay.c
+++ src/import-export/log-replay/gnc-plugin-log-replay.c
@@ -35,14 +35,14 @@
static void gnc_plugin_log_replay_finalize (GObject *object);
/* Command callbacks */
-static void gnc_plugin_log_replay_cmd_new_log_replay (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_log_replay_cmd_new_log_replay (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-log-replay-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-log-replay-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "LogReplayAction", N_("_Replay GnuCash .log file"), GTK_STOCK_CONVERT, NULL,
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "LogReplayAction", GTK_STOCK_CONVERT, N_("_Replay GnuCash .log file"), NULL,
N_("Replay a gnucash log file after a crash. This cannot be undone."),
G_CALLBACK (gnc_plugin_log_replay_cmd_new_log_replay) },
};
@@ -162,7 +162,7 @@
************************************************************/
static void
-gnc_plugin_log_replay_cmd_new_log_replay (EggAction *action,
+gnc_plugin_log_replay_cmd_new_log_replay (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_file_log_replay ();
Index: gnc-plugin-page-report.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/Attic/gnc-plugin-page-report.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/report/report-gnome/gnc-plugin-page-report.c -Lsrc/report/report-gnome/gnc-plugin-page-report.c -u -r1.1.2.6 -r1.1.2.7
--- src/report/report-gnome/gnc-plugin-page-report.c
+++ src/report/report-gnome/gnc-plugin-page-report.c
@@ -34,7 +34,6 @@
#include <libguile.h>
#include <sys/stat.h>
-#include "egg-menu-merge.h"
#include "gnc-component-manager.h"
#include "gnc-engine-util.h"
#include "gnc-gnome-utils.h"
@@ -69,8 +68,8 @@
static GtkWidget* gnc_plugin_page_report_create_widget( GncPluginPage *plugin_page );
static void gnc_plugin_page_report_destroy_widget( GncPluginPage *plugin_page );
-static void gnc_plugin_page_report_merge_actions( GncPluginPage *plugin_page, EggMenuMerge *merge );
-static void gnc_plugin_page_report_unmerge_actions( GncPluginPage *plugin_page, EggMenuMerge *merge );
+static void gnc_plugin_page_report_merge_actions( GncPluginPage *plugin_page, GtkUIManager *merge );
+static void gnc_plugin_page_report_unmerge_actions( GncPluginPage *plugin_page, GtkUIManager *merge );
static void gnc_plugin_page_report_destroy_widget( GncPluginPage *plugin_page );
static int gnc_plugin_page_report_check_urltype(URLType t);
@@ -90,13 +89,13 @@
void gnc_plugin_page_report_add_edited_report(GncPluginPageReportPrivate * win, SCM report);
void gnc_plugin_page_report_raise_editor(SCM report);
-static void gnc_plugin_page_report_forw_cb(EggAction *action, GncPluginPageReport *rep);
-static void gnc_plugin_page_report_back_cb(EggAction *action, GncPluginPageReport *rep);
-static void gnc_plugin_page_report_reload_cb(EggAction *action, GncPluginPageReport *rep);
-static void gnc_plugin_page_report_stop_cb(EggAction *action, GncPluginPageReport *rep);
-static void gnc_plugin_page_report_export_cb(EggAction *action, GncPluginPageReport *rep);
-static void gnc_plugin_page_report_options_cb(EggAction *action, GncPluginPageReport *rep);
-static void gnc_plugin_page_report_print_cb(EggAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_forw_cb(GtkAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_back_cb(GtkAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_reload_cb(GtkAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_stop_cb(GtkAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_export_cb(GtkAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_options_cb(GtkAction *action, GncPluginPageReport *rep);
+static void gnc_plugin_page_report_print_cb(GtkAction *action, GncPluginPageReport *rep);
struct GncPluginPageReportPrivate
{
@@ -127,10 +126,10 @@
/// the container the above HTML widget is in.
GtkContainer *container;
- /// The EggActionGroup to use for [un]merging our UI.
- EggActionGroup *action_group;
+ /// The GtkActionGroup to use for [un]merging our UI.
+ GtkActionGroup *action_group;
- EggMenuMerge *ui_merge;
+ GtkUIManager *ui_merge;
gint merge_id;
};
@@ -607,7 +606,7 @@
static
void
gnc_plugin_page_report_merge_actions( GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge )
+ GtkUIManager *ui_merge )
{
GncPluginPageReport *page;
GncPluginPageReportPrivate *priv;
@@ -627,35 +626,35 @@
static
void
gnc_plugin_page_report_unmerge_actions( GncPluginPage *plugin_page,
- EggMenuMerge *ui_merge )
+ GtkUIManager *ui_merge )
{
GncPluginPageReport *rep = GNC_PLUGIN_PAGE_REPORT( plugin_page );
GncPluginPageReportPrivate *priv = (GncPluginPageReportPrivate*)rep->priv;
DEBUG( "unmerge actions" );
- egg_menu_merge_remove_ui( ui_merge, priv->merge_id );
- egg_menu_merge_remove_action_group( ui_merge, priv->action_group );
+ gtk_ui_manager_remove_ui( ui_merge, priv->merge_id );
+ gtk_ui_manager_remove_action_group( ui_merge, priv->action_group );
priv->ui_merge = NULL;
DEBUG( "done unmerging" );
}
-static EggActionEntry report_actions[] =
+static GtkActionEntry report_actions[] =
{
- { "ReportBackAction", N_("Back"), GTK_STOCK_GO_BACK, NULL, NULL,
+ { "ReportBackAction", GTK_STOCK_GO_BACK, N_("Back"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_back_cb) },
- { "ReportForwAction", N_("Forward"), GTK_STOCK_GO_FORWARD, NULL, NULL,
+ { "ReportForwAction", GTK_STOCK_GO_FORWARD, N_("Forward"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_forw_cb) },
- { "ReportReloadAction", N_("Reload"), GTK_STOCK_REFRESH, NULL, NULL,
+ { "ReportReloadAction", GTK_STOCK_REFRESH, N_("Reload"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_reload_cb) },
- { "ReportStopAction", N_("Stop"), GTK_STOCK_STOP, NULL, NULL,
+ { "ReportStopAction", GTK_STOCK_STOP, N_("Stop"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_stop_cb) },
- { "ReportExportAction", N_("Export"), GTK_STOCK_SAVE, NULL, NULL,
+ { "ReportExportAction", GTK_STOCK_SAVE, N_("Export"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_export_cb) },
- { "ReportOptionsAction", N_("Options"), GTK_STOCK_PROPERTIES, NULL, NULL,
+ { "ReportOptionsAction", GTK_STOCK_PROPERTIES, N_("Options"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_options_cb) },
- { "ReportPrintAction", N_("Print"), GTK_STOCK_PRINT, NULL, NULL,
+ { "ReportPrintAction", GTK_STOCK_PRINT, N_("Print"), NULL, NULL,
G_CALLBACK(gnc_plugin_page_report_print_cb) },
};
static guint num_report_actions = G_N_ELEMENTS( report_actions );
@@ -663,7 +662,7 @@
static void
gnc_plugin_page_report_init ( GncPluginPageReport *plugin_page )
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
GncPluginPageReportPrivate *priv;
GncPluginPage *parent;
GString *tmpStr;
@@ -693,9 +692,9 @@
/* Note that we're not actually doing the merge, here ... just setup
* the UI objects. See gnc_plugin_page_report_[un]merge_actions(...) */
- action_group = egg_action_group_new ("GncPluginPageReportActions");
+ action_group = gtk_action_group_new ("GncPluginPageReportActions");
priv->action_group = action_group;
- egg_action_group_add_actions( action_group,
+ gtk_action_group_add_actions( action_group,
report_actions,
num_report_actions,
plugin_page );
@@ -753,9 +752,9 @@
gnc_plugin_page_report_set_fwd_button(GncPluginPageReportPrivate *win, int enabled)
{
GValue value = { 0 };
- EggAction *act;
+ GtkAction *act;
- act = egg_action_group_get_action( win->action_group, "ReportForwAction" );
+ act = gtk_action_group_get_action( win->action_group, "ReportForwAction" );
g_value_init (&value, G_TYPE_BOOLEAN);
g_value_set_boolean (&value, enabled);
g_object_set_property( G_OBJECT(act), "sensitive", &value );
@@ -765,9 +764,9 @@
gnc_plugin_page_report_set_back_button(GncPluginPageReportPrivate *win, int enabled)
{
GValue value = { 0 };
- EggAction *act;
+ GtkAction *act;
- act = egg_action_group_get_action( win->action_group, "ReportBackAction" );
+ act = gtk_action_group_get_action( win->action_group, "ReportBackAction" );
g_value_init (&value, G_TYPE_BOOLEAN);
g_value_set_boolean (&value, enabled);
g_object_set_property( G_OBJECT(act), "sensitive", &value );
@@ -777,7 +776,7 @@
// GTK ACTION CALLBACKS
static void
-gnc_plugin_page_report_forw_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_forw_cb( GtkAction *action, GncPluginPageReport *report )
{
gnc_html_history_node * node = NULL;
@@ -791,7 +790,7 @@
}
static void
-gnc_plugin_page_report_back_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_back_cb( GtkAction *action, GncPluginPageReport *report )
{
gnc_html_history_node * node;
@@ -805,7 +804,7 @@
}
static void
-gnc_plugin_page_report_reload_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_reload_cb( GtkAction *action, GncPluginPageReport *report )
{
SCM dirty_report;
@@ -828,7 +827,7 @@
}
static void
-gnc_plugin_page_report_stop_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_stop_cb( GtkAction *action, GncPluginPageReport *report )
{
gnc_html_cancel(report->priv->html);
}
@@ -970,7 +969,7 @@
}
static void
-gnc_plugin_page_report_export_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_export_cb( GtkAction *action, GncPluginPageReport *report )
{
GncPluginPageReportPrivate *priv = report->priv;
char * filepath;
@@ -1025,7 +1024,7 @@
}
static void
-gnc_plugin_page_report_options_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_options_cb( GtkAction *action, GncPluginPageReport *report )
{
GncPluginPageReportPrivate *priv = report->priv;
SCM start_editor = scm_c_eval_string("gnc:report-edit-options");
@@ -1043,7 +1042,7 @@
}
static void
-gnc_plugin_page_report_print_cb( EggAction *action, GncPluginPageReport *report )
+gnc_plugin_page_report_print_cb( GtkAction *action, GncPluginPageReport *report )
{
gnc_html_print(report->priv->html);
}
Index: gnc-plugin-business.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/Attic/gnc-plugin-business.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lsrc/business/business-gnome/gnc-plugin-business.c -Lsrc/business/business-gnome/gnc-plugin-business.c -u -r1.1.2.8 -r1.1.2.9
--- src/business/business-gnome/gnc-plugin-business.c
+++ src/business/business-gnome/gnc-plugin-business.c
@@ -48,164 +48,164 @@
static void gnc_plugin_business_finalize (GObject *object);
/* Command callbacks */
-static void gnc_plugin_business_cmd_customer_new_customer (EggAction *action,
+static void gnc_plugin_business_cmd_customer_new_customer (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_customer_find_customer (EggAction *action,
+static void gnc_plugin_business_cmd_customer_find_customer (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_customer_new_invoice (EggAction *action,
+static void gnc_plugin_business_cmd_customer_new_invoice (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_customer_find_invoice (EggAction *action,
+static void gnc_plugin_business_cmd_customer_find_invoice (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_customer_new_job (EggAction *action,
+static void gnc_plugin_business_cmd_customer_new_job (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_customer_find_job (EggAction *action,
+static void gnc_plugin_business_cmd_customer_find_job (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_customer_process_payment (EggAction *action,
+static void gnc_plugin_business_cmd_customer_process_payment (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_new_vendor (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_new_vendor (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_find_vendor (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_find_vendor (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_new_bill (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_new_bill (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_find_bill (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_find_bill (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_new_job (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_new_job (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_find_job (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_find_job (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_vendor_process_payment (EggAction *action,
+static void gnc_plugin_business_cmd_vendor_process_payment (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_employee_new_employee (EggAction *action,
+static void gnc_plugin_business_cmd_employee_new_employee (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_employee_find_employee (EggAction *action,
+static void gnc_plugin_business_cmd_employee_find_employee (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_employee_new_expense_voucher (EggAction *action,
+static void gnc_plugin_business_cmd_employee_new_expense_voucher (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_employee_find_expense_voucher (EggAction *action,
+static void gnc_plugin_business_cmd_employee_find_expense_voucher (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_employee_process_payment (EggAction *action,
+static void gnc_plugin_business_cmd_employee_process_payment (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_tax_tables (EggAction *action,
+static void gnc_plugin_business_cmd_tax_tables (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_billing_terms (EggAction *action,
+static void gnc_plugin_business_cmd_billing_terms (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_bills_due_reminder (EggAction *action,
+static void gnc_plugin_business_cmd_bills_due_reminder (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_export_invoice (EggAction *action,
+static void gnc_plugin_business_cmd_export_invoice (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_export_customer (EggAction *action,
+static void gnc_plugin_business_cmd_export_customer (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_export_vendor (EggAction *action,
+static void gnc_plugin_business_cmd_export_vendor (GtkAction *action,
GncMainWindowActionData *data);
-static void gnc_plugin_business_cmd_export_employee (EggAction *action,
+static void gnc_plugin_business_cmd_export_employee (GtkAction *action,
GncMainWindowActionData *data);
-/*static void gnc_plugin_business_cmd_export_report (EggAction *action,
+/*static void gnc_plugin_business_cmd_export_report (GtkAction *action,
GncMainWindowActionData *data);*/
#define PLUGIN_ACTIONS_NAME "gnc-plugin-business-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-business-ui.xml"
-static EggActionEntry gnc_plugin_actions [] =
+static GtkActionEntry gnc_plugin_actions [] =
{
/* Toplevel */
- { "BusinessAction", N_("_Business"), NULL, NULL, NULL, NULL },
+ { "BusinessAction", NULL, N_("_Business"), NULL, NULL, NULL },
/* Customer submenu */
- { "CustomerMenuAction", N_("_Customer"), NULL, NULL, NULL, NULL },
- { "CustomerNewCustomerOpenAction", N_("New Customer"), NULL, NULL,
+ { "CustomerMenuAction", NULL, N_("_Customer"), NULL, NULL, NULL },
+ { "CustomerNewCustomerOpenAction", NULL, N_("New Customer"), NULL,
N_("Open the New Customer dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_new_customer) },
- { "CustomerFindCustomerOpenAction", N_("Find Customer"), NULL, NULL,
+ { "CustomerFindCustomerOpenAction", NULL, N_("Find Customer"), NULL,
N_("Open the Find Customer dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_find_customer) },
- { "CustomerNewInvoiceOpenAction", N_("New Invoice"), NULL, NULL,
+ { "CustomerNewInvoiceOpenAction", NULL, N_("New Invoice"), NULL,
N_("Open the New Invoice dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_new_invoice) },
- { "CustomerFindInvoiceOpenAction", N_("Find Invoice"), NULL, NULL,
+ { "CustomerFindInvoiceOpenAction", NULL, N_("Find Invoice"), NULL,
N_("Open the Find Invoice dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_find_invoice) },
- { "CustomerNewJobOpenAction", N_("New Job"), NULL, NULL,
+ { "CustomerNewJobOpenAction", NULL, N_("New Job"), NULL,
N_("Open the New Job dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_new_job) },
- { "CustomerFindJobOpenAction", N_("Find Job"), NULL, NULL,
+ { "CustomerFindJobOpenAction", NULL, N_("Find Job"), NULL,
N_("Open the Find Job dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_find_job) },
- { "CustomerProcessPaymentAction", N_("Process Payment"), NULL, NULL,
+ { "CustomerProcessPaymentAction", NULL, N_("Process Payment"), NULL,
N_("Open the Process Payment dialog"),
G_CALLBACK (gnc_plugin_business_cmd_customer_process_payment) },
/* Vendor submenu */
- { "VendorMenuAction", N_("_Vendor"), NULL, NULL, NULL, NULL },
- { "VendorNewVendorOpenAction", N_("New Vendor"), NULL, NULL,
+ { "VendorMenuAction", NULL, N_("_Vendor"), NULL, NULL, NULL },
+ { "VendorNewVendorOpenAction", NULL, N_("New Vendor"), NULL,
N_("Open the New Vendor dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_new_vendor) },
- { "VendorFindVendorOpenAction", N_("Find Vendor"), NULL, NULL,
+ { "VendorFindVendorOpenAction", NULL, N_("Find Vendor"), NULL,
N_("Open the Find Vendor dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_find_vendor) },
- { "VendorNewBillOpenAction", N_("New Bill"), NULL, NULL,
+ { "VendorNewBillOpenAction", NULL, N_("New Bill"), NULL,
N_("Open the New Bill dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_new_bill) },
- { "VendorFindBillOpenAction", N_("Find Bill"), NULL, NULL,
+ { "VendorFindBillOpenAction", NULL, N_("Find Bill"), NULL,
N_("Open the Find Bill dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_find_bill) },
- { "VendorNewJobOpenAction", N_("New Job"), NULL, NULL,
+ { "VendorNewJobOpenAction", NULL, N_("New Job"), NULL,
N_("Open the New Job dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_new_job) },
- { "VendorFindJobOpenAction", N_("Find Job"), NULL, NULL,
+ { "VendorFindJobOpenAction", NULL, N_("Find Job"), NULL,
N_("Open the Find Job dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_find_job) },
- { "VendorProcessPaymentAction", N_("Process Payment"), NULL, NULL,
+ { "VendorProcessPaymentAction", NULL, N_("Process Payment"), NULL,
N_("Open the Process Payment dialog"),
G_CALLBACK (gnc_plugin_business_cmd_vendor_process_payment) },
/* Employee submenu */
- { "EmployeeMenuAction", N_("_Employee"), NULL, NULL, NULL, NULL },
- { "EmployeeNewEmployeeOpenAction", N_("New Employee"), NULL, NULL,
+ { "EmployeeMenuAction", NULL, N_("_Employee"), NULL, NULL, NULL },
+ { "EmployeeNewEmployeeOpenAction", NULL, N_("New Employee"), NULL,
N_("Open the New Employee dialog"),
G_CALLBACK (gnc_plugin_business_cmd_employee_new_employee) },
- { "EmployeeFindEmployeeOpenAction", N_("Find Employee"), NULL, NULL,
+ { "EmployeeFindEmployeeOpenAction", NULL, N_("Find Employee"), NULL,
N_("Open the Find Employee dialog"),
G_CALLBACK (gnc_plugin_business_cmd_employee_find_employee) },
- { "EmployeeNewExpenseVoucherOpenAction", N_("New Expense Voucher"), NULL, NULL,
+ { "EmployeeNewExpenseVoucherOpenAction", NULL, N_("New Expense Voucher"), NULL,
N_("Open the New Expense Voucher dialog"),
G_CALLBACK (gnc_plugin_business_cmd_employee_new_expense_voucher) },
- { "EmployeeFindExpenseVoucherOpenAction", N_("Find Expense Voucher"), NULL, NULL,
+ { "EmployeeFindExpenseVoucherOpenAction", NULL, N_("Find Expense Voucher"), NULL,
N_("Open the Find Expense Voucher dialog"),
G_CALLBACK (gnc_plugin_business_cmd_employee_find_expense_voucher) },
- { "EmployeeProcessPaymentAction", N_("Process Payment"), NULL, NULL,
+ { "EmployeeProcessPaymentAction", NULL, N_("Process Payment"), NULL,
N_("Open the Process Payment dialog"),
G_CALLBACK (gnc_plugin_business_cmd_employee_process_payment) },
/* Other menu items */
- { "TaxTablesOpenAction", N_("Tax Tables"), NULL, NULL,
+ { "TaxTablesOpenAction", NULL, N_("Tax Tables"), NULL,
N_("Open the Tax Tables dialog"),
G_CALLBACK (gnc_plugin_business_cmd_tax_tables) },
- { "BillingTermsOpenAction", N_("Billing Terms"), NULL, NULL,
+ { "BillingTermsOpenAction", NULL, N_("Billing Terms"), NULL,
N_("Open the Billing Terms dialog"),
G_CALLBACK (gnc_plugin_business_cmd_billing_terms) },
- { "BillsDueReminderOpenAction", N_("Bills Due Reminder"), NULL, NULL,
+ { "BillsDueReminderOpenAction", NULL, N_("Bills Due Reminder"), NULL,
N_("Open the Bills Due Reminder dialog"),
G_CALLBACK (gnc_plugin_business_cmd_bills_due_reminder) },
- { "ExportMenuAction", N_("E_xport"), NULL, NULL, NULL, NULL },
- { "QSFInvoiceAction", N_("QSF _Invoice"), NULL, NULL,
+ { "ExportMenuAction", NULL, N_("E_xport"), NULL, NULL, NULL },
+ { "QSFInvoiceAction", NULL, N_("QSF _Invoice"), NULL,
N_("Export one or more invoices to QSF"),
G_CALLBACK (gnc_plugin_business_cmd_export_invoice) },
- { "QSFCustomerAction", N_("QSF _Customer"), NULL, NULL,
+ { "QSFCustomerAction", NULL, N_("QSF _Customer"), NULL,
N_("Export one or more customers to QSF"),
G_CALLBACK (gnc_plugin_business_cmd_export_customer) },
- { "QSFVendorAction", N_("QSF _Vendor"), NULL, NULL,
+ { "QSFVendorAction", NULL, N_("QSF _Vendor"), NULL,
N_("Export one or more vendors to QSF"),
G_CALLBACK (gnc_plugin_business_cmd_export_vendor) },
- { "QSFEmployeeAction", N_("QSF _Employee"), NULL, NULL,
+ { "QSFEmployeeAction", NULL, N_("QSF _Employee"), NULL,
N_("Export one or more employees to QSF"),
G_CALLBACK (gnc_plugin_business_cmd_export_employee) },
};
@@ -320,7 +320,7 @@
************************************************************/
static void
-gnc_plugin_business_cmd_customer_new_customer (EggAction *action,
+gnc_plugin_business_cmd_customer_new_customer (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -333,7 +333,7 @@
}
static void
-gnc_plugin_business_cmd_customer_find_customer (EggAction *action,
+gnc_plugin_business_cmd_customer_find_customer (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -348,7 +348,7 @@
}
static void
-gnc_plugin_business_cmd_customer_new_invoice (EggAction *action,
+gnc_plugin_business_cmd_customer_new_invoice (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -361,7 +361,7 @@
}
static void
-gnc_plugin_business_cmd_customer_find_invoice (EggAction *action,
+gnc_plugin_business_cmd_customer_find_invoice (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -374,7 +374,7 @@
}
static void
-gnc_plugin_business_cmd_customer_new_job (EggAction *action,
+gnc_plugin_business_cmd_customer_new_job (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -387,7 +387,7 @@
}
static void
-gnc_plugin_business_cmd_customer_find_job (EggAction *action,
+gnc_plugin_business_cmd_customer_find_job (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -400,7 +400,7 @@
}
static void
-gnc_plugin_business_cmd_customer_process_payment (EggAction *action,
+gnc_plugin_business_cmd_customer_process_payment (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -413,7 +413,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_new_vendor (EggAction *action,
+gnc_plugin_business_cmd_vendor_new_vendor (GtkAction *action,
GncMainWindowActionData *mw)
{
g_return_if_fail (mw != NULL);
@@ -423,7 +423,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_find_vendor (EggAction *action,
+gnc_plugin_business_cmd_vendor_find_vendor (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -438,7 +438,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_new_bill (EggAction *action,
+gnc_plugin_business_cmd_vendor_new_bill (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -451,7 +451,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_find_bill (EggAction *action,
+gnc_plugin_business_cmd_vendor_find_bill (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -464,7 +464,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_new_job (EggAction *action,
+gnc_plugin_business_cmd_vendor_new_job (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -477,7 +477,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_find_job (EggAction *action,
+gnc_plugin_business_cmd_vendor_find_job (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -490,7 +490,7 @@
}
static void
-gnc_plugin_business_cmd_vendor_process_payment (EggAction *action,
+gnc_plugin_business_cmd_vendor_process_payment (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -503,7 +503,7 @@
}
static void
-gnc_plugin_business_cmd_employee_new_employee (EggAction *action,
+gnc_plugin_business_cmd_employee_new_employee (GtkAction *action,
GncMainWindowActionData *mw)
{
g_return_if_fail (mw != NULL);
@@ -513,7 +513,7 @@
}
static void
-gnc_plugin_business_cmd_employee_find_employee (EggAction *action,
+gnc_plugin_business_cmd_employee_find_employee (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -528,7 +528,7 @@
}
static void
-gnc_plugin_business_cmd_employee_new_expense_voucher (EggAction *action,
+gnc_plugin_business_cmd_employee_new_expense_voucher (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -541,7 +541,7 @@
}
static void
-gnc_plugin_business_cmd_employee_find_expense_voucher (EggAction *action,
+gnc_plugin_business_cmd_employee_find_expense_voucher (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -554,7 +554,7 @@
}
static void
-gnc_plugin_business_cmd_employee_process_payment (EggAction *action,
+gnc_plugin_business_cmd_employee_process_payment (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -567,7 +567,7 @@
}
static void
-gnc_plugin_business_cmd_tax_tables (EggAction *action,
+gnc_plugin_business_cmd_tax_tables (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -580,7 +580,7 @@
}
static void
-gnc_plugin_business_cmd_billing_terms (EggAction *action,
+gnc_plugin_business_cmd_billing_terms (GtkAction *action,
GncMainWindowActionData *mw)
{
GncPluginBusinessPrivate *priv;
@@ -593,7 +593,7 @@
}
static void
-gnc_plugin_business_cmd_bills_due_reminder (EggAction *action,
+gnc_plugin_business_cmd_bills_due_reminder (GtkAction *action,
GncMainWindowActionData *mw)
{
#if 0
@@ -612,7 +612,7 @@
**************************************************************/
static void
-gnc_plugin_business_cmd_export_invoice (EggAction *action, GncMainWindowActionData *mw)
+gnc_plugin_business_cmd_export_invoice (GtkAction *action, GncMainWindowActionData *mw)
{
QofSession *current_session, *chart_session;
QofBook *book;
@@ -642,7 +642,7 @@
}
static void
-gnc_plugin_business_cmd_export_customer (EggAction *action, GncMainWindowActionData *mw)
+gnc_plugin_business_cmd_export_customer (GtkAction *action, GncMainWindowActionData *mw)
{
QofSession *current_session, *chart_session;
QofBook *book;
@@ -672,7 +672,7 @@
}
static void
-gnc_plugin_business_cmd_export_vendor (EggAction *action, GncMainWindowActionData *mw)
+gnc_plugin_business_cmd_export_vendor (GtkAction *action, GncMainWindowActionData *mw)
{
QofSession *current_session, *chart_session;
QofBook *book;
@@ -702,7 +702,7 @@
}
static void
-gnc_plugin_business_cmd_export_employee (EggAction *action, GncMainWindowActionData *mw)
+gnc_plugin_business_cmd_export_employee (GtkAction *action, GncMainWindowActionData *mw)
{
QofSession *current_session, *chart_session;
QofBook *book;
Index: gnc-plugin-mt940.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/mt940/Attic/gnc-plugin-mt940.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/mt940/gnc-plugin-mt940.c -Lsrc/import-export/mt940/gnc-plugin-mt940.c -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/mt940/gnc-plugin-mt940.c
+++ src/import-export/mt940/gnc-plugin-mt940.c
@@ -35,14 +35,14 @@
static void gnc_plugin_mt940_finalize (GObject *object);
/* Command callbacks */
-static void gnc_plugin_mt940_cmd_import (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_mt940_cmd_import (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-mt940-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-mt940-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
- { "Mt940ImportAction", N_("Import MT940"), GTK_STOCK_CONVERT, NULL,
+static GtkActionEntry gnc_plugin_actions [] = {
+ { "Mt940ImportAction", GTK_STOCK_CONVERT, N_("Import MT940"), NULL,
N_("Process an MT940 response file"),
G_CALLBACK (gnc_plugin_mt940_cmd_import) },
};
@@ -162,7 +162,7 @@
************************************************************/
static void
-gnc_plugin_mt940_cmd_import (EggAction *action,
+gnc_plugin_mt940_cmd_import (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_file_mt940_import ();
Index: gnc-tree-view-account.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-account.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -Lsrc/gnome-utils/gnc-tree-view-account.c -Lsrc/gnome-utils/gnc-tree-view-account.c -u -r1.1.2.14 -r1.1.2.15
--- src/gnome-utils/gnc-tree-view-account.c
+++ src/gnome-utils/gnc-tree-view-account.c
@@ -246,17 +246,17 @@
Account *account;
gnc_numeric balance_a, balance_b;
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
/* Get balance 1 */
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
f_iter_a);
account = gnc_tree_model_account_get_account (GNC_TREE_MODEL_ACCOUNT(model), &iter);
balance_a = gnc_ui_account_get_balance_full(fn, account, recurse, NULL, NULL);
/* Get balance 2 */
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
f_iter_b);
account = gnc_tree_model_account_get_account (GNC_TREE_MODEL_ACCOUNT(model), &iter);
@@ -336,17 +336,17 @@
Account *account;
gboolean flag_a, flag_b;
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
/* Get balance 1 */
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
f_iter_a);
account = gnc_tree_model_account_get_account (GNC_TREE_MODEL_ACCOUNT(model), &iter);
flag_a = xaccAccountGetPlaceholder(account);
/* Get balance 2 */
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
f_iter_b);
account = gnc_tree_model_account_get_account (GNC_TREE_MODEL_ACCOUNT(model), &iter);
@@ -389,7 +389,7 @@
/* Set up the view private filter layer on the common model. */
if (!show_root)
virtual_root_path = gtk_tree_path_new_first ();
- f_model = egg_tree_model_filter_new (model, virtual_root_path);
+ f_model = gtk_tree_model_filter_new (model, virtual_root_path);
gtk_object_sink(GTK_OBJECT(model));
if (virtual_root_path)
gtk_tree_path_free(virtual_root_path);
@@ -455,7 +455,7 @@
/* Reach down to the real model and get a path for this account */
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
path = gnc_tree_model_account_get_path_from_account (GNC_TREE_MODEL_ACCOUNT(model), account);
if (path == NULL) {
LEAVE("no path");
@@ -463,7 +463,7 @@
}
/* convert back to a filtered path */
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model), path);
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model), path);
gtk_tree_path_free(path);
if (!f_path) {
LEAVE("no filter path");
@@ -471,7 +471,7 @@
}
/* convert back to a sorted path */
- s_path = egg_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_SORT (s_model), f_path);
+ s_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_SORT (s_model), f_path);
gtk_tree_path_free(f_path);
debug_path(LEAVE, s_path);
return s_path;
@@ -495,14 +495,14 @@
/* Reach down to the real model and get an iter for this account */
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
if (!gnc_tree_model_account_get_iter_from_account (GNC_TREE_MODEL_ACCOUNT(model), account, &iter)) {
LEAVE("model_get_iter_from_account failed");
return FALSE;
}
/* convert back to a sort iter */
- egg_tree_model_filter_convert_child_iter_to_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER(f_model),
&f_iter, &iter);
gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT(s_model),
s_iter, &f_iter);
@@ -556,10 +556,10 @@
&f_iter,
s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
&f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
account = gnc_tree_model_account_get_account (GNC_TREE_MODEL_ACCOUNT(model), &iter);
LEAVE("account %p (%s)", account, xaccAccountGetName (account));
return account;
@@ -664,7 +664,7 @@
* This function does not do anything with the 'include_type' field.
* Should there be a automatic filter for backward compatability
* that uses these flags, or should all uses of this be converted to
- * a eggtreemodelfilter?
+ * a GtkTreeModelFilter?
*/
void
gnc_tree_view_account_set_view_info (GncTreeViewAccount *account_view,
@@ -719,7 +719,7 @@
}
/*
- * Set an eggtreemodel visible filter on this account. This filter will be
+ * Set an GtkTreeModel visible filter on this account. This filter will be
* called for each account that the tree is about to show, and the
* account will be passed to the callback function.
*/
@@ -745,14 +745,14 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_set_visible_func (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (f_model),
gnc_tree_view_account_filter_helper,
fd,
gnc_tree_view_account_filter_destroy);
/* Whack any existing levels. The top two levels have been created
* before this routine can be called. */
- egg_tree_model_filter_refilter (EGG_TREE_MODEL_FILTER (f_model));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
LEAVE(" ");
}
@@ -768,7 +768,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_refilter (EGG_TREE_MODEL_FILTER (f_model));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
}
@@ -789,7 +789,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
return gnc_tree_model_account_get_toplevel (GNC_TREE_MODEL_ACCOUNT(model));
}
@@ -819,14 +819,14 @@
}
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- path = egg_tree_model_filter_convert_path_to_child_path (EGG_TREE_MODEL_FILTER (f_model), f_path);
+ path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (f_model), f_path);
gtk_tree_path_free(f_path);
if (!path) {
LEAVE("no path");
return NULL;
}
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
if (!gtk_tree_model_get_iter (model, &iter, path)) {
LEAVE("no iter");
return NULL;
@@ -863,7 +863,7 @@
&f_iter, &s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
&iter, &f_iter);
account = iter.user_data;
@@ -896,7 +896,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
path = gnc_tree_model_account_get_path_from_account (GNC_TREE_MODEL_ACCOUNT(model), account);
if (path == NULL) {
@@ -905,7 +905,7 @@
}
debug_path(DEBUG, path);
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model),
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model),
path);
gtk_tree_path_free(path);
if (f_path == NULL) {
@@ -958,7 +958,7 @@
&f_iter, s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
&iter, &f_iter);
account = iter.user_data;
*return_list = g_list_append(*return_list, account);
@@ -1003,7 +1003,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
/* Clear any existing selection. */
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
@@ -1024,7 +1024,7 @@
continue;
}
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model),
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model),
path);
gtk_tree_path_free(path);
if (f_path == NULL)
@@ -1159,11 +1159,11 @@
&f_iter, s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
&f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
account = gnc_tree_model_account_get_account (GNC_TREE_MODEL_ACCOUNT(model), &iter);
frame = xaccAccountGetSlots(account);
Index: gnc-menu-extensions.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-menu-extensions.h,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -Lsrc/gnome-utils/gnc-menu-extensions.h -Lsrc/gnome-utils/gnc-menu-extensions.h -u -r1.5.4.2 -r1.5.4.3
--- src/gnome-utils/gnc-menu-extensions.h
+++ src/gnome-utils/gnc-menu-extensions.h
@@ -26,7 +26,6 @@
#include <gnome.h>
#include <libguile.h>
#include "guile-mappings.h"
-#include "egg-menu-merge.h"
#define WINDOW_NAME_MAIN "Main"
#define WINDOW_NAME_REGISTER "Register"
@@ -61,9 +60,9 @@
*
* @param app The GnomeApp to add the stored menu items
* @param prefix The prefix of the window that is currently being set up.
- * @param uiMerge The EggMenuMerge [GtkUIManager] object to use for merging.
+ * @param uiMerge The GtkUIManager [GtkUIManager] object to use for merging.
*/
-void gnc_extensions_menu_setup( GtkWindow *app, gchar *prefix, EggMenuMerge *uiMerge );
+void gnc_extensions_menu_setup( GtkWindow *app, gchar *prefix, GtkUIManager *uiMerge );
/* This is called from the window initializing code, when the actual
* menu items stored by the above functions should now be inserted in
Index: gnc-gnome-utils.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-gnome-utils.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -Lsrc/gnome-utils/gnc-gnome-utils.h -Lsrc/gnome-utils/gnc-gnome-utils.h -u -r1.1.4.4 -r1.1.4.5
--- src/gnome-utils/gnc-gnome-utils.h
+++ src/gnome-utils/gnc-gnome-utils.h
@@ -33,10 +33,6 @@
#ifndef GNC_GNOME_UTILS_H
#define GNC_GNOME_UTILS_H
-/* These will go away when gtk2.4 becomes our base target. */
-#include "egg-action-group.h"
-#include "egg-menu-merge.h"
-
#ifdef LIBGUILEH
/** Initialize the Gnome libraries.
*
@@ -144,7 +140,7 @@
* @param short_labels A pointer to a data structure containing
* [action name, label string] string pairs.
*/
-void gnc_gnome_utils_init_short_names (EggActionGroup *action_group,
+void gnc_gnome_utils_init_short_names (GtkActionGroup *action_group,
action_short_labels *short_labels);
@@ -167,7 +163,7 @@
* @param enabled A boolean specifying the new state of the
* associated property.
*/
-void gnc_gnome_utils_update_actions (EggActionGroup *action_group,
+void gnc_gnome_utils_update_actions (GtkActionGroup *action_group,
const gchar **action_names,
const gchar *property_name,
gboolean enabled);
@@ -188,8 +184,8 @@
* @return The merge_id number for the newly merged UI. If an error
* occurred, the return value is 0.
*/
-gint gnc_menu_merge_add_actions (EggMenuMerge *ui_merge,
- EggActionGroup *action_group,
+gint gnc_menu_merge_add_actions (GtkUIManager *ui_merge,
+ GtkActionGroup *action_group,
const gchar *filename);
#endif
/** @} */
Index: gnc-tree-view-price.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-price.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome-utils/gnc-tree-view-price.h -Lsrc/gnome-utils/gnc-tree-view-price.h -u -r1.1.2.2 -r1.1.2.3
--- src/gnome-utils/gnc-tree-view-price.h
+++ src/gnome-utils/gnc-tree-view-price.h
@@ -36,7 +36,6 @@
#include <gtk/gtktreeview.h>
#include "gnc-pricedb.h"
-#include "eggtreemodelfilter.h"
#include "gnc-ui-util.h"
G_BEGIN_DECLS
@@ -159,8 +158,8 @@
* view is incorrect. This appears to only be necessary if the
* filter affects one of the top level prices in gnucash.
*
- * @note This calls a function in libegg that is annotated as being
- * slow. You have been warned.
+ * @note This calls a function in gtk that is annotated in the
+ * sources as being slow. You have been warned.
*
* @param price_view A pointer to an price tree view.
*/
Index: gnc-menu-extensions.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-menu-extensions.c,v
retrieving revision 1.9.4.5
retrieving revision 1.9.4.6
diff -Lsrc/gnome-utils/gnc-menu-extensions.c -Lsrc/gnome-utils/gnc-menu-extensions.c -u -r1.9.4.5 -r1.9.4.6
--- src/gnome-utils/gnc-menu-extensions.c
+++ src/gnome-utils/gnc-menu-extensions.c
@@ -29,7 +29,6 @@
#include "gnc-engine-util.h"
#include "gnc-menu-extensions.h"
#include "gnc-ui.h"
-// #include "egg-menu-merge.h"
typedef struct _ExtensionInfo ExtensionInfo;
struct _ExtensionInfo
@@ -38,10 +37,10 @@
gchar *window;
gchar *path;
- EggMenuMergeNodeType type;
+ GtkUIManagerItemType type;
// GnomeUIInfo info[2];
- // EggActionEntry action;
+ // GtkActionEntry action;
gpointer extra_info;
};
@@ -80,11 +79,9 @@
}
-//static GnomeUIInfoType
-static EggMenuMergeNodeType
-gnc_extension_type(ExtensionInfo *ext_info)
+static gboolean
+gnc_extension_type(ExtensionInfo *ext_info, GtkUIManagerItemType *type)
{
- EggMenuMergeNodeType type;
char *string;
initialize_getters();
@@ -93,23 +90,23 @@
if (string == NULL)
{
PERR("bad type");
- return EGG_MENU_MERGE_UNDECIDED;
+ return FALSE;
}
if (safe_strcmp(string, "menu-item") == 0) {
- type = EGG_MENU_MERGE_MENUITEM;
+ *type = GTK_UI_MANAGER_MENUITEM;
} else if (safe_strcmp(string, "menu") == 0) {
- type = EGG_MENU_MERGE_MENU;
+ *type = GTK_UI_MANAGER_MENU;
} else if (safe_strcmp(string, "separator") == 0) {
- type = EGG_MENU_MERGE_SEPARATOR;
+ *type = GTK_UI_MANAGER_SEPARATOR;
} else {
PERR("bad type");
- type = EGG_MENU_MERGE_UNDECIDED;
+ return FALSE;
}
free(string);
- return type;
+ return TRUE;
}
/* returns malloc'd name */
@@ -260,8 +257,8 @@
}
static void
-//gnc_main_window_cmd_test( EggAction *action, GncMainWindow *window )
-gnc_extension_action_cb( EggAction *action, /* GtkWindow *window */ gpointer data )
+//gnc_main_window_cmd_test( GtkAction *action, GncMainWindow *window )
+gnc_extension_action_cb( GtkAction *action, /* GtkWindow *window */ gpointer data )
{
ExtensionInfo *ext_info = data;
@@ -298,14 +295,19 @@
gnc_extension_path(extension, &ext_info->window, &ext_info->path);
//ext_info->info[0].type = gnc_extension_type(ext_info);
- ext_info->type = gnc_extension_type( ext_info );
+ if (!gnc_extension_type( ext_info, &ext_info->type )) {
+ /* Can't parse the type passed to us. Bail now. */
+ g_free(ext_info);
+ return NULL;
+ }
+
// FIXME: convert this over to GtkAction / new UI-builder framework.
// http://developer.gnome.org/doc/API/2.0/gtk/migrating-gnomeuiinfo.html
// 1/ Define our own enum-values for the three types of widgets:
// MENU, MENU_ITEM, SEPERATOR
//
- // 2/ Figure out and use egg-menu-merge to auto-merge/unmerge menus
+ // 2/ Figure out and use GtkUIManager to auto-merge/unmerge menus
// together.
// * get a merge-id
// * overlay the new menu
@@ -315,7 +317,7 @@
switch ( ext_info->type )
{
//case GNOME_APP_UI_ITEM:
- case EGG_MENU_MERGE_MENUITEM:
+ case GTK_UI_MANAGER_MENUITEM:
/*
ext_info->info[0].moreinfo = gnc_extension_cb;
@@ -334,7 +336,7 @@
break;
//case GNOME_APP_UI_SUBTREE:
- case EGG_MENU_MERGE_MENU:
+ case GTK_UI_MANAGER_MENU:
/*
info = g_new(GnomeUIInfo, 1);
info->type = GNOME_APP_UI_ENDOFINFO;
@@ -351,7 +353,7 @@
break;
//case GNOME_APP_UI_SEPARATOR:
- case EGG_MENU_MERGE_SEPARATOR:
+ case GTK_UI_MANAGER_SEPARATOR:
/*
ext_info->info[0].type = GNOME_APP_UI_SEPARATOR;
*/
@@ -642,7 +644,7 @@
}
void
-gnc_extensions_menu_setup( GtkWindow *app, gchar *window, EggMenuMerge *uiMerge )
+gnc_extensions_menu_setup( GtkWindow *app, gchar *window, GtkUIManager *uiMerge )
{
//char *windowTmp;
//char *pathTmp;
@@ -659,13 +661,13 @@
{
guint new_merge_id;
- EggActionGroup *eag;
+ GtkActionGroup *eag;
GString *extActionName;
GString *extUIPath;
gchar *docString;
char *tmpname;
GCallback gcb;
- //EggMenuMergeType extType;
+ //GtkUIManagerType extType;
tmpname = gnc_extension_name( info );
extActionName = gnc_ext_gen_action_name( tmpname );
@@ -681,9 +683,9 @@
//gnc_extension_path( info->extension, (char**)&windowTmp, (char**)&pathTmp );
/*printf( "extension [%s] path: %s:%s\n",
gnc_extension_name( info ), windowTmp, pathTmp );*/
- switch ( gnc_extension_type( info ) )
+ switch ( info->type )
{
- case EGG_MENU_MERGE_MENUITEM:
+ case GTK_UI_MANAGER_MENUITEM:
gcb = G_CALLBACK( gnc_extension_action_cb );
break;
default:
@@ -692,12 +694,12 @@
}
{
- //EggMenuMerge *ui_merge;
- EggActionEntry newEntry[] =
+ //GtkUIManager *ui_merge;
+ GtkActionEntry newEntry[] =
{
{ extActionName->str,
- gnc_extension_name( info ),
NULL,
+ gnc_extension_name( info ),
"", // NULL /*FIXME: accel*/,
docString,
gcb
@@ -705,21 +707,21 @@
};
- // ui_merge = egg_menu_merge_new();
+ // ui_merge = gtk_ui_manager_new();
- eag = egg_action_group_new ("MainWindowActionsN" );
- egg_action_group_add_actions( eag, newEntry, G_N_ELEMENTS (newEntry), info );
- egg_menu_merge_insert_action_group( uiMerge, eag, 0 );
- new_merge_id = egg_menu_merge_new_merge_id( uiMerge );
+ eag = gtk_action_group_new ("MainWindowActionsN" );
+ gtk_action_group_add_actions( eag, newEntry, G_N_ELEMENTS (newEntry), info );
+ gtk_ui_manager_insert_action_group( uiMerge, eag, 0 );
+ new_merge_id = gtk_ui_manager_new_merge_id( uiMerge );
g_free(docString);
{
gchar *typeStr;
- switch ( gnc_extension_type( info ) )
+ switch ( info->type )
{
- case EGG_MENU_MERGE_MENU: typeStr = "menu"; break;
- case EGG_MENU_MERGE_MENUITEM: typeStr = "menuitem"; break;
+ case GTK_UI_MANAGER_MENU: typeStr = "menu"; break;
+ case GTK_UI_MANAGER_MENUITEM: typeStr = "menuitem"; break;
default: typeStr = "unk"; break;
}
@@ -729,15 +731,15 @@
typeStr );
}
- egg_menu_merge_add_ui( uiMerge,
+ gtk_ui_manager_add_ui( uiMerge,
new_merge_id,
extUIPath->str, //"/menubar/AdditionalMenusPlaceholder/ReportAction",
extActionName->str, // "BarAction",
extActionName->str, // "BarAction",
- gnc_extension_type( info ), //EGG_MENU_MERGE_MENUITEM,
+ info->type, //GTK_UI_MANAGER_MENUITEM,
FALSE );
- egg_menu_merge_ensure_update( uiMerge );
+ gtk_ui_manager_ensure_update( uiMerge );
}
g_string_free(extActionName, TRUE);
Index: gnc-tree-view-commodity.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-commodity.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome-utils/gnc-tree-view-commodity.c -Lsrc/gnome-utils/gnc-tree-view-commodity.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome-utils/gnc-tree-view-commodity.c
+++ src/gnome-utils/gnc-tree-view-commodity.c
@@ -193,10 +193,10 @@
GtkTreeModel *tree_model;
GtkTreeIter iter_a, iter_b;
- tree_model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ tree_model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
model = GNC_TREE_MODEL_COMMODITY(tree_model);
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_a,
f_iter_a);
@@ -204,7 +204,7 @@
if (!gnc_tree_model_commodity_iter_is_commodity (model, &iter_a))
return FALSE;
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_b,
f_iter_b);
@@ -223,13 +223,13 @@
GtkTreeIter iter_a, iter_b;
gnc_commodity_namespace *ns_a, *ns_b;
- tree_model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ tree_model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
model = GNC_TREE_MODEL_COMMODITY(tree_model);
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_a,
f_iter_a);
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_b,
f_iter_b);
@@ -483,7 +483,7 @@
model = gnc_tree_model_commodity_new (book, ct);
/* Set up the view private filter on the common model. */
- f_model = egg_tree_model_filter_new (model, NULL);
+ f_model = gtk_tree_model_filter_new (model, NULL);
gtk_object_sink(GTK_OBJECT(model));
s_model = gtk_tree_model_sort_new_with_model (f_model);
g_object_unref(G_OBJECT(f_model));
@@ -534,7 +534,7 @@
/* Reach down to the real model and get a path for this commodity */
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
path = gnc_tree_model_commodity_get_path_from_commodity (GNC_TREE_MODEL_COMMODITY(model), commodity);
if (path == NULL) {
LEAVE("no path");
@@ -542,7 +542,7 @@
}
/* convert back to a filtered path */
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model), path);
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model), path);
gtk_tree_path_free(path);
if (!f_path) {
LEAVE("no filter path");
@@ -550,7 +550,7 @@
}
/* convert back to a sorted path */
- s_path = egg_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_SORT (s_model), f_path);
+ s_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_SORT (s_model), f_path);
gtk_tree_path_free(f_path);
debug_path(LEAVE, s_path);
return s_path;
@@ -574,14 +574,14 @@
/* Reach down to the real model and get an iter for this commodity */
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
if (!gnc_tree_model_commodity_get_iter_from_commodity (GNC_TREE_MODEL_COMMODITY(model), commodity, &iter)) {
LEAVE("model_get_iter_from_commodity failed");
return FALSE;
}
/* convert back to a sort iter */
- egg_tree_model_filter_convert_child_iter_to_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER(f_model),
&f_iter, &iter);
gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT(s_model),
s_iter, &f_iter);
@@ -635,10 +635,10 @@
&f_iter,
s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
&f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
commodity = gnc_tree_model_commodity_get_commodity (GNC_TREE_MODEL_COMMODITY(model), &iter);
LEAVE("commodity %p (%s)", commodity, gnc_commodity_get_mnemonic (commodity));
return commodity;
@@ -730,7 +730,7 @@
}
/*
- * Set an eggtreemodel visible filter on this commodity. This filter will be
+ * Set an GtkTreeModel visible filter on this commodity. This filter will be
* called for each commodity that the tree is about to show, and the
* commodity will be passed to the callback function.
*/
@@ -758,14 +758,14 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_set_visible_func (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (f_model),
gnc_tree_view_commodity_filter_helper,
fd,
gnc_tree_view_commodity_filter_destroy);
/* Whack any existing levels. The top two levels have been created
* before this routine can be called. */
- egg_tree_model_filter_refilter (EGG_TREE_MODEL_FILTER (f_model));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
LEAVE(" ");
}
@@ -783,7 +783,7 @@
s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (s_model));
- egg_tree_model_filter_refilter (EGG_TREE_MODEL_FILTER (f_model));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
LEAVE(" ");
}
@@ -817,14 +817,14 @@
}
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- path = egg_tree_model_filter_convert_path_to_child_path (EGG_TREE_MODEL_FILTER (f_model), f_path);
+ path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (f_model), f_path);
gtk_tree_path_free(f_path);
if (!path) {
LEAVE("no path");
return NULL;
}
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
if (!gtk_tree_model_get_iter (model, &iter, path)) {
LEAVE("no iter");
return NULL;
@@ -862,10 +862,10 @@
&f_iter, &s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
&iter, &f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
commodity = gnc_tree_model_commodity_get_commodity (GNC_TREE_MODEL_COMMODITY(model),
&iter);
LEAVE("commodity %p (%s)", commodity, gnc_commodity_get_mnemonic (commodity));
@@ -896,7 +896,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model (EGG_TREE_MODEL_FILTER (f_model));
+ model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (f_model));
path = gnc_tree_model_commodity_get_path_from_commodity (GNC_TREE_MODEL_COMMODITY(model), commodity);
if (path == NULL) {
@@ -905,7 +905,7 @@
}
debug_path(DEBUG, path);
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model),
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model),
path);
gtk_tree_path_free(path);
if (f_path == NULL) {
@@ -958,10 +958,10 @@
&f_iter, s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
&iter, &f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
commodity = gnc_tree_model_commodity_get_commodity (GNC_TREE_MODEL_COMMODITY(model),
&iter);
*return_list = g_list_append(*return_list, commodity);
@@ -1002,7 +1002,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
/* Clear any existing selection. */
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
@@ -1023,7 +1023,7 @@
continue;
}
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model),
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model),
path);
gtk_tree_path_free(path);
if (f_path == NULL)
Index: gnc-gnome-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-gnome-utils.c,v
retrieving revision 1.2.4.7
retrieving revision 1.2.4.8
diff -Lsrc/gnome-utils/gnc-gnome-utils.c -Lsrc/gnome-utils/gnc-gnome-utils.c -u -r1.2.4.7 -r1.2.4.8
--- src/gnome-utils/gnc-gnome-utils.c
+++ src/gnome-utils/gnc-gnome-utils.c
@@ -33,7 +33,6 @@
#endif
#include "argv-list-converters.h"
-#include "egg-action-group.h"
#include "gnc-gnome-utils.h"
#include "gnc-html.h"
#include "gnc-trace.h"
@@ -281,10 +280,10 @@
/** Add "short" labels to existing actions. The "short" label is the
* string used on toolbar buttons when the action is visible.*/
void
-gnc_gnome_utils_init_short_names (EggActionGroup *action_group,
+gnc_gnome_utils_init_short_names (GtkActionGroup *action_group,
action_short_labels *short_labels)
{
- EggAction *action;
+ GtkAction *action;
GValue value = { 0, };
gint i;
@@ -292,7 +291,7 @@
for (i = 0; short_labels[i].action_name; i++) {
/* Add a couple of short labels for the toolbar */
- action = egg_action_group_get_action (action_group,
+ action = gtk_action_group_get_action (action_group,
short_labels[i].action_name);
g_value_set_static_string (&value, gettext(short_labels[i].label));
g_object_set_property (G_OBJECT(action), "short_label", &value);
@@ -304,12 +303,12 @@
* modify actions making them visible, invisible, sensitive, or
* insensitive. */
void
-gnc_gnome_utils_update_actions (EggActionGroup *action_group,
+gnc_gnome_utils_update_actions (GtkActionGroup *action_group,
const gchar **action_names,
const gchar *property_name,
gboolean enabled)
{
- EggAction *action;
+ GtkAction *action;
GValue value = { 0 };
gint i;
@@ -317,7 +316,7 @@
g_value_set_boolean (&value, enabled);
for (i = 0; action_names[i]; i++) {
- action = egg_action_group_get_action (action_group, action_names[i]);
+ action = gtk_action_group_get_action (action_group, action_names[i]);
g_object_set_property (G_OBJECT(action), property_name, &value);
}
}
@@ -326,8 +325,8 @@
/** Load a new set of actions into an existing UI. */
gint
-gnc_menu_merge_add_actions (EggMenuMerge *ui_merge,
- EggActionGroup *action_group,
+gnc_menu_merge_add_actions (GtkUIManager *ui_merge,
+ GtkActionGroup *action_group,
const gchar *filename)
{
GError *error = NULL;
@@ -340,18 +339,18 @@
g_return_val_if_fail (action_group, 0);
g_return_val_if_fail (filename, 0);
- egg_menu_merge_insert_action_group (ui_merge, action_group, 0);
+ gtk_ui_manager_insert_action_group (ui_merge, action_group, 0);
pathname = gnc_gnome_locate_ui_file (filename);
if (pathname == NULL)
return 0;
- merge_id = egg_menu_merge_add_ui_from_file (ui_merge, pathname, &error);
+ merge_id = gtk_ui_manager_add_ui_from_file (ui_merge, pathname, &error);
DEBUG("merge_id is %d", merge_id);
g_assert(merge_id || error);
if (merge_id) {
- egg_menu_merge_ensure_update (ui_merge);
+ gtk_ui_manager_ensure_update (ui_merge);
} else {
g_critical("Failed to load ui file.\n Filename %s\n Error %s",
filename, error->message);
Index: gnc-tree-view-price.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-price.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome-utils/gnc-tree-view-price.c -Lsrc/gnome-utils/gnc-tree-view-price.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome-utils/gnc-tree-view-price.c
+++ src/gnome-utils/gnc-tree-view-price.c
@@ -193,10 +193,10 @@
GtkTreeModel *tree_model;
GtkTreeIter iter_a, iter_b;
- tree_model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ tree_model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
model = GNC_TREE_MODEL_PRICE(tree_model);
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_a,
f_iter_a);
@@ -204,7 +204,7 @@
if (!gnc_tree_model_price_iter_is_price (model, &iter_a))
return FALSE;
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_b,
f_iter_b);
@@ -224,13 +224,13 @@
gnc_commodity_namespace *ns_a, *ns_b;
gnc_commodity *comm_a, *comm_b;
- tree_model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ tree_model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
model = GNC_TREE_MODEL_PRICE(tree_model);
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_a,
f_iter_a);
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter_b,
f_iter_b);
@@ -422,7 +422,7 @@
model = gnc_tree_model_price_new (book, price_db);
/* Set up the view private filter on the common model. */
- f_model = egg_tree_model_filter_new (model, NULL);
+ f_model = gtk_tree_model_filter_new (model, NULL);
gtk_object_sink(GTK_OBJECT(model));
s_model = gtk_tree_model_sort_new_with_model (f_model);
g_object_unref(G_OBJECT(f_model));
@@ -473,7 +473,7 @@
/* Reach down to the real model and get a path for this price */
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
path = gnc_tree_model_price_get_path_from_price (GNC_TREE_MODEL_PRICE(model), price);
if (path == NULL) {
LEAVE("no path");
@@ -481,7 +481,7 @@
}
/* convert back to a filtered path */
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model), path);
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model), path);
gtk_tree_path_free(path);
if (!f_path) {
LEAVE("no filter path");
@@ -489,7 +489,7 @@
}
/* convert back to a sorted path */
- s_path = egg_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_SORT (s_model), f_path);
+ s_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_SORT (s_model), f_path);
gtk_tree_path_free(f_path);
debug_path(LEAVE, s_path);
return s_path;
@@ -513,14 +513,14 @@
/* Reach down to the real model and get an iter for this price */
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
if (!gnc_tree_model_price_get_iter_from_price (GNC_TREE_MODEL_PRICE(model), price, &iter)) {
LEAVE("model_get_iter_from_price failed");
return FALSE;
}
/* convert back to a sort iter */
- egg_tree_model_filter_convert_child_iter_to_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER(f_model),
&f_iter, &iter);
gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT(s_model),
s_iter, &f_iter);
@@ -574,10 +574,10 @@
&f_iter,
s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER(f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER(f_model),
&iter,
&f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
price = gnc_tree_model_price_get_price (GNC_TREE_MODEL_PRICE(model), &iter);
LEAVE("price %p", price);
return price;
@@ -679,7 +679,7 @@
}
/*
- * Set an eggtreemodel visible filter on this price. This filter will be
+ * Set an GtkTreeModel visible filter on this price. This filter will be
* called for each price that the tree is about to show, and the
* price will be passed to the callback function.
*/
@@ -709,14 +709,14 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_set_visible_func (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (f_model),
gnc_tree_view_price_filter_helper,
fd,
gnc_tree_view_price_filter_destroy);
/* Whack any existing levels. The top two levels have been created
* before this routine can be called. */
- egg_tree_model_filter_refilter (EGG_TREE_MODEL_FILTER (f_model));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
LEAVE(" ");
}
@@ -734,7 +734,7 @@
s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (s_model));
- egg_tree_model_filter_refilter (EGG_TREE_MODEL_FILTER (f_model));
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (f_model));
LEAVE(" ");
}
@@ -767,14 +767,14 @@
}
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- path = egg_tree_model_filter_convert_path_to_child_path (EGG_TREE_MODEL_FILTER (f_model), f_path);
+ path = gtk_tree_model_filter_convert_path_to_child_path (GTK_TREE_MODEL_FILTER (f_model), f_path);
gtk_tree_path_free(f_path);
if (!path) {
LEAVE("no path");
return NULL;
}
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
if (!gtk_tree_model_get_iter (model, &iter, path)) {
LEAVE("no iter");
return NULL;
@@ -812,10 +812,10 @@
&f_iter, &s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
&iter, &f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
price = gnc_tree_model_price_get_price (GNC_TREE_MODEL_PRICE(model),
&iter);
LEAVE("price %p", price);
@@ -845,7 +845,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model (EGG_TREE_MODEL_FILTER (f_model));
+ model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (f_model));
path = gnc_tree_model_price_get_path_from_price (GNC_TREE_MODEL_PRICE(model), price);
if (path == NULL) {
@@ -854,7 +854,7 @@
}
debug_path(DEBUG, path);
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model),
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model),
path);
gtk_tree_path_free(path);
if (f_path == NULL) {
@@ -907,10 +907,10 @@
&f_iter, s_iter);
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (f_model),
+ gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (f_model),
&iter, &f_iter);
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
price = gnc_tree_model_price_get_price (GNC_TREE_MODEL_PRICE(model),
&iter);
*return_list = g_list_append(*return_list, price);
@@ -951,7 +951,7 @@
s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
f_model = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(s_model));
- model = egg_tree_model_filter_get_model(EGG_TREE_MODEL_FILTER(f_model));
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(f_model));
/* Clear any existing selection. */
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
@@ -972,7 +972,7 @@
continue;
}
- f_path = egg_tree_model_filter_convert_child_path_to_path (EGG_TREE_MODEL_FILTER (f_model),
+ f_path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (f_model),
path);
gtk_tree_path_free(path);
if (f_path == NULL)
Index: gnc-tree-view-commodity.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-commodity.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/gnome-utils/gnc-tree-view-commodity.h -Lsrc/gnome-utils/gnc-tree-view-commodity.h -u -r1.1.2.2 -r1.1.2.3
--- src/gnome-utils/gnc-tree-view-commodity.h
+++ src/gnome-utils/gnc-tree-view-commodity.h
@@ -36,7 +36,6 @@
#include <gtk/gtktreeview.h>
#include "gnc-commodity.h"
-#include "eggtreemodelfilter.h"
#include "gnc-ui-util.h"
G_BEGIN_DECLS
@@ -158,8 +157,8 @@
* view is incorrect. This appears to only be necessary if the
* filter affects one of the top level commodities in gnucash.
*
- * @note This calls a function in libegg that is annotated as being
- * slow. You have been warned.
+ * @note This calls a function in gtk that is annotated in the
+ * sources as being slow. You have been warned.
*
* @param commodity_view A pointer to an commodity tree view.
*/
Index: gnc-icons.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-icons.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome-utils/gnc-icons.c -Lsrc/gnome-utils/gnc-icons.c -u -r1.1.2.6 -r1.1.2.7
--- src/gnome-utils/gnc-icons.c
+++ src/gnome-utils/gnc-icons.c
@@ -4,7 +4,7 @@
* Author: Jan Arne Petersen <jpetersen at uni-bonn.de>
*/
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
#include "gnc-icons.h"
#include "gnc-gnome-utils.h"
Index: gnc-tree-view-account.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Attic/gnc-tree-view-account.h,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Lsrc/gnome-utils/gnc-tree-view-account.h -Lsrc/gnome-utils/gnc-tree-view-account.h -u -r1.1.2.9 -r1.1.2.10
--- src/gnome-utils/gnc-tree-view-account.h
+++ src/gnome-utils/gnc-tree-view-account.h
@@ -36,7 +36,6 @@
#include <gtk/gtktreeview.h>
#include "Group.h"
-#include "eggtreemodelfilter.h"
#include "gnc-ui-util.h"
G_BEGIN_DECLS
@@ -203,8 +202,8 @@
* view is incorrect. This appears to only be necessary if the
* filter affects one of the top level accounts in gnucash.
*
- * @note This calls a function in libegg that is annotated as being
- * slow. You have been warned.
+ * @note This calls a function in gtk that is annotated in the
+ * sources as being slow. You have been warned.
*
* @param account_view A pointer to an account tree view.
*/
Index: gnc-plugin-hbci.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/Attic/gnc-plugin-hbci.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Lsrc/import-export/hbci/gnc-plugin-hbci.c -Lsrc/import-export/hbci/gnc-plugin-hbci.c -u -r1.1.2.2 -r1.1.2.3
--- src/import-export/hbci/gnc-plugin-hbci.c
+++ src/import-export/hbci/gnc-plugin-hbci.c
@@ -24,7 +24,6 @@
#include "config.h"
#include "druid-hbci-initial.h"
-#include "egg-action-group.h"
#include "gnc-plugin-manager.h"
#include "gnc-gnome-utils.h"
#include "gnc-hbci-getbalance.h"
@@ -62,34 +61,34 @@
gpointer user_data);
/* Command callbacks */
-static void gnc_plugin_hbci_cmd_setup (EggAction *action, GncMainWindowActionData *data);
-static void gnc_plugin_hbci_cmd_get_balance (EggAction *action, GncMainWindowActionData *data);
-static void gnc_plugin_hbci_cmd_get_transactions (EggAction *action, GncMainWindowActionData *data);
-static void gnc_plugin_hbci_cmd_issue_transaction (EggAction *action, GncMainWindowActionData *data);
-static void gnc_plugin_hbci_cmd_issue_direct_debit (EggAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_hbci_cmd_setup (GtkAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_hbci_cmd_get_balance (GtkAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_hbci_cmd_get_transactions (GtkAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_hbci_cmd_issue_transaction (GtkAction *action, GncMainWindowActionData *data);
+static void gnc_plugin_hbci_cmd_issue_direct_debit (GtkAction *action, GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-hbci-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-hbci-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
+static GtkActionEntry gnc_plugin_actions [] = {
/* Menus */
- { "OnlineActionsAction", N_("_Online Actions"), NULL, NULL, NULL, NULL },
+ { "OnlineActionsAction", NULL, N_("_Online Actions"), NULL, NULL, NULL },
/* Menu Items */
- { "HbciSetupAction", N_("HBCI Setup..."), NULL, NULL,
+ { "HbciSetupAction", NULL, N_("HBCI Setup..."), NULL,
N_("Gather initial HBCI information"),
G_CALLBACK (gnc_plugin_hbci_cmd_setup) },
- { "HbciGetBalanceAction", N_("HBCI Get _Balance"), NULL, NULL,
+ { "HbciGetBalanceAction", NULL, N_("HBCI Get _Balance"), NULL,
N_("Get the account balance online through HBCI"),
G_CALLBACK (gnc_plugin_hbci_cmd_get_balance) },
- { "HbciGetTransAction", N_("HBCI Get _Transactions"), NULL, NULL,
+ { "HbciGetTransAction", NULL, N_("HBCI Get _Transactions"), NULL,
N_("Get the transactions online through HBCI"),
G_CALLBACK (gnc_plugin_hbci_cmd_get_transactions) },
- { "HbciIssueTransAction", N_("HBCI _Issue Transactions"), NULL, NULL,
+ { "HbciIssueTransAction", NULL, N_("HBCI _Issue Transactions"), NULL,
N_("Issue a new transaction online through HBCI"),
G_CALLBACK (gnc_plugin_hbci_cmd_issue_transaction) },
- { "HbciIssueDirectDebitAction", N_("HBCI Issue _Direct Debit"), NULL, NULL,
+ { "HbciIssueDirectDebitAction", NULL, N_("HBCI Issue _Direct Debit"), NULL,
N_("Issue a new direct debit note online through HBCI"),
G_CALLBACK (gnc_plugin_hbci_cmd_issue_direct_debit) },
};
@@ -317,7 +316,7 @@
Account *account,
gpointer user_data)
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
GncMainWindow *window;
window = GNC_MAIN_WINDOW(plugin_page->window);
@@ -353,7 +352,7 @@
gnc_plugin_hbci_main_window_page_changed (GncMainWindow *window,
GncPluginPage *page)
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
const gchar *page_name;
Account *account;
@@ -400,7 +399,7 @@
************************************************************/
static void
-gnc_plugin_hbci_cmd_setup (EggAction *action,
+gnc_plugin_hbci_cmd_setup (GtkAction *action,
GncMainWindowActionData *data)
{
ENTER("action %p, main window data %p", action, data);
@@ -409,7 +408,7 @@
}
static void
-gnc_plugin_hbci_cmd_get_balance (EggAction *action,
+gnc_plugin_hbci_cmd_get_balance (GtkAction *action,
GncMainWindowActionData *data)
{
Account *account;
@@ -426,7 +425,7 @@
}
static void
-gnc_plugin_hbci_cmd_get_transactions (EggAction *action,
+gnc_plugin_hbci_cmd_get_transactions (GtkAction *action,
GncMainWindowActionData *data)
{
Account *account;
@@ -443,7 +442,7 @@
}
static void
-gnc_plugin_hbci_cmd_issue_transaction (EggAction *action,
+gnc_plugin_hbci_cmd_issue_transaction (GtkAction *action,
GncMainWindowActionData *data)
{
Account *account;
@@ -460,7 +459,7 @@
}
static void
-gnc_plugin_hbci_cmd_issue_direct_debit (EggAction *action,
+gnc_plugin_hbci_cmd_issue_direct_debit (GtkAction *action,
GncMainWindowActionData *data)
{
Account *account;
Index: gnc-plugin-stylesheets.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/stylesheets/Attic/gnc-plugin-stylesheets.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/report/stylesheets/gnc-plugin-stylesheets.c -Lsrc/report/stylesheets/gnc-plugin-stylesheets.c -u -r1.1.2.1 -r1.1.2.2
--- src/report/stylesheets/gnc-plugin-stylesheets.c
+++ src/report/stylesheets/gnc-plugin-stylesheets.c
@@ -23,7 +23,7 @@
#include "config.h"
#include "dialog-style-sheet.h"
-#include "egg-action-group.h"
+#include <gtk/gtk.h>
#include "gnc-gnome-utils.h"
#include "gnc-plugin-page-account-tree.h"
#include "gnc-plugin-stylesheets.h"
@@ -51,16 +51,16 @@
GncPluginPage *page);
/* Command callbacks */
-static void gnc_plugin_stylesheets_cmd_edit_style_sheet (EggAction *action,
+static void gnc_plugin_stylesheets_cmd_edit_style_sheet (GtkAction *action,
GncMainWindowActionData *data);
#define PLUGIN_ACTIONS_NAME "gnc-plugin-stylesheets-actions"
#define PLUGIN_UI_FILENAME "gnc-plugin-stylesheets-ui.xml"
-static EggActionEntry gnc_plugin_actions [] = {
+static GtkActionEntry gnc_plugin_actions [] = {
/* Menu Items */
- { "EditStyleSheetsAction", N_("_Style Sheets..."), NULL, NULL,
+ { "EditStyleSheetsAction", NULL, N_("_Style Sheets..."), NULL,
N_("Edit report style sheets."),
G_CALLBACK (gnc_plugin_stylesheets_cmd_edit_style_sheet) },
};
@@ -220,7 +220,7 @@
gnc_plugin_stylesheets_main_window_page_changed (GncMainWindow *window,
GncPluginPage *page)
{
- EggActionGroup *action_group;
+ GtkActionGroup *action_group;
const gchar *page_name;
ENTER("main window %p, page %p", window, page);
@@ -252,7 +252,7 @@
************************************************************/
static void
-gnc_plugin_stylesheets_cmd_edit_style_sheet (EggAction *action,
+gnc_plugin_stylesheets_cmd_edit_style_sheet (GtkAction *action,
GncMainWindowActionData *data)
{
gnc_style_sheet_dialog_open();
More information about the gnucash-changes
mailing list