[Gnucash-changes] r14316 - gnucash/trunk - Bug#343772: Re-enable
View Lots; disable 'View' button. Fix clist/lot-title handling bug.
Joshua Sled
jsled at cvs.gnucash.org
Sat Jun 3 20:51:37 EDT 2006
Author: jsled
Date: 2006-06-03 20:51:35 -0400 (Sat, 03 Jun 2006)
New Revision: 14316
Trac: http://svn.gnucash.org/trac/changeset/14316
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/src/gnome/glade/lots.glade
gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
gnucash/trunk/src/gnome/gnc-plugin-page-register.c
gnucash/trunk/src/gnome/lot-viewer.c
gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
gnucash/trunk/src/gnome/ui/gnc-plugin-page-register-ui.xml
Log:
Bug#343772: Re-enable View Lots; disable 'View' button. Fix clist/lot-title handling bug.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/ChangeLog 2006-06-04 00:51:35 UTC (rev 14316)
@@ -1,3 +1,13 @@
+2006-06-03 Joshua Sled <jsled at asynchronous.org>
+
+ * src/gnome/ui/gnc-plugin-page-register-ui.xml:
+ * src/gnome/ui/gnc-plugin-page-account-tree-ui.xml:
+ * src/gnome/glade/lots.glade:
+ * src/gnome/gnc-plugin-page-account-tree.c:
+ * src/gnome/gnc-plugin-page-register.c:
+ * src/gnome/lot-viewer.c: Re-enable View Lots; disable 'View' button. Fix
+ clist/lot-title handling bug. Bug#343772.
+
2006-06-03 David Hampton <hampton at employees.org>
* src/register/register-gnome/combocell-gnome.c:
Modified: gnucash/trunk/src/gnome/glade/lots.glade
===================================================================
--- gnucash/trunk/src/gnome/glade/lots.glade 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/src/gnome/glade/lots.glade 2006-06-04 00:51:35 UTC (rev 14316)
@@ -192,6 +192,7 @@
</widget>
</child>
+<!-- The View button is not implemented, remove it
<child>
<widget class="GtkButton" id="regview button">
<property name="visible">True</property>
@@ -264,6 +265,7 @@
</child>
</widget>
</child>
+ -->
<child>
<widget class="GtkButton" id="button5">
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-account-tree.c 2006-06-04 00:51:35 UTC (rev 14316)
@@ -129,9 +129,7 @@
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);
-#ifdef LOTS_READY_FOR_SHOWTIME
static void gnc_plugin_page_account_tree_cmd_lots (GtkAction *action, GncPluginPageAccountTree *page);
-#endif
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);
@@ -183,11 +181,9 @@
{ "ActionsStockSplitAction", NULL, N_("Stoc_k Split..."), NULL,
N_("Record a stock split or a stock merger"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_stock_split) },
-#ifdef LOTS_READY_FOR_SHOWTIME
{ "ActionsLotsAction", NULL, N_("View _Lots..."), NULL,
N_("Bring up the lot viewer/editor window"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_lots) },
-#endif
{ "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) },
@@ -211,9 +207,7 @@
"EditEditAccountAction",
"EditDeleteAccountAction",
"ActionsReconcileAction",
-#ifdef LOTS_READY_FOR_SHOWTIME
"ActionsLotsAction",
-#endif
NULL
};
@@ -1189,7 +1183,6 @@
gnc_stock_split_dialog (window, account);
}
-#ifdef LOTS_READY_FOR_SHOWTIME
static void
gnc_plugin_page_account_tree_cmd_lots (GtkAction *action,
GncPluginPageAccountTree *page)
@@ -1199,7 +1192,6 @@
account = gnc_plugin_page_account_tree_get_current_account (page);
gnc_lot_viewer_dialog (account);
}
-#endif
static void
gnc_plugin_page_account_tree_cmd_scrub (GtkAction *action, GncPluginPageAccountTree *page)
Modified: gnucash/trunk/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/src/gnome/gnc-plugin-page-register.c 2006-06-04 00:51:35 UTC (rev 14316)
@@ -131,9 +131,7 @@
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);
-#ifdef LOTS_READY_FOR_SHOWTIME
static void gnc_plugin_page_register_cmd_lots (GtkAction *action, GncPluginPageRegister *plugin_page);
-#endif
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);
@@ -236,11 +234,9 @@
{ "ActionsStockSplitAction", NULL, N_("Stoc_k Split..."), NULL,
N_("Record a stock split or a stock merger"),
G_CALLBACK (gnc_plugin_page_register_cmd_stock_split) },
-#ifdef LOTS_READY_FOR_SHOWTIME
{ "ActionsLotsAction", NULL, N_("_Lot Viewer..."), NULL,
N_("Bring up the lot viewer/editor window"),
G_CALLBACK (gnc_plugin_page_register_cmd_lots) },
-#endif
{ "BlankTransactionAction", GTK_STOCK_GOTO_BOTTOM, 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) },
@@ -311,9 +307,7 @@
static const gchar *actions_requiring_account[] = {
"EditEditAccountAction",
"ActionsReconcileAction",
-#ifdef LOTS_READY_FOR_SHOWTIME
"ActionsLotsAction",
-#endif
NULL
};
@@ -2337,7 +2331,6 @@
LEAVE(" ");
}
-#ifdef LOTS_READY_FOR_SHOWTIME
static void
gnc_plugin_page_register_cmd_lots (GtkAction *action,
GncPluginPageRegister *page)
@@ -2352,7 +2345,6 @@
gnc_lot_viewer_dialog (account);
LEAVE(" ");
}
-#endif
static void
gnc_plugin_page_register_cmd_enter_transaction (GtkAction *action,
Modified: gnucash/trunk/src/gnome/lot-viewer.c
===================================================================
--- gnucash/trunk/src/gnome/lot-viewer.c 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/src/gnome/lot-viewer.c 2006-06-04 00:51:35 UTC (rev 14316)
@@ -76,7 +76,9 @@
struct _GNCLotViewer
{
GtkWidget * window;
+#ifdef LOTS_READY_FOR_SHOWTIME
GtkButton * regview_button;
+#endif
GtkButton * delete_button;
GtkButton * scrub_lot_button;
GtkPaned * lot_hpaned;
@@ -255,7 +257,9 @@
lv_show_splits (lv);
+#ifdef LOTS_READY_FOR_SHOWTIME
gtk_widget_set_sensitive(GTK_WIDGET(lv->regview_button), TRUE);
+#endif
gtk_widget_set_sensitive(GTK_WIDGET(lv->delete_button), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(lv->scrub_lot_button), TRUE);
}
@@ -280,7 +284,9 @@
/* Erase the mini-view area */
lv_clear_splits (lv);
+#ifdef LOTS_READY_FOR_SHOWTIME
gtk_widget_set_sensitive(GTK_WIDGET(lv->regview_button), FALSE);
+#endif
gtk_widget_set_sensitive(GTK_WIDGET(lv->delete_button), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(lv->scrub_lot_button), FALSE);
}
@@ -300,6 +306,9 @@
const char * str;
char * notes;
+ if (lv->selected_row < 0)
+ return;
+
/* Get the title, plunk it into ctree */
str = gtk_entry_get_text (lv->title_entry);
gtk_clist_set_text (lv->lot_clist, row, TITLE_COL, str);
@@ -588,7 +597,9 @@
xaccAccountGetName(lv->account));
gtk_window_set_title (GTK_WINDOW (lv->window), win_title);
+#ifdef LOTS_READY_FOR_SHOWTIME
lv->regview_button = GTK_BUTTON(glade_xml_get_widget (xml, "regview button"));
+#endif
lv->delete_button = GTK_BUTTON(glade_xml_get_widget (xml, "delete button"));
lv->scrub_lot_button = GTK_BUTTON(glade_xml_get_widget (xml, "scrub lot button"));
Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-account-tree-ui.xml 2006-06-04 00:51:35 UTC (rev 14316)
@@ -27,7 +27,7 @@
<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
- <!-- menuitem name="ActionLots" action="ActionsLotsAction"/ -->
+ <menuitem name="ActionLots" action="ActionsLotsAction"/>
<separator name="ActionsSep2"/>
<menu name="ScrubMenu" action="ScrubMenuAction">
<menuitem name="Scrub" action="ScrubAction"/>
@@ -47,7 +47,7 @@
<menuitem name="AccountReconcile" action="ActionsReconcileAction"/>
<menuitem name="AccountTransfer" action="ActionsTransferAction"/>
<menuitem name="AccountStockSplit" action="ActionsStockSplitAction"/>
- <!-- menuitem name="AccountLots" action="ActionsLotsAction"/ -->
+ <menuitem name="AccountLots" action="ActionsLotsAction"/>
<separator name="AccountSep2"/>
<menuitem name="AccountNewAccount" action="FileNewAccountAction"/>
<menuitem name="AccountDeleteAccount" action="EditDeleteAccountAction"/>
Modified: gnucash/trunk/src/gnome/ui/gnc-plugin-page-register-ui.xml
===================================================================
--- gnucash/trunk/src/gnome/ui/gnc-plugin-page-register-ui.xml 2006-06-03 23:15:28 UTC (rev 14315)
+++ gnucash/trunk/src/gnome/ui/gnc-plugin-page-register-ui.xml 2006-06-04 00:51:35 UTC (rev 14316)
@@ -38,7 +38,7 @@
<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
<menuitem name="ActionsReconcile" action="ActionsReconcileAction"/>
<menuitem name="ActionsStockSplit" action="ActionsStockSplitAction"/>
- <!-- menuitem name="ActionLots" action="ActionsLotsAction"/ -->
+ <menuitem name="ActionLots" action="ActionsLotsAction"/>
<separator name="ActionsSep4"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
More information about the gnucash-changes
mailing list