Skip to content

M
magicseteditor
Commit adac03f4 authored by twanvl's avatar twanvl
Browse files
Options

enabled card rotation

parent 9efe07b3
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 35 deletions
src/gui/control/card_list.hpp
View file @ adac03f4
...@@ -140,8 +140,10 @@ class CardListBase : public wxListView, public SetView { ...@@ -140,8 +140,10 @@ class CardListBase : public wxListView, public SetView {
/// Store the column sizes in the settings /// Store the column sizes in the settings
void storeColumns(); void storeColumns();
public:
/// Open a dialog for selecting columns to be shown /// Open a dialog for selecting columns to be shown
void selectColumns(); void selectColumns();
private:
// --------------------------------------------------- : Window events // --------------------------------------------------- : Window events
DECLARE_EVENT_TABLE(); DECLARE_EVENT_TABLE();
......
src/gui/set/cards_panel.cpp
View file @ adac03f4
...@@ -128,10 +128,15 @@ void CardsPanel::onUpdateUI(wxUpdateUIEvent& ev) { ...@@ -128,10 +128,15 @@ void CardsPanel::onUpdateUI(wxUpdateUIEvent& ev) {
switch (ev.GetId()) { switch (ev.GetId()) {
case ID_CARD_PREV: ev.Enable(card_list->canSelectPrevious()); break; case ID_CARD_PREV: ev.Enable(card_list->canSelectPrevious()); break;
case ID_CARD_NEXT: ev.Enable(card_list->canSelectNext()); break; case ID_CARD_NEXT: ev.Enable(card_list->canSelectNext()); break;
/* case ID_CARD_ROTATE_0: ev.Check(editor->rotation.angle == 0); break; case ID_CARD_ROTATE_0: case ID_CARD_ROTATE_90: case ID_CARD_ROTATE_180: case ID_CARD_ROTATE_270: {
case ID_CARD_ROTATE_90: ev.Check(editor->rotation.angle == 90); break; StyleSheetSettings& ss = settings.stylesheetSettingsFor(*set->stylesheetFor(card_list->getCard()));
case ID_CARD_ROTATE_180: ev.Check(editor->rotation.angle == 180); break; int a = ev.GetId() == ID_CARD_ROTATE_0 ? 0
case ID_CARD_ROTATE_270: ev.Check(editor->rotation.angle == 270); break;*/ : ev.GetId() == ID_CARD_ROTATE_90 ? 90
: ev.GetId() == ID_CARD_ROTATE_180 ? 180
: 270;
ev.Check(ss.card_angle() == a);
break;
}
case ID_CARD_REMOVE: ev.Enable(set->cards.size() > 0); break; case ID_CARD_REMOVE: ev.Enable(set->cards.size() > 0); break;
case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: { case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: {
if (focused_control(this) == ID_EDITOR) { if (focused_control(this) == ID_EDITOR) {
...@@ -157,42 +162,25 @@ void CardsPanel::onCommand(int id) { ...@@ -157,42 +162,25 @@ void CardsPanel::onCommand(int id) {
case ID_CARD_ADD: case ID_CARD_ADD:
set->actions.add(new AddCardAction(*set)); set->actions.add(new AddCardAction(*set));
break; break;
case ID_CARD_ROTATE: case ID_CARD_REMOVE:
set->actions.add(new RemoveCardAction(*set, card_list->getCard())); set->actions.add(new RemoveCardAction(*set, card_list->getCard()));
break; break;
/* case idCardRotate { case ID_CARD_ROTATE:
StyleSettings& ss = settings.styleSettingsFor(*editor->style); case ID_CARD_ROTATE_0: case ID_CARD_ROTATE_90: case ID_CARD_ROTATE_180: case ID_CARD_ROTATE_270: {
ss.cardAngle = (ss.cardAngle + 90) % 360; StyleSheetSettings& ss = settings.stylesheetSettingsFor(*set->stylesheetFor(card_list->getCard()));
onRenderSettingsChange(); ss.card_angle.assign(
break; id == ID_CARD_ROTATE ? (ss.card_angle() + 90) % 360
} : id == ID_CARD_ROTATE_0 ? 0
case idCardRotate0 { : id == ID_CARD_ROTATE_90 ? 90
StyleSettings& ss = settings.styleSettingsFor(*editor->style); : id == ID_CARD_ROTATE_180 ? 180
ss.cardAngle = 0; : 270
onRenderSettingsChange(); );
break; //onRenderSettingsChange();
}
case idCardRotate90 {
StyleSettings& ss = settings.styleSettingsFor(*editor->style);
ss.cardAngle = 90;
onRenderSettingsChange();
break;
}
case idCardRotate180 {
StyleSettings& ss = settings.styleSettingsFor(*editor->style);
ss.cardAngle = 180;
onRenderSettingsChange();
break; break;
} }
case idCardRotate270 { case ID_SELECT_COLUMNS: {
StyleSettings& ss = settings.styleSettingsFor(*editor->style); card_list->selectColumns();
ss.cardAngle = 270;
onRenderSettingsChange();
break;
} }
case idSelectColumns {
cardList->selectColumns();
}*/
case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: { case ID_FORMAT_BOLD: case ID_FORMAT_ITALIC: case ID_FORMAT_SYMBOL: case ID_FORMAT_REMINDER: {
if (focused_control(this) == ID_EDITOR) { if (focused_control(this) == ID_EDITOR) {
editor->doFormat(id); editor->doFormat(id);
...@@ -213,6 +201,7 @@ void CardsPanel::onAction(const Action& action, bool undo) { ...@@ -213,6 +201,7 @@ void CardsPanel::onAction(const Action& action, bool undo) {
} }
void CardsPanel::onRenderSettingsChange() { void CardsPanel::onRenderSettingsChange() {
// TODO
} }
// ----------------------------------------------------------------------------- : Clipboard // ----------------------------------------------------------------------------- : Clipboard
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment