[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master f964241 5/7: Adjust census-pasting XRCIDs
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master f964241 5/7: Adjust census-pasting XRCIDs |
Date: |
Thu, 14 Jun 2018 10:27:41 -0400 (EDT) |
branch: master
commit f96424119fe5fae13ac82035ddb34013e813e5ad
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Adjust census-pasting XRCIDs
Both paste-in and paste-out XRCIDs need to be mentioned in non-census
view implementations, because that's the only way to disable them when
event tables are used.
---
census_view.cpp | 5 +++--
gpt_view.cpp | 3 ++-
illustration_view.cpp | 3 ++-
mec_view.cpp | 3 ++-
menus.xrc | 2 +-
skeleton.cpp | 3 ++-
toolbar.xrc | 2 +-
7 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/census_view.cpp b/census_view.cpp
index ed40088..900e5da 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -861,7 +861,7 @@ BEGIN_EVENT_TABLE(CensusView, ViewEx)
EVT_MENU(XRCID("print_spreadsheet"
),CensusView::UponRunCaseToSpreadsheet )
EVT_MENU(XRCID("print_group_roster"
),CensusView::UponRunCaseToGroupRoster )
EVT_MENU(XRCID("print_group_quote"
),CensusView::UponRunCaseToGroupQuote )
- EVT_MENU(XRCID("paste_census" ),CensusView::UponPasteCensusIn
)
+ EVT_MENU(XRCID("paste_census_in" ),CensusView::UponPasteCensusIn
)
EVT_MENU(XRCID("paste_census_out"
),CensusView::UponPasteCensusOut )
EVT_MENU(XRCID("add_cell" ),CensusView::UponAddCell
)
EVT_MENU(XRCID("delete_cells" ),CensusView::UponDeleteCells
)
@@ -878,7 +878,8 @@ BEGIN_EVENT_TABLE(CensusView, ViewEx)
EVT_UPDATE_UI(XRCID("print_spreadsheet"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("print_group_roster"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("print_group_quote"
),CensusView::UponUpdateAlwaysEnabled )
- EVT_UPDATE_UI(XRCID("paste_census"
),CensusView::UponUpdateAlwaysEnabled )
+ EVT_UPDATE_UI(XRCID("paste_census_in"
),CensusView::UponUpdateAlwaysEnabled )
+ EVT_UPDATE_UI(XRCID("paste_census_out"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("add_cell"
),CensusView::UponUpdateAlwaysEnabled )
EVT_UPDATE_UI(XRCID("delete_cells"
),CensusView::UponUpdateNonemptySelection)
EVT_UPDATE_UI(XRCID("column_width_varying"
),CensusView::UponUpdateAlwaysEnabled )
diff --git a/gpt_view.cpp b/gpt_view.cpp
index 80fdbdd..74fa4c4 100644
--- a/gpt_view.cpp
+++ b/gpt_view.cpp
@@ -70,7 +70,8 @@ BEGIN_EVENT_TABLE(gpt_view, ViewEx)
EVT_UPDATE_UI(XRCID("print_spreadsheet"
),gpt_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("print_group_roster"
),gpt_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("print_group_quote"
),gpt_view::UponUpdateInapplicable)
- EVT_UPDATE_UI(XRCID("paste_census"
),gpt_view::UponUpdateInapplicable)
+ EVT_UPDATE_UI(XRCID("paste_census_in"
),gpt_view::UponUpdateInapplicable)
+ EVT_UPDATE_UI(XRCID("paste_census_out"
),gpt_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("add_cell"
),gpt_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("delete_cells"
),gpt_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("column_width_varying"
),gpt_view::UponUpdateInapplicable)
diff --git a/illustration_view.cpp b/illustration_view.cpp
index 8167d47..4c71b3c 100644
--- a/illustration_view.cpp
+++ b/illustration_view.cpp
@@ -90,7 +90,8 @@ BEGIN_EVENT_TABLE(IllustrationView, ViewEx)
EVT_UPDATE_UI(XRCID("print_spreadsheet"
),IllustrationView::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("print_group_roster"
),IllustrationView::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("print_group_quote"
),IllustrationView::UponUpdateInapplicable )
- EVT_UPDATE_UI(XRCID("paste_census"
),IllustrationView::UponUpdateInapplicable )
+ EVT_UPDATE_UI(XRCID("paste_census_in"
),IllustrationView::UponUpdateInapplicable )
+ EVT_UPDATE_UI(XRCID("paste_census_out"
),IllustrationView::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("add_cell"
),IllustrationView::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("delete_cells"
),IllustrationView::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("column_width_varying"
),IllustrationView::UponUpdateInapplicable )
diff --git a/mec_view.cpp b/mec_view.cpp
index f4d8721..281e132 100644
--- a/mec_view.cpp
+++ b/mec_view.cpp
@@ -70,7 +70,8 @@ BEGIN_EVENT_TABLE(mec_view, ViewEx)
EVT_UPDATE_UI(XRCID("print_spreadsheet"
),mec_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("print_group_roster"
),mec_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("print_group_quote"
),mec_view::UponUpdateInapplicable)
- EVT_UPDATE_UI(XRCID("paste_census"
),mec_view::UponUpdateInapplicable)
+ EVT_UPDATE_UI(XRCID("paste_census_in"
),mec_view::UponUpdateInapplicable)
+ EVT_UPDATE_UI(XRCID("paste_census_out"
),mec_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("add_cell"
),mec_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("delete_cells"
),mec_view::UponUpdateInapplicable)
EVT_UPDATE_UI(XRCID("column_width_varying"
),mec_view::UponUpdateInapplicable)
diff --git a/menus.xrc b/menus.xrc
index b7a71d7..e500e4b 100644
--- a/menus.xrc
+++ b/menus.xrc
@@ -370,7 +370,7 @@
<help>Run and print all cells to a group premium quote</help>
</object>
<object class="separator"/>
- <object class="wxMenuItem" name="paste_census">
+ <object class="wxMenuItem" name="paste_census_in">
<label>Pa_ste census in\tCtrl-Shift-S</label>
<bitmap platform="win" stock_id="paste-in"/>
<help>Paste census data in from clipboard</help>
diff --git a/skeleton.cpp b/skeleton.cpp
index 35a9b0e..3763696 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -171,7 +171,8 @@ BEGIN_EVENT_TABLE(Skeleton, wxApp)
EVT_UPDATE_UI(XRCID("print_spreadsheet"
),Skeleton::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("print_group_roster"
),Skeleton::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("print_group_quote"
),Skeleton::UponUpdateInapplicable )
- EVT_UPDATE_UI(XRCID("paste_census"
),Skeleton::UponUpdateInapplicable )
+ EVT_UPDATE_UI(XRCID("paste_census_in"
),Skeleton::UponUpdateInapplicable )
+ EVT_UPDATE_UI(XRCID("paste_census_out"
),Skeleton::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("add_cell"
),Skeleton::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("delete_cells"
),Skeleton::UponUpdateInapplicable )
EVT_UPDATE_UI(XRCID("column_width_varying"
),Skeleton::UponUpdateInapplicable )
diff --git a/toolbar.xrc b/toolbar.xrc
index d7d3477..bebc9ae 100644
--- a/toolbar.xrc
+++ b/toolbar.xrc
@@ -124,7 +124,7 @@
<longhelp>Run and print all cells to a group premium quote</longhelp>
</object>
<object class="separator"/>
- <object class="tool" name="paste_census">
+ <object class="tool" name="paste_census_in">
<tooltip>Paste census in</tooltip>
<bitmap stock_id="paste-in"/>
<longhelp>Paste census data in from clipboard</longhelp>
- [lmi-commits] [lmi] master updated (d17155c -> 73aeadc), Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 8a722b3 2/7: Refactor for concision, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 8044c50 1/7: Remove scaffolding, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 15098dd 4/7: Rename icons paste-case*.png --> paste-in*.png, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 86ca5af 3/7: Fix defect introduced 20180228T1615Z: bad output filename, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master a22db84 6/7: Add census-paste-out commands to menu and toolbar, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master 73aeadc 7/7: Remove no-longer-needed 'pyx=paste_out_to_spreadsheet' option, Greg Chicares, 2018/06/14
- [lmi-commits] [lmi] master f964241 5/7: Adjust census-pasting XRCIDs,
Greg Chicares <=