amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

added 'undone' parameter to onAction

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@43 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2006-10-20 14:24:36 +00:00
parent 44b516036d
commit 20f0efacd7
17 changed files with 93 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/card_list.cpp
+57 -20
View File
@@ -13,6 +13,7 @@
#include <data/set.hpp>
#include <data/card.hpp>
#include <data/settings.hpp>
#include <data/action/set.hpp>
#include <util/window_id.hpp>
DECLARE_TYPEOF_COLLECTION(CardP);
@@ -47,8 +48,44 @@ void CardListBase::onBeforeChangeSet() {
void CardListBase::onChangeSet() {
rebuild();
}
void CardListBase::onAction(const Action& action) {
// TODO
void CardListBase::onAction(const Action& action, bool undone) {
TYPE_CASE(action, AddCardAction) {
// select the new card
selectCard(action.card, false /*list will be refreshed anyway*/);
refreshList();
}
TYPE_CASE(action, RemoveCardAction) {
if (undone) {
// select the re-added card
selectCard(action.card, false /*list will be refreshed anyway*/);
refreshList();
} else {
long pos = selected_card_pos;
refreshList();
if (action.card == selected_card) {
// select the next card, if not possible, select the last
if ((size_t)pos + 1 < sorted_card_list.size()) {
selectCardPos(pos, true);
} else {
selectCardPos((long)sorted_card_list.size() - 1, true);
}
}
}
}
TYPE_CASE(action, ReorderCardsAction) {
if (sort_criterium) return; // nothing changes for us
if ((long)action.card_id1 == selected_card_pos || (long)action.card_id2 == selected_card_pos) {
// Selected card has moved; also move in the sorted card list
swap(sorted_card_list[action.card_id1] ,sorted_card_list[action.card_id2]);
// reselect the current card, it has moved
selected_card_pos = (long)action.card_id1 == selected_card_pos ? (long)action.card_id2 : (long)action.card_id1;
// select the right card
selectCurrentCard();
}
RefreshItem((long)action.card_id1);
RefreshItem((long)action.card_id2);
}
}
vector<CardP>& CardListBase::getCards() const {
@@ -58,16 +95,18 @@ vector<CardP>& CardListBase::getCards() const {
// ----------------------------------------------------------------------------- : CardListBase : Selection
bool CardListBase::canSelectPrevious() const {
return selected_card_pos + 1 >= 0;
return selected_card_pos - 1 >= 0;
}
bool CardListBase::canSelectNext() const {
return selected_card_pos >= 0 && static_cast<size_t>(selected_card_pos + 1) < sorted_card_list.size();
}
void CardListBase::selectPrevious() {
// TODO
assert(selected_card_pos >= 1);
selectCardPos(selected_card_pos - 1, true);
}
void CardListBase::selectNext() {
// TODO
assert(selected_card_pos + 1 < (long)sorted_card_list.size());
selectCardPos(selected_card_pos + 1, true);
}
// ----------------------------------------------------------------------------- : CardListBase : Selection (private)
@@ -81,19 +120,19 @@ void CardListBase::selectCard(const CardP& card, bool focus) {
selectCurrentCard();
}
}
/*
void CardListBase::selectCardPos(size_t pos, bool focus = true, bool force = false) {
if (selectedCardPos == pos && !force) return; // this card is already selected
if (pos < sortedCardList.size()) {
void CardListBase::selectCardPos(long pos, bool focus) {
if (selected_card_pos == pos && !focus) return; // this card is already selected
if ((size_t)pos < sorted_card_list.size()) {
// only if there is something to select
selectCard(getCard(pos), false);
selectCard(sorted_card_list[pos], false);
} else {
selectCard(CardP(), false);
}
selectedCardPos = Long(pos);
if (focus) selectCurrentCard();
selected_card_pos = pos;
if (focus) selectCurrentCard();
}
*/
void CardListBase::findSelectedCardPos() {
// find the position of the selected card
long count = GetItemCount();
@@ -107,7 +146,7 @@ void CardListBase::findSelectedCardPos() {
}
void CardListBase::selectCurrentCard() {
if (GetItemCount() > 0) {
if (selected_card_pos == -1) {
if (selected_card_pos == -1 || (size_t)selected_card_pos > sorted_card_list.size()) {
// deselect currently selected item, if any
long sel = GetFirstSelected();
Select(sel, false);
@@ -190,9 +229,7 @@ void CardListBase::rebuild() {
}
refreshList();
// select a card if possible
// if (!getCards().empty()) {
// selectCardPos(0, true);
// }
selectCardPos(0, true);
}
void CardListBase::refreshList() {
@@ -273,7 +310,7 @@ void CardListBase::onColumnClick(wxListEvent& ev) {
FieldP new_sort_criterium = column_fields[ev.GetColumn()];
if (sort_criterium == new_sort_criterium) {
if (sort_ascending) {
sort_ascending = false; // 2nd click on same column -> sort descending
sort_ascending = false; // 2nd click on same column -> sort descending
} else {
new_sort_criterium.reset(); // 3rd click on same column -> don't sort
}
@@ -306,12 +343,12 @@ void CardListBase::onSelectColumns(wxCommandEvent&) {
}
void CardListBase::onItemFocus(wxListEvent& ev) {
// selectCardPos(ev.GetIndex(), false);
selectCardPos(ev.GetIndex(), false);
}
void CardListBase::onChar(wxKeyEvent& ev) {
if (ev.GetKeyCode() == WXK_DELETE) {
// set->actions.add(new_shared2<RemoveCardAction>(set.get(), card));
set->actions.add(new RemoveCardAction(*set, selected_card));
} else if (ev.GetKeyCode() == WXK_TAB) {
// send a navigation event to our parent, to select another control
// we need this because tabs are not handled on the cards panel
src/gui/control/card_list.hpp
+4 -4
View File
@@ -50,7 +50,7 @@ class CardListBase : public wxListView, public SetView {
// --------------------------------------------------- : Selection
inline CardP getCard() const { return selected_card; }
inline void setCard(const CardP& card) { selectCard(card); }
inline void setCard(const CardP& card) { selectCard(card, true); }
/// Is there a previous card to select?
bool canSelectPrevious() const;
@@ -74,7 +74,7 @@ class CardListBase : public wxListView, public SetView {
virtual void onBeforeChangeSet();
virtual void onChangeSet();
virtual void onAction(const Action&);
virtual void onAction(const Action&, bool undone);
// --------------------------------------------------- : The cards
protected:
@@ -113,9 +113,9 @@ class CardListBase : public wxListView, public SetView {
/** If focus then the card is also focused and selected in the actual control.
* This should abviously not be done when the card is selected because it was selected (leading to a loop).
*/
void selectCard(const CardP& card, bool focus = false);
void selectCard(const CardP& card, bool focus);
/// Select a card at the specified position
void selectCardPos(long pos);
void selectCardPos(long pos, bool focus);
/// Find the position for the selected_card
void findSelectedCardPos();
/// Actually select the card at selected_card_pos in the control
src/gui/set/cards_panel.cpp
+2 -2
View File
@@ -186,11 +186,11 @@ void CardsPanel::onCommand(int id) {
// ----------------------------------------------------------------------------- : Actions
bool CardsPanel::wantsToHandle(const Action&) const {
bool CardsPanel::wantsToHandle(const Action&, bool undone) const {
return false;
}
void CardsPanel::onAction(const Action& action) {
void CardsPanel::onAction(const Action& action, bool undo) {
// TODO
}
src/gui/set/cards_panel.hpp
+2 -2
View File
@@ -34,8 +34,8 @@ class CardsPanel : public SetWindowPanel {
// --------------------------------------------------- : Actions
virtual bool wantsToHandle(const Action&) const;
virtual void onAction(const Action&);
virtual bool wantsToHandle(const Action&, bool undone) const;
virtual void onAction(const Action&, bool undone);
virtual void onRenderSettingsChange();
private:
void updateSize();
src/gui/set/panel.hpp
+2 -2
View File
@@ -46,9 +46,9 @@ class SetWindowPanel : public wxPanel, public SetView {
// --------------------------------------------------- : Actions/Events
/// Should return true if this panel wants to get focus to show an action
virtual bool wantsToHandle(const Action&) const { return false; }
virtual bool wantsToHandle(const Action&, bool undone) const { return false; }
/// Handle an action that changes the current set
virtual void onAction(const Action&) {}
virtual void onAction(const Action&, bool undone) {}
/// The settings for rendering cards have changed, refresh card viewers/editors
virtual void onRenderSettingsChange() {}
src/gui/set/window.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ void SetWindow::onChangeSet() {
fixMinWindowSize();
}
void SetWindow::onAction(const Action& action) {
void SetWindow::onAction(const Action& action, bool undone) {
// TYPE_CASE_(action, SetStyleChange) {
// // The style changed, maybe also the size of the viewer
// Layout();
src/gui/set/window.hpp
+1 -1
View File
@@ -80,7 +80,7 @@ class SetWindow : public wxFrame, public SetView {
/// We want to respond to set changes
virtual void onChangeSet();
/// Actions that change the set
virtual void onAction(const Action&);
virtual void onAction(const Action&, bool undone);
private:
/// A different card has been selected
src/gui/symbol/control.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ void SymbolControl::onExtraTool(wxCommandEvent& ev) {
if (editor) editor->onCommand(ev.GetId());
}
void SymbolControl::onAction(const Action& action) {
void SymbolControl::onAction(const Action& action, bool undone) {
TYPE_CASE_(action, SymbolPartAction) {
Refresh(false);
}
src/gui/symbol/control.hpp
+1 -1
View File
@@ -28,7 +28,7 @@ class SymbolControl : public wxControl, public SymbolViewer {
virtual void onChangeSymbol();
virtual void onAction(const Action&);
virtual void onAction(const Action&, bool undone);
// Forward command to editor
void onExtraTool(wxCommandEvent& ev);
src/gui/symbol/part_list.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ void SymbolPartList::onChangeSymbol() {
update();
}
void SymbolPartList::onAction(const Action& action) {
void SymbolPartList::onAction(const Action& action, bool undone) {
TYPE_CASE(action, ReorderSymbolPartsAction) {
if (selected == (long) action.part_id1) {
selectItem((long) action.part_id2);
src/gui/symbol/part_list.hpp
+1 -1
View File
@@ -39,7 +39,7 @@ class SymbolPartList : public wxListCtrl, public SymbolView {
void onChangeSymbol();
/// Event handler for changes to the symbol
virtual void onAction(const Action& a);
virtual void onAction(const Action& a, bool undone);
protected:
/// Get the text of an item