IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix UI of SX-related registers.

Browse Source 
2006-01-28  Joshua Sled  <jsled@asynchronous.org>

	* src/gnome/ui/gnc-sxed-window-ui-full.xml: Add.
	* src/gnome/dialog-scheduledxaction.c (gnc_sxed_menu_entries) 
	(schedXact_editor_create_ledger)
	* src/gnome/dialog-sxsincelast.c (create_autoCreate_ledger) 
	(create_created_ledger, create_to_create_ledger) 
	(gnc_sxsld_menu_entries): Setup SX-related registers to only
	display and allow relevant register functionality. Bug#327642.

	* src/gnome/gnc-plugin-page-register.c
	(gnc_plugin_page_register_actions): Change stock icons for
	BlankTransaction and ScheduleTransaction Actions.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13011 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Joshua Sled 2006-01-28 21:44:28 +00:00
parent 117e62a917
commit 6db18440d2
9 changed files with 119 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2006-01-28 Joshua Sled <jsled@asynchronous.org>
* src/gnome/ui/gnc-sxed-window-ui-full.xml: Add.
* src/gnome/dialog-scheduledxaction.c (gnc_sxed_menu_entries)
(schedXact_editor_create_ledger)
* src/gnome/dialog-sxsincelast.c (create_autoCreate_ledger)
(create_created_ledger, create_to_create_ledger)
(gnc_sxsld_menu_entries): Setup SX-related registers to only
display and allow relevant register functionality. Bug#327642.
* src/gnome/gnc-plugin-page-register.c
(gnc_plugin_page_register_actions): Change stock icons for
BlankTransaction and ScheduleTransaction Actions.
2006-01-28 Joshua Sled <jsled@asynchronous.org>
* lib/libgsf-1.12.3/gsf-gnome/Makefile.am (pkglib_LTLIBRARIES)

46
src/gnome/dialog-scheduledxaction.c
View File

@ -230,25 +230,12 @@ static SxRuntimeInfo* _new_sx_runtime_info( SchedXaction *sx );
static void _clear_runtime_info_row( gpointer key, gpointer value, gpointer user_data );
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 GtkActionEntry gnc_sxed_menu_entries [] =
{
/* Toplevel */
{ "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
{ "TransactionAction", NULL, N_("_Transaction"), NULL, NULL, NULL },
{ "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
{ "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
{ "TransactionAction", NULL, N_("_Transaction"), NULL, NULL, NULL },
/* Edit menu */
{ "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), "<control>x",
NULL, G_CALLBACK (gnc_sxed_cmd_edit_cut) },
{ "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), "<control>c",
NULL, G_CALLBACK (gnc_sxed_cmd_edit_copy) },
{ "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), "<control>v",
NULL, G_CALLBACK (gnc_sxed_cmd_edit_paste) },
};
static guint gnc_sxed_menu_n_entries = G_N_ELEMENTS (gnc_sxed_menu_entries);
@ -1586,7 +1573,7 @@ schedXact_editor_create_ledger( SchedXactionEditorDialog *sxed )
/* Now create the register plugin page. */
sxed->plugin_page = gnc_plugin_page_register_new_ledger (sxed->ledger);
gnc_plugin_page_set_ui_description (sxed->plugin_page,
"gnc-plugin-page-sxregister-ui.xml");
"gnc-sxed-window-ui-full.xml");
gnc_plugin_page_register_set_options (sxed->plugin_page,
NULL, NULL,
NUM_LEDGER_LINES_DEFAULT,
@ -2437,35 +2424,6 @@ sxed_excal_update_adapt( GtkObject *o, gpointer ud )
gnc_sxed_update_cal( (SchedXactionEditorDialog*)ud );
}
/* Command callbacks */
/**
* Note that these don't actually need to be implemented... since these map
* to conventional menu action names "EditCutAction", "EditCopyAction" and
* "EditPasteAction". Specifically, ones that the register plugin page in
* the gnc-embedded-window in this page is going to bind it's own handlers to
* shortly after the menu is created. BUT, these symbols need to be defined
* for the action structure above, and at runtime when we merge the ui
* partially in place...
**/
static void
gnc_sxed_cmd_edit_cut (GtkAction *action, SchedXactionEditorDialog *sxed)
{
// nop
}
static void
gnc_sxed_cmd_edit_copy (GtkAction *action, SchedXactionEditorDialog *sxed)
{
// nop
}
static void
gnc_sxed_cmd_edit_paste (GtkAction *action, SchedXactionEditorDialog *sxed)
{
// nop
}
void on_sx_check_toggled (GtkWidget *togglebutton, gpointer user_data);
void

47
src/gnome/dialog-sxsincelast.c
View File

@ -293,7 +293,10 @@ static void create_autoCreate_ledger( sxSinceLastData *sxsld );
static void create_created_ledger( sxSinceLastData *sxsld );
static void create_to_create_ledger( sxSinceLastData *sxsld );
static void gnc_sxsld_commit_ledgers( sxSinceLastData *sxsld );
#if 0
static void sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld );
#endif
static gint sxsincelast_populate( sxSinceLastData *sxsld );
static void sxsincelast_druid_cancelled( GnomeDruid *druid, gpointer ud );
@ -383,32 +386,13 @@ static gint sxsld_create_to_create_txns( sxSinceLastData *sxsld,
toCreateInstance *tci );
static gint sxsld_get_future_created_txn_count( 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 GtkActionEntry gnc_sxsld_menu_entries [] =
{
/* Toplevel */
{ "EditAction", NULL, N_("_Edit"), NULL, NULL, NULL },
{ "TransactionAction", NULL, N_("_Transaction"), NULL, NULL, NULL },
{ "ViewAction", NULL, N_("_View"), NULL, NULL, NULL },
{ "ActionsAction", NULL, N_("_Actions"), NULL, NULL, NULL },
/* Edit menu */
{ "EditCutAction", GTK_STOCK_CUT, N_("Cu_t"), "<control>x",
NULL,
G_CALLBACK (gnc_sxsld_cmd_edit_cut) },
{ "EditCopyAction", GTK_STOCK_COPY, N_("_Copy"), "<control>c",
NULL,
G_CALLBACK (gnc_sxsld_cmd_edit_copy) },
{ "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), "<control>v",
NULL,
G_CALLBACK (gnc_sxsld_cmd_edit_paste) },
/* Actions menu */
{ "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) },
};
static guint gnc_sxsld_menu_n_entries = G_N_ELEMENTS (gnc_sxsld_menu_entries);
@ -1034,8 +1018,6 @@ to_create_prep( GnomeDruidPage *druid_page,
clean_variable_table( sxsld );
add_to_create_list_to_gui( sxsld->toCreateList, sxsld );
gtk_clist_thaw( GTK_CLIST(w) );
gnome_druid_set_buttons_sensitive(
sxsld->sincelast_druid,
@ -3643,6 +3625,7 @@ create_created_ledger( sxSinceLastData *sxsld )
gnc_split_register_show_present_divider( splitreg, FALSE );
}
#if 0
static
void
sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld )
@ -3708,6 +3691,7 @@ sxsld_jump_to_real_txn( GtkAction *action, sxSinceLastData *sxsld )
g_signal_stop_emission_by_name(gsr, "jump");
}
#endif
static void
create_to_create_ledger( sxSinceLastData *sxsld )
@ -3737,10 +3721,10 @@ create_to_create_ledger( sxSinceLastData *sxsld )
/* Then the register in it */
sxsld->to_create_register = gnc_plugin_page_register_new_ledger(sxsld->to_create_ledger);
gnc_plugin_page_set_ui_description (sxsld->to_create_register,
"gnc-plugin-page-sxregister-ui.xml");
"gnc-sxed-to-create-window-ui.xml");
gnc_plugin_page_register_set_options (sxsld->to_create_register,
NULL, NULL, 4,
CAP_READ_ONLY | CAP_SCHEDULE);
CAP_READ_ONLY);
gnc_embedded_window_open_page (sxsld->to_create_window, sxsld->to_create_register);
/* Now configure the register */
@ -3915,18 +3899,3 @@ gnc_sxsld_commit_ledgers( sxSinceLastData *sxsld )
TRUE );
}
/* Command callbacks */
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)
{
}

6
src/gnome/gnc-plugin-page-register.c
View File

@ -226,7 +226,7 @@ static GtkActionEntry gnc_plugin_page_register_actions [] =
{ "ActionsLotsAction", NULL, N_("_Lot Viewer..."), NULL,
N_("Bring up the lot viewer/editor window"),
G_CALLBACK (gnc_plugin_page_register_cmd_lots) },
{ "BlankTransactionAction", GTK_STOCK_MISSING_IMAGE, N_("_Blank Transaction"), NULL,
{ "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) },
{ "EditExchangeRateAction", GTK_STOCK_MISSING_IMAGE, N_("Edit E_xchange Rate"), NULL,
@ -235,7 +235,7 @@ static GtkActionEntry gnc_plugin_page_register_actions [] =
{ "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", GTK_STOCK_COPY, N_("Schedule..."), NULL,
{ "ScheduleTransactionAction", GTK_STOCK_REDO, N_("Schedule..."), NULL,
N_("Create a Scheduled Transaction with the current transaction as a template"),
G_CALLBACK (gnc_plugin_page_register_cmd_schedule) },
{ "ScrubAllAction", NULL, N_("_All transactions"), NULL,
@ -869,7 +869,7 @@ gnc_plugin_page_register_restore_edit_menu (GncPluginPage *page,
DEBUG("Setting style: %d", i);
action_group =
gnc_plugin_page_get_action_group(page);
action= gtk_action_group_get_action(action_group, radio_entries_2[i].name);
action = gtk_action_group_get_action(action_group, radio_entries_2[i].name);
gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE);
}

3
src/gnome/ui/Makefile.am
View File

@ -10,6 +10,7 @@ ui_DATA = \
gnc-plugin-page-register-ui.xml \
gnc-plugin-page-sxregister-ui.xml \
gnc-sxed-to-create-window-ui.xml \
gnc-sxed-window-ui.xml
gnc-sxed-window-ui.xml \
gnc-sxed-window-ui-full.xml
EXTRA_DIST = $(ui_DATA)

66
src/gnome/ui/gnc-plugin-page-sxregister-ui.xml
View File

@ -1,74 +1,54 @@
<ui>
<menubar>
<!-- menu name="Transaction" action="TransactionAction">
<menu name="Edit" action="EditAction">
<menuitem name="EditCut" action="EditCutAction"/>
<menuitem name="EditCopy" action="EditCopyAction"/>
<menuitem name="EditPaste" action="EditPasteAction"/>
</menu>
<menu name="Transaction" action="TransactionAction">
<menuitem name="CutTransaction" action="CutTransactionAction"/>
<menuitem name="CopyTransaction" action="CopyTransactionAction"/>
<menuitem name="PasteTransaction" action="PasteTransactionAction"/>
<separator name="TransactionSep2"/>
<menuitem name="VoidTransaction" action="VoidTransactionAction"/>
<menuitem name="UnvoidTransaction" action="UnvoidTransactionAction"/>
<menuitem name="ReverseTransaction" action="ReverseTransactionAction"/>
</menu -->
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<separator name="TransactionSep1"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
</menu>
<menu name="View" action="ViewAction">
<placeholder name="ViewContentPlaceholder">
<menuitem name="ViewStyleBasic" action="ViewStyleBasicAction"/>
<menuitem name="ViewStyleAutoSplit" action="ViewStyleAutoSplitAction"/>
<menuitem name="ViewStyleJournal" action="ViewStyleJournalAction"/>
<separator name="ViewSep65"/>
<menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
<separator name="ViewSep66"/>
</placeholder>
<placeholder name="ViewSortPlaceholder">
<menuitem name="ViewSortBy" action="ViewSortByAction"/>
</placeholder>
</menu>
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder">
<separator name="ActionsSep3"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<separator name="ActionsSep4"/>
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
<menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
<menuitem name="ScheduleTransaction" action="ScheduleTransactionAction"/>
<menuitem name="JumpTransaction" action="JumpTransactionAction"/>
<separator name="ActionsSep5"/>
</placeholder>
</menu>
</menubar>
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder">
<toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
<toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
<toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
<toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
<separator name="ToolbarSep66"/>
<toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
<toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
<toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
<toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
<separator name="ToolbarSep67"/>
<toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
<toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
<toolitem name="ToolbarSplitTransaction" action="SplitTransactionAction"/>
<toolitem name="ToolbarJumpTransaction" action="JumpTransactionAction"/>
<separator name="ToolbarSep68"/>
<toolitem name="ToolbarTransfer" action="ActionsTransferAction"/>
<toolitem name="ToolbarScheduleTransaction" action="ScheduleTransactionAction"/>
</placeholder>
</toolbar>
<popup name="RegisterPopup" action="FakeToplevel">
<menuitem name="ViewSortBy" action="ViewSortByAction"/>
<separator name="PopupSep1"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
<separator name="PopupSep1"/>
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<menuitem name="SplitTransaction" action="SplitTransactionAction"/>
<menuitem name="EditExchangeRate" action="EditExchangeRateAction"/>
<menuitem name="JumpTransaction" action="JumpTransactionAction"/>
</popup>
</ui>

26
src/gnome/ui/gnc-sxed-to-create-window-ui.xml
View File

@ -1,27 +1,3 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<menuitem name="EditCut" action="EditCutAction"/>
<menuitem name="EditCopy" action="EditCopyAction"/>
<menuitem name="EditPaste" action="EditPasteAction"/>
<placeholder name="EditPlaceholder"/>
</menu>
<menu name="View" action="ViewAction">
<placeholder name="ViewPlaceholder"/>
</menu>
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder">
<menuitem name="JumpTransaction" action="JumpTransactionAction"/>
</placeholder>
</menu>
<placeholder name="AdditionalMenusPlaceholder"/>
</menubar>
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder"/>
<separator name="ToolbarSep1"/>
</toolbar>
<!-- there is no "chrome" besides the (read-only) register itself, here. -->
</ui>

65
src/gnome/ui/gnc-sxed-window-ui-full.xml Normal file
View File

@ -0,0 +1,65 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<menuitem name="EditCut" action="EditCutAction"/>
<menuitem name="EditCopy" action="EditCopyAction"/>
<menuitem name="EditPaste" action="EditPasteAction"/>
</menu>
<menu name="Transaction" action="TransactionAction">
<menuitem name="CutTransaction" action="CutTransactionAction"/>
<menuitem name="CopyTransaction" action="CopyTransactionAction"/>
<menuitem name="PasteTransaction" action="PasteTransactionAction"/>
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<separator name="TransactionSep1"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
</menu>
<menu name="View" action="ViewAction">
<placeholder name="ViewContentPlaceholder">
<menuitem name="ViewStyleDoubleLine" action="ViewStyleDoubleLineAction"/>
</placeholder>
</menu>
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder">
<separator name="ActionsSep1"/>
<menuitem name="ActionsTransfer" action="ActionsTransferAction"/>
<separator name="ActionsSep4"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
</placeholder>
</menu>
</menubar>
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder">
<toolitem name="ToolbarDuplicateTransaction" action="DuplicateTransactionAction"/>
<toolitem name="ToolbarDeleteTransaction" action="DeleteTransactionAction"/>
<separator name="ToolbarSep66"/>
<toolitem name="ToolbarRecordTransaction" action="RecordTransactionAction"/>
<toolitem name="ToolbarCancelTransaction" action="CancelTransactionAction"/>
<separator name="ToolbarSep67"/>
<toolitem name="ToolbarBlankTransaction" action="BlankTransactionAction"/>
<separator name="ToolbarSep68"/>
<toolitem name="ToolbarTransfer" action="ActionsTransferAction"/>
</placeholder>
</toolbar>
<popup name="MainPopup" action="FakeToplevel">
<placeholder name="PopupPlaceholder2">
<menuitem name="DuplicateTransaction" action="DuplicateTransactionAction"/>
<menuitem name="DeleteTransaction" action="DeleteTransactionAction"/>
<menuitem name="RemoveTransactionSplits" action="RemoveTransactionSplitsAction"/>
<separator name="PopupSep2"/>
<menuitem name="RecordTransaction" action="RecordTransactionAction"/>
<menuitem name="CancelTransaction" action="CancelTransactionAction"/>
<separator name="PopupSep3"/>
<menuitem name="BlankTransaction" action="BlankTransactionAction"/>
</placeholder>
</popup>
</ui>

24
src/gnome/ui/gnc-sxed-window-ui.xml
View File

@ -1,25 +1,3 @@
<ui>
<menubar>
<menu name="Edit" action="EditAction">
<menuitem name="EditCut" action="EditCutAction"/>
<menuitem name="EditCopy" action="EditCopyAction"/>
<menuitem name="EditPaste" action="EditPasteAction"/>
<placeholder name="EditPlaceholder"/>
</menu>
<menu name="View" action="ViewAction">
<placeholder name="ViewPlaceholder"/>
</menu>
<menu name="Actions" action="ActionsAction">
<placeholder name="ActionsPlaceholder"/>
</menu>
<placeholder name="AdditionalMenusPlaceholder"/>
</menubar>
<toolbar name="DefaultToolbar">
<placeholder name="DefaultToolbarPlaceholder"/>
<separator name="ToolbarSep1"/>
</toolbar>
<!-- nothing -->
</ui>