[Gnucash-changes] r13485 - gnucash/trunk - Consolidate the new
icons with the existing set of icons.
David Hampton
hampton at cvs.gnucash.org
Sat Mar 4 19:55:10 EST 2006
Author: hampton
Date: 2006-03-04 19:55:10 -0500 (Sat, 04 Mar 2006)
New Revision: 13485
Trac: http://svn.gnucash.org/trac/changeset/13485
Added:
gnucash/trunk/src/pixmaps/split-transaction-16.png
gnucash/trunk/src/pixmaps/split-transaction.png
gnucash/trunk/src/pixmaps/transfer-16.png
gnucash/trunk/src/pixmaps/transfer.png
Removed:
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-utils/gnc-icons.c
gnucash/trunk/src/gnome-utils/gnc-icons.h
gnucash/trunk/src/gnome/gnc-plugin-page-register.c
gnucash/trunk/src/gnome/ui/Makefile.am
gnucash/trunk/src/pixmaps/Makefile.am
Log:
Consolidate the new icons with the existing set of icons.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-03-04 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/ChangeLog 2006-03-05 00:55:10 UTC (rev 13485)
@@ -1,5 +1,13 @@
2006-03-04 David Hampton <hampton at employees.org>
+ * src/pixmaps/*
+ * src/gnome-utils/Makefile.am:
+ * src/gnome-utils/gnc-icons.[ch]:
+ * src/gnome-utils/gnc-dir.h.in:
+ * src/gnome/gnc-plugin-page-register.c:
+ * src/gnome/ui/*: Consolidate the new icons with the existing set
+ of icons.
+
* src/gnome-utils/gnc-tree-model-account.c:
* src/engine/Account.c:
* src/engine/Group.c: Rework the events generated by the
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-03-04 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-03-05 00:55:10 UTC (rev 13485)
@@ -51,7 +51,6 @@
#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"
@@ -83,9 +82,6 @@
#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);
@@ -269,7 +265,7 @@
N_("Show two lines of information for each transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_style_double_line), FALSE },
- { "SplitTransactionAction", GNC_STOCK_SPLIT, N_("S_plit Transaction"), NULL,
+ { "SplitTransactionAction", GNC_STOCK_SPLIT_TRANS, N_("S_plit Transaction"), NULL,
N_("Show all splits in the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_expand_transaction), FALSE },
};
@@ -510,35 +506,6 @@
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 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/gnome/ui/Makefile.am 2006-03-05 00:55:10 UTC (rev 13485)
@@ -12,8 +12,6 @@
gnc-sxed-to-create-window-ui.xml \
gnc-reconcile-window-ui.xml \
gnc-sxed-window-ui.xml \
- gnc-sxed-window-ui-full.xml \
- icon-split.png \
- icon-transfer.png
+ gnc-sxed-window-ui-full.xml
EXTRA_DIST = $(ui_DATA)
Deleted: gnucash/trunk/src/gnome/ui/icon-split.png
===================================================================
(Binary files differ)
Deleted: gnucash/trunk/src/gnome/ui/icon-transfer.png
===================================================================
(Binary files differ)
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2006-03-04 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2006-03-05 00:55:10 UTC (rev 13485)
@@ -221,7 +221,6 @@
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 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/gnome-utils/gnc-dir.h.in 2006-03-05 00:55:10 UTC (rev 13485)
@@ -25,7 +25,6 @@
#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
Modified: gnucash/trunk/src/gnome-utils/gnc-icons.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-icons.c 2006-03-04 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/gnome-utils/gnc-icons.c 2006-03-05 00:55:10 UTC (rev 13485)
@@ -16,6 +16,8 @@
{ GNC_STOCK_EDIT_ACCOUNT, N_("_Edit Account"), 0, 0, NULL },
{ GNC_STOCK_NEW_ACCOUNT, N_("_New Account"), 0, 0, NULL },
{ GNC_STOCK_OPEN_ACCOUNT, N_("_Open Account"), 0, 0, NULL },
+ { GNC_STOCK_TRANSFER, N_("_Transfer..."), 0, 0, NULL },
+ { GNC_STOCK_SPLIT_TRANS, N_("S_plit Transaction"), 0, 0, NULL },
};
static void
@@ -86,5 +88,9 @@
"new-account.png", "new-account-16.png");
gnc_add_stock_icon_pair (factory, GNC_STOCK_OPEN_ACCOUNT,
"open-account.png", "open-account-16.png");
+ gnc_add_stock_icon_pair (factory, GNC_STOCK_TRANSFER,
+ "transfer.png", "transfer-16.png");
+ gnc_add_stock_icon_pair (factory, GNC_STOCK_SPLIT_TRANS,
+ "split-transaction.png", "split-transaction-16.png");
gtk_icon_factory_add_default (factory);
}
Modified: gnucash/trunk/src/gnome-utils/gnc-icons.h
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-icons.h 2006-03-04 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/gnome-utils/gnc-icons.h 2006-03-05 00:55:10 UTC (rev 13485)
@@ -14,6 +14,8 @@
#define GNC_STOCK_EDIT_ACCOUNT "gnc-edit-account"
#define GNC_STOCK_NEW_ACCOUNT "gnc-new-account"
#define GNC_STOCK_OPEN_ACCOUNT "gnc-open-account"
+#define GNC_STOCK_SPLIT_TRANS "gnc-split-transaction"
+#define GNC_STOCK_TRANSFER "gnc-transfer"
//FIXME: use own budget icons?
#define GNC_STOCK_BUDGET "gnc-budget"
Modified: gnucash/trunk/src/pixmaps/Makefile.am
===================================================================
--- gnucash/trunk/src/pixmaps/Makefile.am 2006-03-04 23:24:14 UTC (rev 13484)
+++ gnucash/trunk/src/pixmaps/Makefile.am 2006-03-05 00:55:10 UTC (rev 13485)
@@ -14,6 +14,10 @@
new-account.png \
open-account-16.png \
open-account.png \
+ split-transaction-16.png \
+ split-transaction.png \
+ transfer-16.png \
+ transfer.png \
stock_split_title.png \
stock_split_watermark.png
Added: gnucash/trunk/src/pixmaps/split-transaction-16.png
===================================================================
(Binary files differ)
Property changes on: gnucash/trunk/src/pixmaps/split-transaction-16.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: gnucash/trunk/src/pixmaps/split-transaction.png (from rev 13477, gnucash/trunk/src/gnome/ui/icon-split.png)
Added: gnucash/trunk/src/pixmaps/transfer-16.png
===================================================================
(Binary files differ)
Property changes on: gnucash/trunk/src/pixmaps/transfer-16.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: gnucash/trunk/src/pixmaps/transfer.png (from rev 13477, gnucash/trunk/src/gnome/ui/icon-transfer.png)
More information about the gnucash-changes
mailing list