From d24da0ba62098fe2401ecb0f6c34cf196c6ac589 Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 2 Mar 2025 18:34:24 -0800 Subject: [PATCH] reorder --- .../menus/deck_editor/deck_editor_menu.cpp | 12 +++++----- .../client/tabs/abstract_tab_deck_editor.cpp | 24 +++++++++---------- .../client/tabs/abstract_tab_deck_editor.h | 2 +- cockatrice/src/settings/shortcuts_settings.h | 6 ++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp b/cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp index 81f09043c..426195bc9 100644 --- a/cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp +++ b/cockatrice/src/client/menus/deck_editor/deck_editor_menu.cpp @@ -27,12 +27,12 @@ DeckEditorMenu::DeckEditorMenu(QWidget *parent, AbstractTabDeckEditor *_deckEdit aSaveDeckAs = new QAction(QString(), this); connect(aSaveDeckAs, SIGNAL(triggered()), deckEditor, SLOT(actSaveDeckAs())); - aEditDeckInClipboard = new QAction(QString(), this); - connect(aEditDeckInClipboard, SIGNAL(triggered()), deckEditor, SLOT(actEditDeckInClipboard())); - aLoadDeckFromClipboard = new QAction(QString(), this); connect(aLoadDeckFromClipboard, SIGNAL(triggered()), deckEditor, SLOT(actLoadDeckFromClipboard())); + aEditDeckInClipboard = new QAction(QString(), this); + connect(aEditDeckInClipboard, SIGNAL(triggered()), deckEditor, SLOT(actEditDeckInClipboard())); + aSaveDeckToClipboard = new QAction(QString(), this); connect(aSaveDeckToClipboard, SIGNAL(triggered()), deckEditor, SLOT(actSaveDeckToClipboard())); @@ -79,8 +79,8 @@ DeckEditorMenu::DeckEditorMenu(QWidget *parent, AbstractTabDeckEditor *_deckEdit addAction(aSaveDeck); addAction(aSaveDeckAs); addSeparator(); - addAction(aEditDeckInClipboard); addAction(aLoadDeckFromClipboard); + addAction(aEditDeckInClipboard); addMenu(saveDeckToClipboardMenu); addSeparator(); addAction(aPrintDeck); @@ -138,8 +138,8 @@ void DeckEditorMenu::retranslateUi() aSaveDeck->setText(tr("&Save deck")); aSaveDeckAs->setText(tr("Save deck &as...")); - aEditDeckInClipboard->setText(tr("Edit deck in clipboard")); aLoadDeckFromClipboard->setText(tr("Load deck from cl&ipboard...")); + aEditDeckInClipboard->setText(tr("Edit deck in clipboard")); saveDeckToClipboardMenu->setTitle(tr("Save deck to clipboard")); aSaveDeckToClipboard->setText(tr("Annotated")); @@ -165,8 +165,8 @@ void DeckEditorMenu::refreshShortcuts() aSaveDeck->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aSaveDeck")); aExportDeckDecklist->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aExportDeckDecklist")); aSaveDeckAs->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aSaveDeckAs")); - aEditDeckInClipboard->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aEditDeckInClipboard")); aLoadDeckFromClipboard->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aLoadDeckFromClipboard")); + aEditDeckInClipboard->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aEditDeckInClipboard")); aPrintDeck->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aPrintDeck")); aAnalyzeDeckDeckstats->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aAnalyzeDeck")); aClose->setShortcuts(shortcuts.getShortcut("TabDeckEditor/aClose")); diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp index 8d8926931..bfdbf39de 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.cpp @@ -372,18 +372,6 @@ void AbstractTabDeckEditor::saveDeckRemoteFinished(const Response &response) setModified(false); } -void AbstractTabDeckEditor::actEditDeckInClipboard() -{ - DlgEditDeckInClipboard dlg(*getDeckList(), this); - if (!dlg.exec()) - return; - - setDeck(dlg.getDeckList()); - setModified(true); - - deckMenu->setSaveStatus(true); -} - void AbstractTabDeckEditor::actLoadDeckFromClipboard() { auto deckOpenLocation = confirmOpen(); @@ -406,6 +394,18 @@ void AbstractTabDeckEditor::actLoadDeckFromClipboard() deckMenu->setSaveStatus(true); } +void AbstractTabDeckEditor::actEditDeckInClipboard() +{ + DlgEditDeckInClipboard dlg(*getDeckList(), this); + if (!dlg.exec()) + return; + + setDeck(dlg.getDeckList()); + setModified(true); + + deckMenu->setSaveStatus(true); +} + void AbstractTabDeckEditor::actSaveDeckToClipboard() { getDeckList()->saveToClipboard(true, true); diff --git a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h b/cockatrice/src/client/tabs/abstract_tab_deck_editor.h index a431a098f..069f1eee4 100644 --- a/cockatrice/src/client/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/client/tabs/abstract_tab_deck_editor.h @@ -91,8 +91,8 @@ protected slots: virtual void actLoadDeck(); bool actSaveDeck(); bool actSaveDeckAs(); - void actEditDeckInClipboard(); virtual void actLoadDeckFromClipboard(); + void actEditDeckInClipboard(); void actSaveDeckToClipboard(); void actSaveDeckToClipboardNoSetNameAndNumber(); void actSaveDeckToClipboardRaw(); diff --git a/cockatrice/src/settings/shortcuts_settings.h b/cockatrice/src/settings/shortcuts_settings.h index de1ffbeeb..799715c3b 100644 --- a/cockatrice/src/settings/shortcuts_settings.h +++ b/cockatrice/src/settings/shortcuts_settings.h @@ -202,13 +202,13 @@ private: {"TabDeckEditor/aLoadDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck..."), parseSequenceString("Ctrl+O"), ShortcutGroup::Deck_Editor)}, - {"TabDeckEditor/aEditDeckInClipboard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Edit Deck in Clipboard"), - parseSequenceString(""), - ShortcutGroup::Deck_Editor)}, {"TabDeckEditor/aLoadDeckFromClipboard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Load Deck from Clipboard..."), parseSequenceString("Ctrl+Shift+V"), ShortcutGroup::Deck_Editor)}, + {"TabDeckEditor/aEditDeckInClipboard", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "Edit Deck in Clipboard"), + parseSequenceString(""), + ShortcutGroup::Deck_Editor)}, {"TabDeckEditor/aNewDeck", ShortcutKey(QT_TRANSLATE_NOOP("shortcutsTab", "New Deck"), parseSequenceString("Ctrl+N"), ShortcutGroup::Deck_Editor)},