[Gnucash-changes] Migrate a couple of functions to gnc-plugins.c.
David Hampton
hampton at cvs.gnucash.org
Sat Jun 4 21:05:19 EDT 2005
Log Message:
-----------
Migrate a couple of functions to gnc-plugins.c.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/src/gnome:
gnc-plugin.c
gnc-plugin.h
gnucash/src/gnome-utils:
gnc-gnome-utils.c
gnc-gnome-utils.h
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.212
retrieving revision 1.1487.2.213
diff -LChangeLog -LChangeLog -u -r1.1487.2.212 -r1.1487.2.213
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,16 @@
+2005-06-04 David Hampton <hampton at employees.org>
+
+ * src/gnome/gnc-plugin.[ch]:
+ * src/gnome-utils/gnc-gnome-utils.[ch}: Migrate a couple of
+ functions to gnc-plugins.c.
+
+ * src/gnome/gnc-plugin-page-account-tree.c:
+ * src/gnome/gnc-plugin-page-register.c:
+ * src/import-export/hbci/gnc-plugin-hbci.c:
+ * src/report/report-gnome/gnc-plugin-page-report.c:
+ * src/report/stylesheets/gnc-plugin-stylesheets.c: Update for the
+ new function names.
+
2005-06-03 David Hampton <hampton at employees.org>
* src/gnome/gnc-main-window.[ch]: Move one function out of
@@ -4022,7 +4035,7 @@
* src/import-export/hbci/hbci-interaction.c: Fix problems with
user messages.
-2004-10-24 Benoit Grégoire <bock at step.polymtl.ca>
+2004-10-24 Benoit Gr駯ire <bock at step.polymtl.ca>
* po/fr.po: Translation from Johan Buret, unfortunately on the wrong branch.
2004-10-16 Derek Atkins <derek at ihtfp.com>
@@ -4068,7 +4081,7 @@
- protect headers from multiple inclusion
- include gtk.h header when we use gtk objects.
-2004-10-08 Benoit Grégoire <bock at step.polymtl.ca>
+2004-10-08 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Duplicate match tweaks:
-Change MATCH_DATE_NOT_THRESHOLD from 3 weeks to two weeks
-A transaction amount mismatch past the threshold is now punished by -5 instead of -1
@@ -4834,11 +4847,11 @@
* src/engine/gnc-numeric.c: Rich Johnson's patch to convert
atoll() -> strtoll()
-2003-12-08 Benoit Grégoire <bock at step.polymtl.ca>
+2003-12-08 Benoit Gr駯ire <bock at step.polymtl.ca>
*src/import-export/log-replay/gnc-log-replay.c: Increase read buffer size.
Hopefully fixes 127421, but this time someone please do test the fix...
-2003-12-01 Benoit Grégoire <bock at step.polymtl.ca>
+2003-12-01 Benoit Gr駯ire <bock at step.polymtl.ca>
* po/POTFILES.in: Remove reference to bin/strsub.c.
@@ -5267,7 +5280,7 @@
there's an error.
Fixes #117657
-2003-07-26 Benoit Grégoire <bock at step.polymtl.ca>
+2003-07-26 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-account-matcher.c: Fix bug #105293
@@ -5912,7 +5925,7 @@
labels in the summary bar to print the Invoice's total amounts.
Fixes #113769.
-2003-05-29 Benoit Grégoire <bock at step.polymtl.ca>
+2003-05-29 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/engine/TransLog.c: Now log the transaction notes field (kvp actually).
* src/engine/kvp_frame.h: Docs
@@ -5931,7 +5944,7 @@
- Doesn't need libofx.h
- use TRUE/FALSE, not true/false.
-2003-05-28 Benoit Grégoire <bock at step.polymtl.ca>
+2003-05-28 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-settings.c: Revert previous gettext macro addition.
* src/engine/TransLog.c,h: Change the log format to use GUID instead of
@@ -5998,7 +6011,7 @@
* src/scm/main.scm: Change stable version to 1.8.4
-2003-05-26 Benoit Grégoire <bock at step.polymtl.ca>
+2003-05-26 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-settings.c: Fix pref page define to the
proper page, should fix the problem of all prefs being ignored.
@@ -6544,12 +6557,12 @@
* src/scm/main.scm: guile-1.6 requires empty lists to be quoted
(fixes debian bug #186188)
-2003-04-03 Benoit Grégoire <bock at step.polymtl.ca>
+2003-04-03 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-commodity-matcher.c: Fix debian bug #187061
Crash during import of investment accounts.
-2003-04-02 Benoit Grégoire <bock at step.polymtl.ca>
+2003-04-02 Benoit Gr駯ire <bock at step.polymtl.ca>
* po/POTFILES.in,
src/import-export/ofx/Makefile.am,
@@ -6670,7 +6683,7 @@
gcc-3.2, and frankly we don't need it since we don't install
before we're building.
-2003-03-18 Benoit Grégoire <bock at step.polymtl.ca>
+2003-03-18 Benoit Gr駯ire <bock at step.polymtl.ca>
* Documentation update
2003-03-16 David Hampton <hampton at employees.org>
@@ -6901,7 +6914,7 @@
* src/gnome/dialog-sxsincelast.c: make sure to resume gui refresh events
-2003-02-26 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-26 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c:
-Disable -3 punishment for transactions which have an online ID. This punished credit card transfer yet added no tangible benefit.
@@ -6995,7 +7008,7 @@
make splits positive, and some make them negative. This should
deal properly in both cases, so it's a better fix for #105139.
-2003-02-14 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-14 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c:
-Remove unused code.
@@ -7041,13 +7054,13 @@
gnc_import_TransInfo_refresh_destacc move g_assert before first
assignment, otherwise I get a syntax error
-2003-02-10 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-10 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-main-matcher.c: Patch by cmorgan to
restrict iterative destination account matching to transactions
AFTER the current one in the clist.
-2003-02-10 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-10 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c,h:
* src/import-export/import-main-matcher.c: Apply most of cmorgan's
@@ -7119,7 +7132,7 @@
* src/business/business-utils/Makefile.am: make scm-links so you
can run gnucash from within the build tree
-2003-02-04 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-04 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Add heuristic for duplicate matching by check number.
* doc/README.OFX: Update
@@ -7159,7 +7172,7 @@
* rpm/gnucash.spec.in: add options to build ofx,hbci and postgresql
-2003-02-02 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-02 Benoit Gr駯ire <bock at step.polymtl.ca>
* doc/README.OFX: I've quickly put together some docs for the ofx module and transaction matching. Also includes a FAQ. Not perfect, but should closebug 99478.
* doc/Makefile.am: Add README.OFX
@@ -7198,7 +7211,7 @@
* src/import-export/Makefile.am:
Removed gnc-gen-transaction.[ch] "properly" for the dist.
-2003-02-01 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-01 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/gnc-ofx-import.c: No longer assume that transaction with type OFX_OTHER are investement transactions. Fixes bug reported by Rik harris.
* src/import-export/import-main-matcher.c: Fix unrelated display bug with balanced (typically investement) transactions.
@@ -7217,7 +7230,7 @@
string freeze -- but these strings *really* *only* apply to German
users, so I just fixed the translation myself.
-2003-02-01 Benoit Grégoire <bock at step.polymtl.ca>
+2003-02-01 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-utilities.c: Build on Nigel's patch.
This hopefully permanently closes
@@ -7951,7 +7964,7 @@
* src/engine/gnc-commodity.c: Convert from the old to new symbols
for Russian Roubles (RUB -> RUR). #102705
-2002-01-11 Benoit Grégoire <bock at step.polymtl.ca>
+2002-01-11 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Fixed the date heuristics
modifications, which had an unfortunate interaction with old
@@ -8068,7 +8081,7 @@
* src/engine/iso-currencies-to-c:
Look for auto-generated files in srcdir.
-2002-1-6 Benoit Grégoire <bock at step.polymtl.ca>
+2002-1-6 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Give a much higher importance
the date heuristics. Exact date now worth +3, date within
MATCH_DATE_THRESHOLD worth +2, and dates outside
@@ -8326,7 +8339,7 @@
the rpc-server command-line option only works if gnucash was compiled
with rpc enabled.
-2002-12-30 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-30 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/hbci/druid-hbci-initial.c
* src/import-export/hbci/gnc-hbci-utils.c:
Fix a bunch of "warning: deprecated use of label at end of
@@ -8648,7 +8661,7 @@
* rpm/gnucash.spec.in: fix for problem reports on gnucash-user
-2002-12-12 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-12 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-account-matcher.c: Fix "level 3 and
more subaccount not selected by default" bug.
@@ -8704,7 +8717,7 @@
* src/report/report-system/commodity-utilities.scm: Fix bug
#100463.
-2002-12-10 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-10 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/*: Add user pref to allow HBCI users
to select if they want Christian's matcher or mine.
Update OFX readme.
@@ -8722,14 +8735,14 @@
RO Txns before you delete the account. Fix for bug# 100727 (although
it requires invoice unposting to work).
-2002-12-9 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-9 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-main-matcher.c:
* src/import-export/generic-import.glade: Change colors, remove
imbalance column and put it's info into the "Select action column",
when appropriate. Change many strings after discussion with
Wilddev.
-2002-12-8 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-8 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-account-matcher.c,h: Add param to
gnc_import_select_account():
@param ok_pressed A pointer to gboolean. If non-NULL, whether or
@@ -8743,7 +8756,7 @@
above change. Shorten the strings in the "Specific action to be
taken" column.
-2002-12-8 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-8 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Make the auto-balance
split have the correct amount in all cases by using
xaccTransGetImbalance() instead of the first split's value.
@@ -8803,7 +8816,7 @@
* src/scm/main.scm: Tweak the file name normalization code.
-2002-12-7 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-7 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/generic-import.glade: Add user instructions,
get rid of apply button.
@@ -8877,7 +8890,7 @@
gnc_commodity_equal(), because the average user doesn't need
to know why commodities are not equal.
-2002-12-07 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-07 Benoit Gr駯ire <bock at step.polymtl.ca>
More Doxygenification. Created an Engine module, and a
Deprecated list. Unfortunately, unless we turn on EXTRACT_ALL
@@ -8915,7 +8928,7 @@
* po/nl.po: Fix use of msgid_plural by adding the appropriate
header entry.
-2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-06 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: Do the "right"
thing for setting split amount and value.
@@ -8931,11 +8944,11 @@
* po/nl.po -- don't use msgid_plural -- it fails to work.
-2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-06 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/import-backend.c: Fix for gcc2
-2002-12-06 Benoit Grégoire <bock at step.polymtl.ca>
+2002-12-06 Benoit Gr駯ire <bock at step.polymtl.ca>
Huge patch, this is the new generic import
architecture/transaction matcher. Many old
@@ -9325,7 +9338,7 @@
* src/import-export/generic-import.glade: Add explaining label for
importer window.
-2002-11-27 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-27 Benoit Gr駯ire <bock at step.polymtl.ca>
* Makefile.am configure.in src/doc/Makefile.am
src/doc/doxygen.cfg src/doc/doxygen_main_page.c: Added doxygen
@@ -9386,11 +9399,11 @@
fuzzy amount matching threshold, so that this feature can be used
from gnc-ofx-import.c.
-2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-25 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/hbci/gnc-hbci-gettrans.c: Remove
#include "gnc-generic-import.h"
-2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-25 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Account-matcher.[c,h]: Minor changes to make
the matcher more generic: Improved text handling, default account
support, enable account description, disable showing Online ID
@@ -9423,7 +9436,7 @@
gnc-split-reg isn't changing the window-titles of windows it has
no authority over. Fixed Bug#99396.
-2002-11-25 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-25 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/*.c,h: Split gnc-generic-import.h in one
header per file.
@@ -9603,7 +9616,7 @@
* README/README.cvs -- update to reference how to "properly" use
autogen.sh
-2002-11-21 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-21 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Tweak the matching
heuristics.
-Memo and description heuristics now both have a very primitive
@@ -9615,7 +9628,7 @@
always written in the split's memo.
* src/doc/user-prefs-howto.txt: Add new file, by Christian Stimming.
-2002-11-21 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-21 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/generic-import.scm: New file, contains user
prefs for the Transaction matcher:
Display, Auto-ADD and Auto-CLEAR thresholds can be adjusted.
@@ -9635,7 +9648,7 @@
correctly with currency exchange transactions from 1.6. Fixes
reported problems with importing 1.6 data files, #91505.
-2002-11-18 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-18 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Change default "RECONCILE"
action from 'y' (reconciled) to'c' (cleared)
@@ -9654,7 +9667,7 @@
* NEWS: update to new version 1.7.3
* configure.in: update to new version 1.7.3
-2002-11-18 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-18 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Remove constant length
strings and replace with moving pointers. I wish _("string")
could be used as a could initializer like "string" can...
@@ -9839,7 +9852,7 @@
* po/nb.po: New filename for Norwegian (bokmal) translation -- it
used to be stored under no.po but that is no longer.
-2002-11-13 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-13 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c:
-Don't show match with probability less than 1, so we don't
end up showing the whole account.
@@ -9851,7 +9864,7 @@
online.
-Steal a better pixmap from gnome drop down menu.
-2002-11-13 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-13 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: MAJOR improvement to
investment support. All transactions created from an investment
@@ -9925,7 +9938,7 @@
* src/business/business-ledger/gncEntryLedgerControl.c: Implement
the equivalent fixes for the business ledger.
-2002-11-12 Benoit Grégoire <bock at step.polymtl.ca>
+2002-11-12 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Fix previous patch.
gcc 3.2 is too forgiving...
@@ -10163,7 +10176,7 @@
2002-10-31 Derek Atkins <derek at ihtfp.com>
* import-export/ofx/Makefile.am: add gncscm_DATA to EXTRA_DIST
-2002-10-30 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-30 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: Fix security account creation bug caused by the presence of the character ':' in the account default name. Fix compiler warnings.
2002-10-30 Derek Atkins <derek at ihtfp.com>
@@ -10436,7 +10449,7 @@
2002-10-21 Derek Atkins <derek at ihtfp.com>
* app-utils/options.scm -- fix (find-first-account) to search subaccounts
-2002-10-20 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-20 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Trasaction-matcher.c: Fix compiler warnings.
* src/import-export/ofx/gnc-ofx-import.c: Give the user more information
for account creation.
@@ -10457,7 +10470,7 @@
Also had to remove -Werror from hbci/Makefile.am due to darn cc
warnings about order of includes.
-2002-10-20 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-20 Benoit Gr駯ire <bock at step.polymtl.ca>
* Investment transactions now create two accounts, one is for the stock,
the other is the account defined by the FI, where the cash is swapped.
@@ -10513,7 +10526,7 @@
* Matthew Vanecek's gncQueryPrint() patch
-2002-10-18 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-18 Benoit Gr駯ire <bock at step.polymtl.ca>
* Implement a working commodity matcher for the generic import
module.
@@ -10721,7 +10734,7 @@
* src/app-utils/gnc-ui-util.c: Move gnc_get_current_session() into
gnc-session.c. #94551
-2002-10-09 Benoit Grégoire <bock at step.polymtl.ca>
+2002-10-09 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Account-matcher.c: Change "Account ID" text
to "Full account ID" and make it translatable.
@@ -10977,7 +10990,7 @@
transaction download with usage of generic transaction
import. Requires OpenHBCI CVS update.
-2002-09-29 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-29 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c: Fix segfault when
importing into a gnucash account which has no splits.
@@ -11002,7 +11015,7 @@
* src/report/standard-reports/balance-sheet.scm: Use the report
name from the options instead of a hard coded report title.
-2002-09-26 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-26 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/ofx/gnc-ofx-import.c: The default commodity
and account type are now preselected from OFX provided information
@@ -11047,7 +11060,7 @@
* src/gnome/dialog-transfer.[hc]: Add set_memo access function.
-2002-09-23 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-23 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/Transaction-matcher.c, generic-import.glade:
-Transactions just downloaded are now ignored from the matchlist.
@@ -11066,7 +11079,7 @@
transaction matcher and change the look and alignment of
the action buttons.
-2002-09-22 Benoit Grégoire <bock at step.polymtl.ca>
+2002-09-22 Benoit Gr駯ire <bock at step.polymtl.ca>
* src/import-export/gnc-generic-import.c: Remove obsolete file now
split into Account.c Transaction.c and Utilities.c
@@ -14974,8 +14987,7 @@
* po/glossary/de.po, txt-to-pot.sh: Several updates from the
stable branch.
- * po/glossary/es.po: Added Spanish translation by Raúl Miró
- <cotin at geocities.com>
+ * po/glossary/es.po: Added Spanish translation by Ra?r?cotin at geocities.com>
2001-10-03 Robert Graham Merkel <rgmerk at mira.net>
Index: gnc-plugin.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin.h,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Lsrc/gnome/gnc-plugin.h -Lsrc/gnome/gnc-plugin.h -u -r1.1.2.8 -r1.1.2.9
--- src/gnome/gnc-plugin.h
+++ src/gnome/gnc-plugin.h
@@ -80,6 +80,67 @@
const gchar *uri);
const gchar *gnc_plugin_get_name (GncPlugin *plugin);
+typedef struct {
+ const char *action_name;
+ const char *label;
+} action_short_labels;
+
+/** Add "short" labels to existing actions. The "short" label is the
+ * string used on toolbar buttons when the action is visible.
+ *
+ * @param action_group The group of all actions associated with a
+ * plugin or plugin page. All actions to me modified must be in this
+ * group.
+ *
+ * @param short_labels A pointer to a data structure containing
+ * [action name, label string] string pairs.
+ */
+void gnc_plugin_init_short_names (GtkActionGroup *action_group,
+ action_short_labels *short_labels);
+
+
+/** Update a property on a set of existing GtkActions. This function
+ * can be easily used to make a llist of actions visible, invisible,
+ * sensitive, or insensitive.
+ *
+ * @param action_group The group of all actions associated with a
+ * plugin or plugin page. All actions to be modified must be
+ * contained in this group.
+ *
+ * @param action_names A null terminated list of actions names that
+ * should modified.
+ *
+ * @param property_name The property name to be changed on the
+ * specified actions. The only two GtkAction properties that it makes
+ * sense to modify are "visible" and "sensitive".
+ *
+ * @param value A boolean specifying the new state for the specified
+ * property.
+ */
+void gnc_plugin_update_actions (GtkActionGroup *action_group,
+ const gchar **action_names,
+ const gchar *property_name,
+ gboolean value);
+
+
+/** Load a new set of actions into an existing UI.
+ *
+ * @param ui_merge The existing set of merged actions. This is the ui
+ * that a user sees. The actions from the ui file will be added to
+ * this ui.
+ *
+ * @param action_group The local action group. The actions from the
+ * ui file will be added to this private action group.
+ *
+ * @param filename The name of the ui file to load. This file name
+ * will be searched for in the ui directory.
+ *
+ * @return The merge_id number for the newly merged UI. If an error
+ * occurred, the return value is 0.
+ */
+gint gnc_plugin_add_actions (GtkUIManager *ui_merge,
+ GtkActionGroup *action_group,
+ const gchar *filename);
G_END_DECLS
#endif /* __GNC_PLUGIN_H */
Index: gnc-plugin.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-plugin.c,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Lsrc/gnome/gnc-plugin.c -Lsrc/gnome/gnc-plugin.c -u -r1.1.2.9 -r1.1.2.10
--- src/gnome/gnc-plugin.c
+++ src/gnome/gnc-plugin.c
@@ -27,6 +27,8 @@
#include "gnc-plugin.h"
#include "gnc-trace.h"
#include "gnc-gconf-utils.h"
+#include "gnc-gnome-utils.h"
+#include "messages.h"
static gpointer parent_class = NULL;
static short module = MOD_GUI;
@@ -198,6 +200,96 @@
return (GNC_PLUGIN_GET_CLASS(plugin)->plugin_name);
}
+
+/************************************************************
+ * Utility Functions *
+ ************************************************************/
+
+
+/** Add "short" labels to existing actions. The "short" label is the
+ * string used on toolbar buttons when the action is visible.*/
+void
+gnc_plugin_init_short_names (GtkActionGroup *action_group,
+ action_short_labels *short_labels)
+{
+ GtkAction *action;
+ GValue value = { 0, };
+ gint i;
+
+ g_value_init (&value, G_TYPE_STRING);
+
+ for (i = 0; short_labels[i].action_name; i++) {
+ /* Add a couple of short labels for the toolbar */
+ 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);
+ }
+}
+
+
+/** Update the status of existing UI actions. This function can
+ * modify actions making them visible, invisible, sensitive, or
+ * insensitive. */
+void
+gnc_plugin_update_actions (GtkActionGroup *action_group,
+ const gchar **action_names,
+ const gchar *property_name,
+ gboolean value)
+{
+ GtkAction *action;
+ GValue gvalue = { 0 };
+ gint i;
+
+ g_value_init (&gvalue, G_TYPE_BOOLEAN);
+ g_value_set_boolean (&gvalue, value);
+
+ for (i = 0; action_names[i]; i++) {
+ action = gtk_action_group_get_action (action_group, action_names[i]);
+ g_object_set_property (G_OBJECT(action), property_name, &gvalue);
+ }
+}
+
+
+/** Load a new set of actions into an existing UI. */
+gint
+gnc_plugin_add_actions (GtkUIManager *ui_merge,
+ GtkActionGroup *action_group,
+ const gchar *filename)
+{
+ GError *error = NULL;
+ gchar *pathname;
+ gint merge_id;
+
+ ENTER("ui_merge %p, action_group %p, filename %s",
+ ui_merge, action_group, filename);
+ g_return_val_if_fail (ui_merge, 0);
+ g_return_val_if_fail (action_group, 0);
+ g_return_val_if_fail (filename, 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 = 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) {
+ gtk_ui_manager_ensure_update (ui_merge);
+ } else {
+ g_critical("Failed to load ui file.\n Filename %s\n Error %s",
+ filename, error->message);
+ g_error_free(error);
+ }
+
+ g_free(pathname);
+ LEAVE(" ");
+ return merge_id;
+}
+
#if 0
static void
gnc_plugin_base_init (gpointer klass)
Index: gnc-gnome-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-gnome-utils.c,v
retrieving revision 1.2.4.10
retrieving revision 1.2.4.11
diff -Lsrc/gnome-utils/gnc-gnome-utils.c -Lsrc/gnome-utils/gnc-gnome-utils.c -u -r1.2.4.10 -r1.2.4.11
--- src/gnome-utils/gnc-gnome-utils.c
+++ src/gnome-utils/gnc-gnome-utils.c
@@ -289,89 +289,3 @@
return pixbuf;
}
-
-
-/** 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 (GtkActionGroup *action_group,
- action_short_labels *short_labels)
-{
- GtkAction *action;
- GValue value = { 0, };
- gint i;
-
- g_value_init (&value, G_TYPE_STRING);
-
- for (i = 0; short_labels[i].action_name; i++) {
- /* Add a couple of short labels for the toolbar */
- 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);
- }
-}
-
-
-/** Update the status of existing UI actions. This function can
- * modify actions making them visible, invisible, sensitive, or
- * insensitive. */
-void
-gnc_gnome_utils_update_actions (GtkActionGroup *action_group,
- const gchar **action_names,
- const gchar *property_name,
- gboolean enabled)
-{
- GtkAction *action;
- GValue value = { 0 };
- gint i;
-
- g_value_init (&value, G_TYPE_BOOLEAN);
- g_value_set_boolean (&value, enabled);
-
- for (i = 0; action_names[i]; i++) {
- action = gtk_action_group_get_action (action_group, action_names[i]);
- g_object_set_property (G_OBJECT(action), property_name, &value);
- }
-}
-
-
-
-/** Load a new set of actions into an existing UI. */
-gint
-gnc_menu_merge_add_actions (GtkUIManager *ui_merge,
- GtkActionGroup *action_group,
- const gchar *filename)
-{
- GError *error = NULL;
- gchar *pathname;
- gint merge_id;
-
- ENTER("ui_merge %p, action_group %p, filename %s",
- ui_merge, action_group, filename);
- g_return_val_if_fail (ui_merge, 0);
- g_return_val_if_fail (action_group, 0);
- g_return_val_if_fail (filename, 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 = 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) {
- gtk_ui_manager_ensure_update (ui_merge);
- } else {
- g_critical("Failed to load ui file.\n Filename %s\n Error %s",
- filename, error->message);
- g_error_free(error);
- }
-
- g_free(pathname);
- LEAVE(" ");
- return merge_id;
-}
Index: gnc-gnome-utils.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-gnome-utils.h,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -Lsrc/gnome-utils/gnc-gnome-utils.h -Lsrc/gnome-utils/gnc-gnome-utils.h -u -r1.1.4.7 -r1.1.4.8
--- src/gnome-utils/gnc-gnome-utils.h
+++ src/gnome-utils/gnc-gnome-utils.h
@@ -141,67 +141,5 @@
GdkPixbuf * gnc_gnome_get_gdkpixbuf (const char *name);
-typedef struct {
- const char *action_name;
- const char *label;
-} action_short_labels;
-
-/** Add "short" labels to existing actions. The "short" label is the
- * string used on toolbar buttons when the action is visible.
- *
- * @param action_group The group of all actions associated with a
- * plugin or plugin page. All actions to me modified must be in this
- * group.
- *
- * @param short_labels A pointer to a data structure containing
- * [action name, label string] string pairs.
- */
-void gnc_gnome_utils_init_short_names (GtkActionGroup *action_group,
- action_short_labels *short_labels);
-
-
-/** Update the status of existing UI actions. This function can
- * modify actions making them visible, invisible, sensitive, or
- * insensitive.
- *
- * @param action_group The group of all actions associated with a
- * plugin or plugin page. All actions to me modified must be in this
- * group.
- *
- * @param action_names A NULL terminated list of strings containing
- * the names of actions. The actions named in this list will be
- * modified.
- *
- * @param property_name The property name to be changed on the
- * specified actions. This name must be either "visible" oor
- * "sensitive".
- *
- * @param enabled A boolean specifying the new state of the
- * associated property.
- */
-void gnc_gnome_utils_update_actions (GtkActionGroup *action_group,
- const gchar **action_names,
- const gchar *property_name,
- gboolean enabled);
-
-
-/** Load a new set of actions into an existing UI.
- *
- * @param ui_merge The existing set of merged actions. This is the ui
- * that a user sees. The actions from the ui file will be added to
- * this ui.
- *
- * @param action_group The local action group. The actions from the
- * ui file will be added to this private action group.
- *
- * @param filename The name of the ui file to load. This file name
- * will be searched for in the ui directory.
- *
- * @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 (GtkUIManager *ui_merge,
- GtkActionGroup *action_group,
- const gchar *filename);
#endif
/** @} */
More information about the gnucash-changes
mailing list