>From c5b488830348240ed5ff05b9939ae9fa7ef306a1 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 27 Aug 2015 23:30:52 +0200 Subject: [PATCH] Disable the "Print roster" toolbar button if it's not available. The main button itself should be disabled as well when the command represented by it ("Print roster to the spreadsheet") is not available, in addition to disabling the commands in its menu. --- census_view.cpp | 1 + gpt_view.cpp | 1 + illustration_view.cpp | 2 +- mec_view.cpp | 1 + skeleton.cpp | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/census_view.cpp b/census_view.cpp index 14da550..1df0765 100644 --- a/census_view.cpp +++ b/census_view.cpp @@ -827,6 +827,7 @@ wxString CensusViewDataViewModel::GetColumnType(unsigned int col) const 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("print_group" ),CensusView::UponUpdateAlwaysEnabled ) EVT_UPDATE_UI(XRCID("paste_census" ),CensusView::UponUpdateAlwaysEnabled ) EVT_UPDATE_UI(XRCID("add_cell" ),CensusView::UponUpdateAlwaysEnabled ) EVT_UPDATE_UI(XRCID("delete_cells" ),CensusView::UponUpdateNonemptySelection) diff --git a/gpt_view.cpp b/gpt_view.cpp index d028905..f418512 100644 --- a/gpt_view.cpp +++ b/gpt_view.cpp @@ -85,6 +85,7 @@ char const* gpt_mvc_view::DoResourceFileName() const 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("print_group" ),gpt_view::UponUpdateInapplicable) EVT_UPDATE_UI(XRCID("paste_census" ),gpt_view::UponUpdateInapplicable) EVT_UPDATE_UI(XRCID("add_cell" ),gpt_view::UponUpdateInapplicable) EVT_UPDATE_UI(XRCID("delete_cells" ),gpt_view::UponUpdateInapplicable) diff --git a/illustration_view.cpp b/illustration_view.cpp index d7fc963..6f174c9 100644 --- a/illustration_view.cpp +++ b/illustration_view.cpp @@ -91,7 +91,7 @@ EVT_UPDATE_UI(XRCID("print_case_to_disk" ),IllustrationView::UponUpdateInapplicable ) 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("print_group" ),IllustrationView::UponUpdateInapplicable ) EVT_UPDATE_UI(XRCID("paste_census" ),IllustrationView::UponUpdateInapplicable ) EVT_UPDATE_UI(XRCID("add_cell" ),IllustrationView::UponUpdateInapplicable ) EVT_UPDATE_UI(XRCID("delete_cells" ),IllustrationView::UponUpdateInapplicable ) diff --git a/mec_view.cpp b/mec_view.cpp index 579e813..e526b21 100644 --- a/mec_view.cpp +++ b/mec_view.cpp @@ -85,6 +85,7 @@ char const* mec_mvc_view::DoResourceFileName() const 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("print_group" ),mec_view::UponUpdateInapplicable) EVT_UPDATE_UI(XRCID("paste_census" ),mec_view::UponUpdateInapplicable) EVT_UPDATE_UI(XRCID("add_cell" ),mec_view::UponUpdateInapplicable) EVT_UPDATE_UI(XRCID("delete_cells" ),mec_view::UponUpdateInapplicable) diff --git a/skeleton.cpp b/skeleton.cpp index bf7d434..7a7946c 100644 --- a/skeleton.cpp +++ b/skeleton.cpp @@ -160,6 +160,7 @@ 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("print_group" ),Skeleton::UponUpdateInapplicable ) EVT_UPDATE_UI(XRCID("paste_census" ),Skeleton::UponUpdateInapplicable ) EVT_UPDATE_UI(XRCID("add_cell" ),Skeleton::UponUpdateInapplicable ) EVT_UPDATE_UI(XRCID("delete_cells" ),Skeleton::UponUpdateInapplicable ) -- 2.1.0