From 96a13f61017866aea8e06236e59332df34610ad9 Mon Sep 17 00:00:00 2001 From: twanvl Date: Wed, 4 Jun 2008 22:51:21 +0000 Subject: [PATCH] Some more stuff on the random pack panel. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@974 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/en.mse-locale/locale | 4 ++++ src/gui/control/text_ctrl.cpp | 1 - src/gui/set/random_pack_panel.cpp | 10 +++++++++- src/resource/common/expected_locale_keys | 10 +++++----- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale index 0b7e073a..8188a1c5 100644 --- a/data/en.mse-locale/locale +++ b/data/en.mse-locale/locale @@ -75,6 +75,7 @@ menu: style tab: St&yle F7 keywords tab: &Keywords F8 stats tab: S&tatistics F9 + random pack tab: &Random Packs help: &Help index: &Index... F1 @@ -182,6 +183,7 @@ help: style tab: Change the style of cards keywords tab: Define extra keywords for this set stats tab: Show statistics about the cards in the set + random pack tab: Try how the set works out in practice by generating random booster packs. help: index: @@ -273,6 +275,7 @@ tool: style tab: Style keywords tab: Keywords stats tab: Statistics + random pack tab: Random # symbol editor store symbol: Store @@ -317,6 +320,7 @@ tooltip: style tab: keywords tab: stats tab: + random pack tab: Random packs new set: New set open set: Open set diff --git a/src/gui/control/text_ctrl.cpp b/src/gui/control/text_ctrl.cpp index 8a3d1a9d..307a08ba 100644 --- a/src/gui/control/text_ctrl.cpp +++ b/src/gui/control/text_ctrl.cpp @@ -74,7 +74,6 @@ void TextCtrl::setValue(const FakeTextValueP& value) { } void TextCtrl::onChangeSet() { - wxLogDebug(_("TextCtrl::onChangeSet %p"),this); DataEditor::onChangeSet(); // initialize if (viewers.empty()) { diff --git a/src/gui/set/random_pack_panel.cpp b/src/gui/set/random_pack_panel.cpp index 0dd1170b..39950f3f 100644 --- a/src/gui/set/random_pack_panel.cpp +++ b/src/gui/set/random_pack_panel.cpp @@ -19,11 +19,19 @@ RandomPackPanel::RandomPackPanel(Window* parent, int id) // init controls preview = new CardViewer(this, wxID_ANY); card_list = new FilteredCardList(this, wxID_ANY); + wxButton* generate = new wxButton(this, wxID_ANY, _BUTTON_("generate pack")); // init sizer wxSizer* s = new wxBoxSizer(wxHORIZONTAL); s->Add(preview, 0, wxRIGHT, 2); wxSizer* s2 = new wxBoxSizer(wxVERTICAL); - s2->Add(card_list, 1, wxEXPAND | wxTOP, 4); + wxSizer* s3 = new wxBoxSizer(wxHORIZONTAL); + wxSizer* s4 = new wxStaticBoxSizer(wxHORIZONTAL, this, _LABEL_("pack selection")); + s3->Add(s4, 1, wxEXPAND, 8); + wxSizer* s5 = new wxStaticBoxSizer(wxHORIZONTAL, this, _LABEL_("pack totals")); + s3->Add(s5, 1, wxEXPAND | wxLEFT, 8); + s3->Add(generate, 0, wxALIGN_BOTTOM | wxLEFT, 8); + s2->Add(s3, 0, wxEXPAND | wxALL, 4); + s2->Add(card_list, 1, wxEXPAND); s->Add(s2, 1, wxEXPAND, 8); s->SetSizeHints(this); SetSizer(s); diff --git a/src/resource/common/expected_locale_keys b/src/resource/common/expected_locale_keys index 03189253..37eb3c36 100644 --- a/src/resource/common/expected_locale_keys +++ b/src/resource/common/expected_locale_keys @@ -1,6 +1,6 @@ # This file contains the keys expected to be in MSE locales # It was automatically generated by tools/locale/locale.pl -# Generated on Sun Jun 1 02:54:59 2008 +# Generated on Thu Jun 5 00:45:34 2008 action: add control point: 0 @@ -154,7 +154,6 @@ help: cut card: 0 cut keyword: 0 difference: 0 - draft tab: optional, 0 drag to draw shape: 0 drag to move curve: 0 drag to move line: 0 @@ -209,6 +208,7 @@ help: previous keyword: 0 print: 0 print preview: 0 + random pack tab: 0 rectangle: 0 redo: 0 reflection: 0 @@ -323,7 +323,6 @@ menu: close symbol editor: 0 copy: 0 cut: 0 - draft tab: optional, 0 duplicate: 0 edit: 0 exit: 0 @@ -362,6 +361,7 @@ menu: previous keyword: 0 print: 0 print preview: 0 + random pack tab: 0 redo: 1 reload data: 0 reminder text: 0 @@ -432,7 +432,6 @@ tool: cards tab: 0 curve segment: 0 difference: 0 - draft tab: optional, 0 ellipse: 0 free point: 0 grid: 0 @@ -444,6 +443,7 @@ tool: paint: optional, 0 points: 0 polygon: 0 + random pack tab: 0 rectangle: 0 redo: 0 reflection: 0 @@ -475,7 +475,6 @@ tooltip: curve segment: 0 cut: 0 difference: 0 - draft tab: optional, 0 ellipse: 0 export: 0 free point: 0 @@ -493,6 +492,7 @@ tooltip: pie: 0 points: 0 polygon: 0 + random pack tab: 0 rectangle: 0 redo: 1 reflection: 0