[Gnucash-changes] r13473 - gnucash/trunk - Add, register,
use Split and Transfer icons provided by Andrew Duggan. Bug#327647.
Joshua Sled
jsled at cvs.gnucash.org
Sat Mar 4 10:51:29 EST 2006
Author: jsled
Date: 2006-03-04 10:51:28 -0500 (Sat, 04 Mar 2006)
New Revision: 13473
Trac: http://svn.gnucash.org/trac/changeset/13473
Added:
gnucash/trunk/src/gnome/ui/icon-split.png
gnucash/trunk/src/gnome/ui/icon-transfer.png
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome-utils/gnc-dir.h.in
gnucash/trunk/src/gnome/gnc-plugin-page-register.c
gnucash/trunk/src/gnome/ui/Makefile.am
Log:
Add, register, use Split and Transfer icons provided by Andrew Duggan. Bug#327647.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-03-04 15:50:20 UTC (rev 13472)
+++ gnucash/trunk/ChangeLog 2006-03-04 15:51:28 UTC (rev 13473)
@@ -1,5 +1,17 @@
2006-03-04 Joshua Sled <jsled at asynchronous.org>
+ * src/gnome/ui/icon-split.png:
+ * src/gnome/ui/icon-transfer.png:
+ Add split, transfer icons provided by Andrew Duggan
+ <cmkrnl at speakeasy.net>.
+
+ * src/gnome-utils/gnc-dir.h.in:
+ * src/gnome-utils/Makefile.am (gnc-dir.h):
+ * src/gnome/gnc-plugin-page-register.c
+ (gnc_plugin_page_register_actions)
+ (gnc_plugin_page_register_class_init): Add registration, use of
+ gnucash-provided (split, transactions) icons. Bug#327647.
+
* src/gnome-utils/gnc-menu-extensions.c (gnc_extension_path):
Fixes to memory deallocation suggested by Phil Longstaff
<plongstaff at newearth.org>.
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-03-04 15:50:20 UTC (rev 13472)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-03-04 15:51:28 UTC (rev 13473)
@@ -51,6 +51,7 @@
#include "dialog-transfer.h"
#include "dialog-utils.h"
#include "druid-stock-split.h"
+#include "gnc-dir.h"
#include "gnc-book.h"
#include "gnc-gconf-utils.h"
#include "gnc-component-manager.h"
@@ -82,6 +83,9 @@
#define DEFAULT_LINES_OPTION_NAME KEY_NUMBER_OF_ROWS
#define DEFAULT_LINES_AMOUNT 20
+#define GNC_STOCK_SPLIT "gnc-stock-split"
+#define GNC_STOCK_TRANSFER "gnc-stock-transfer"
+
static void gnc_plugin_page_register_class_init (GncPluginPageRegisterClass *klass);
static void gnc_plugin_page_register_init (GncPluginPageRegister *plugin_page);
static void gnc_plugin_page_register_finalize (GObject *object);
@@ -218,7 +222,7 @@
/* Actions menu */
- { "ActionsTransferAction", GTK_STOCK_MISSING_IMAGE, N_("_Transfer..."), "<control>t",
+ { "ActionsTransferAction", GNC_STOCK_TRANSFER, N_("_Transfer..."), "<control>t",
N_("Transfer funds from one account to another"),
G_CALLBACK (gnc_plugin_page_register_cmd_transfer) },
{ "ActionsReconcileAction", NULL, N_("_Reconcile..."), NULL,
@@ -265,7 +269,7 @@
N_("Show two lines of information for each transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_style_double_line), FALSE },
- { "SplitTransactionAction", GTK_STOCK_MISSING_IMAGE, N_("S_plit Transaction"), NULL,
+ { "SplitTransactionAction", GNC_STOCK_SPLIT, N_("S_plit Transaction"), NULL,
N_("Show all splits in the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_expand_transaction), FALSE },
};
@@ -506,6 +510,35 @@
gnc_plugin_class->update_edit_menu_actions = gnc_plugin_page_register_update_edit_menu;
g_type_class_add_private(klass, sizeof(GncPluginPageRegisterPrivate));
+
+ // setup custom icons
+ {
+ // http://www.gtk.org/api/2.6/gtk/migrating-gnomeuiinfo.html
+ GtkIconFactory *icon_factory;
+ GtkIconSet *icon_set;
+ GtkIconSource *icon_source;
+
+ icon_factory = gtk_icon_factory_new();
+
+ icon_set = gtk_icon_set_new();
+ icon_source = gtk_icon_source_new();
+ gtk_icon_source_set_filename(icon_source, GNC_UI_DIR "/icon-split.png");
+ gtk_icon_set_add_source(icon_set, icon_source);
+ gtk_icon_source_free(icon_source);
+ gtk_icon_factory_add(icon_factory, GNC_STOCK_SPLIT, icon_set);
+ gtk_icon_set_unref(icon_set);
+
+ icon_set = gtk_icon_set_new();
+ icon_source = gtk_icon_source_new();
+ gtk_icon_source_set_filename(icon_source, GNC_UI_DIR "/icon-transfer.png");
+ gtk_icon_set_add_source(icon_set, icon_source);
+ gtk_icon_source_free(icon_source);
+ gtk_icon_factory_add(icon_factory, GNC_STOCK_TRANSFER, icon_set);
+ gtk_icon_set_unref(icon_set);
+
+ gtk_icon_factory_add_default(icon_factory);
+ g_object_unref(icon_factory);
+ }
}
static void
Modified: gnucash/trunk/src/gnome/ui/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/ui/Makefile.am 2006-03-04 15:50:20 UTC (rev 13472)
+++ gnucash/trunk/src/gnome/ui/Makefile.am 2006-03-04 15:51:28 UTC (rev 13473)
@@ -12,6 +12,8 @@
gnc-sxed-to-create-window-ui.xml \
gnc-reconcile-window-ui.xml \
gnc-sxed-window-ui.xml \
- gnc-sxed-window-ui-full.xml
+ gnc-sxed-window-ui-full.xml \
+ icon-split.png \
+ icon-transfer.png
EXTRA_DIST = $(ui_DATA)
Added: gnucash/trunk/src/gnome/ui/icon-split.png
===================================================================
(Binary files differ)
Property changes on: gnucash/trunk/src/gnome/ui/icon-split.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: gnucash/trunk/src/gnome/ui/icon-transfer.png
===================================================================
(Binary files differ)
Property changes on: gnucash/trunk/src/gnome/ui/icon-transfer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2006-03-04 15:50:20 UTC (rev 13472)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2006-03-04 15:51:28 UTC (rev 13473)
@@ -221,6 +221,7 @@
sed < $< > $@.tmp \
-e 's:@-GNC_ACCOUNTS_DIR-@:${GNC_ACCOUNTS_DIR}:g' \
-e 's:@-GNC_GLADE_DIR-@:${GNC_GLADE_DIR}:g' \
+ -e 's:@-GNC_UI_DIR-@:${GNC_UI_DIR}:g' \
-e 's:@-GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY-@:${GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY}:g'
mv $@.tmp $@
Modified: gnucash/trunk/src/gnome-utils/gnc-dir.h.in
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-dir.h.in 2006-03-04 15:50:20 UTC (rev 13472)
+++ gnucash/trunk/src/gnome-utils/gnc-dir.h.in 2006-03-04 15:51:28 UTC (rev 13473)
@@ -25,6 +25,7 @@
#define GNC_ACCOUNTS_DIR "@-GNC_ACCOUNTS_DIR-@"
#define GNC_GLADE_DIR "@-GNC_GLADE_DIR-@"
+#define GNC_UI_DIR "@-GNC_UI_DIR-@"
#define GNC_GCONF_DIR "@-GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY-@"
#endif
More information about the gnucash-changes
mailing list