jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-18 08:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

delete isReopeningTabs

Browse source
This commit is contained in:
RickyRister 2025-02-25 20:25:40 -08:00
parent c5a423f11e
commit 4ae91738d3
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/client/tabs/tab_supervisor.cpp
View file

@ -101,7 +101,7 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/)
TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent) TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent)
: QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr), : QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr),
tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr), tabReplays(nullptr), tabAdmin(nullptr), tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr), tabReplays(nullptr), tabAdmin(nullptr),
tabLog(nullptr), isLocalGame(false), isReopeningTabs(false) tabLog(nullptr), isLocalGame(false)
{ {
setElideMode(Qt::ElideRight); setElideMode(Qt::ElideRight);
setMovable(true); setMovable(true);
@ -285,13 +285,9 @@ void TabSupervisor::initStartupTabs()
{ {
addDeckEditorTab(nullptr); addDeckEditorTab(nullptr);
isReopeningTabs = true;
checkAndTrigger(aTabVisualDeckStorage, SettingsCache::instance().getTabVisualDeckStorageOpen()); checkAndTrigger(aTabVisualDeckStorage, SettingsCache::instance().getTabVisualDeckStorageOpen());
checkAndTrigger(aTabDeckStorage, SettingsCache::instance().getTabDeckStorageOpen()); checkAndTrigger(aTabDeckStorage, SettingsCache::instance().getTabDeckStorageOpen());
checkAndTrigger(aTabReplays, SettingsCache::instance().getTabReplaysOpen()); checkAndTrigger(aTabReplays, SettingsCache::instance().getTabReplaysOpen());
isReopeningTabs = false;
} }
/** /**
@ -365,8 +361,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)
resetTabsMenu(); resetTabsMenu();
isReopeningTabs = true;
tabsMenu->addSeparator(); tabsMenu->addSeparator();
tabsMenu->addAction(aTabServer); tabsMenu->addAction(aTabServer);
tabsMenu->addAction(aTabAccount); tabsMenu->addAction(aTabAccount);
@ -385,8 +379,6 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo)
checkAndTrigger(aTabLog, SettingsCache::instance().getTabLogOpen()); checkAndTrigger(aTabLog, SettingsCache::instance().getTabLogOpen());
} }
isReopeningTabs = false;
retranslateUi(); retranslateUi();
} }

5
cockatrice/src/client/tabs/tab_supervisor.h
View file

@ -90,11 +90,6 @@ private:
QList<TabDeckEditor *> deckEditorTabs; QList<TabDeckEditor *> deckEditorTabs;
bool isLocalGame; bool isLocalGame;
/**
* Whether we're in the middle of reopening tabs that have their open state persisted in the settings.
*/
bool isReopeningTabs;
QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, QAction *aTabDeckEditor, *aTabVisualDeckStorage, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays,
*aTabAdmin, *aTabLog; *aTabAdmin, *aTabLog;