mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-18 16:32:16 -07:00
manage visual deck storage in TabSupervisor
This commit is contained in:
parent
1ba0c8127a
commit
a586fae0bb
2 changed files with 27 additions and 12 deletions
|
|
@ -101,8 +101,8 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/)
|
||||||
}
|
}
|
||||||
|
|
||||||
TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent)
|
TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent)
|
||||||
: QTabWidget(parent), userInfo(0), client(_client), tabsMenu(tabsMenu), tabServer(0), tabUserLists(0),
|
: QTabWidget(parent), userInfo(0), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr), tabServer(0),
|
||||||
tabDeckStorage(0), tabReplays(0), tabAdmin(0), tabLog(0)
|
tabUserLists(0), tabDeckStorage(0), tabReplays(0), tabAdmin(0), tabLog(0)
|
||||||
{
|
{
|
||||||
setElideMode(Qt::ElideRight);
|
setElideMode(Qt::ElideRight);
|
||||||
setMovable(true);
|
setMovable(true);
|
||||||
|
|
@ -129,6 +129,10 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *
|
||||||
aTabDeckEditor = new QAction(this);
|
aTabDeckEditor = new QAction(this);
|
||||||
connect(aTabDeckEditor, &QAction::triggered, this, [this] { addDeckEditorTab(nullptr); });
|
connect(aTabDeckEditor, &QAction::triggered, this, [this] { addDeckEditorTab(nullptr); });
|
||||||
|
|
||||||
|
aTabVisualDeckStorage = new QAction(this);
|
||||||
|
aTabVisualDeckStorage->setCheckable(true);
|
||||||
|
connect(aTabVisualDeckStorage, &QAction::toggled, this, &TabSupervisor::actTabVisualDeckStorage);
|
||||||
|
|
||||||
aTabServer = new QAction(this);
|
aTabServer = new QAction(this);
|
||||||
aTabServer->setCheckable(true);
|
aTabServer->setCheckable(true);
|
||||||
connect(aTabServer, &QAction::toggled, this, &TabSupervisor::actTabServer);
|
connect(aTabServer, &QAction::toggled, this, &TabSupervisor::actTabServer);
|
||||||
|
|
@ -171,6 +175,7 @@ void TabSupervisor::retranslateUi()
|
||||||
{
|
{
|
||||||
// tab menu actions
|
// tab menu actions
|
||||||
aTabDeckEditor->setText(tr("Deck Editor"));
|
aTabDeckEditor->setText(tr("Deck Editor"));
|
||||||
|
aTabVisualDeckStorage->setText(tr("&Visual Deck storage"));
|
||||||
aTabServer->setText(tr("Server"));
|
aTabServer->setText(tr("Server"));
|
||||||
aTabUserLists->setText(tr("Account"));
|
aTabUserLists->setText(tr("Account"));
|
||||||
aTabDeckStorage->setText(tr("Deck storage"));
|
aTabDeckStorage->setText(tr("Deck storage"));
|
||||||
|
|
@ -272,6 +277,8 @@ void TabSupervisor::resetTabsMenu()
|
||||||
{
|
{
|
||||||
tabsMenu->clear();
|
tabsMenu->clear();
|
||||||
tabsMenu->addAction(aTabDeckEditor);
|
tabsMenu->addAction(aTabDeckEditor);
|
||||||
|
tabsMenu->addSeparator();
|
||||||
|
tabsMenu->addAction(aTabVisualDeckStorage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TabSupervisor::start(const ServerInfo_User &_userInfo)
|
void TabSupervisor::start(const ServerInfo_User &_userInfo)
|
||||||
|
|
@ -387,6 +394,20 @@ void TabSupervisor::stop()
|
||||||
userInfo = 0;
|
userInfo = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TabSupervisor::actTabVisualDeckStorage(bool checked)
|
||||||
|
{
|
||||||
|
if (checked && !tabVisualDeckStorage) {
|
||||||
|
tabVisualDeckStorage = new TabDeckStorageVisual(this, client);
|
||||||
|
myAddTab(tabVisualDeckStorage);
|
||||||
|
connect(tabVisualDeckStorage, &Tab::closed, this, [this] {
|
||||||
|
tabVisualDeckStorage = nullptr;
|
||||||
|
aTabVisualDeckStorage->setChecked(false);
|
||||||
|
});
|
||||||
|
} else if (!checked && tabVisualDeckStorage) {
|
||||||
|
tabVisualDeckStorage->closeRequest();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void TabSupervisor::actTabServer(bool checked)
|
void TabSupervisor::actTabServer(bool checked)
|
||||||
{
|
{
|
||||||
if (checked && !tabServer) {
|
if (checked && !tabServer) {
|
||||||
|
|
@ -640,14 +661,6 @@ TabDeckEditor *TabSupervisor::addDeckEditorTab(const DeckLoader *deckToOpen)
|
||||||
return tab;
|
return tab;
|
||||||
}
|
}
|
||||||
|
|
||||||
TabDeckStorageVisual *TabSupervisor::addVisualDeckStorageTab()
|
|
||||||
{
|
|
||||||
TabDeckStorageVisual *tab = new TabDeckStorageVisual(this, client);
|
|
||||||
myAddTab(tab);
|
|
||||||
setCurrentWidget(tab);
|
|
||||||
return tab;
|
|
||||||
}
|
|
||||||
|
|
||||||
void TabSupervisor::deckEditorClosed(TabDeckEditor *tab)
|
void TabSupervisor::deckEditorClosed(TabDeckEditor *tab)
|
||||||
{
|
{
|
||||||
if (tab == currentWidget())
|
if (tab == currentWidget())
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,7 @@ private:
|
||||||
AbstractClient *client;
|
AbstractClient *client;
|
||||||
QList<AbstractClient *> localClients;
|
QList<AbstractClient *> localClients;
|
||||||
QMenu *tabsMenu;
|
QMenu *tabsMenu;
|
||||||
|
TabDeckStorageVisual *tabVisualDeckStorage;
|
||||||
TabServer *tabServer;
|
TabServer *tabServer;
|
||||||
TabUserLists *tabUserLists;
|
TabUserLists *tabUserLists;
|
||||||
TabDeckStorage *tabDeckStorage;
|
TabDeckStorage *tabDeckStorage;
|
||||||
|
|
@ -83,7 +84,8 @@ private:
|
||||||
QList<TabDeckEditor *> deckEditorTabs;
|
QList<TabDeckEditor *> deckEditorTabs;
|
||||||
bool isLocalGame;
|
bool isLocalGame;
|
||||||
|
|
||||||
QAction *aTabDeckEditor, *aTabServer, *aTabUserLists, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog;
|
QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabUserLists, *aTabDeckStorage, *aTabReplays,
|
||||||
|
*aTabAdmin, *aTabLog;
|
||||||
|
|
||||||
int myAddTab(Tab *tab);
|
int myAddTab(Tab *tab);
|
||||||
void addCloseButtonToTab(Tab *tab, int tabIndex);
|
void addCloseButtonToTab(Tab *tab, int tabIndex);
|
||||||
|
|
@ -136,12 +138,12 @@ signals:
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
|
TabDeckEditor *addDeckEditorTab(const DeckLoader *deckToOpen);
|
||||||
TabDeckStorageVisual *addVisualDeckStorageTab();
|
|
||||||
void openReplay(GameReplay *replay);
|
void openReplay(GameReplay *replay);
|
||||||
void maximizeMainWindow();
|
void maximizeMainWindow();
|
||||||
private slots:
|
private slots:
|
||||||
void refreshShortcuts();
|
void refreshShortcuts();
|
||||||
|
|
||||||
|
void actTabVisualDeckStorage(bool checked);
|
||||||
void actTabServer(bool checked);
|
void actTabServer(bool checked);
|
||||||
void actTabUserLists(bool checked);
|
void actTabUserLists(bool checked);
|
||||||
void actTabDeckStorage(bool checked);
|
void actTabDeckStorage(bool checked);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue