mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-24 02:13:02 -07:00
Merge branch 'master' into tooomm-qt5
This commit is contained in:
commit
ae9ce701f4
290 changed files with 10683 additions and 4451 deletions
|
|
@ -23,6 +23,7 @@
|
|||
#include <QMap>
|
||||
#include <QTabWidget>
|
||||
|
||||
class TabCardArtRules;
|
||||
inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");
|
||||
|
||||
class UserListManager;
|
||||
|
|
@ -91,6 +92,7 @@ private:
|
|||
TabDeckStorage *tabDeckStorage;
|
||||
TabReplays *tabReplays;
|
||||
TabAdmin *tabAdmin;
|
||||
TabCardArtRules *tabCardArtRules;
|
||||
TabLog *tabLog;
|
||||
QMap<int, TabRoom *> roomTabs;
|
||||
QMap<int, TabGame *> gameTabs;
|
||||
|
|
@ -100,7 +102,8 @@ private:
|
|||
bool isLocalGame;
|
||||
|
||||
QAction *aTabHome, *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabArchidekt, *aTabVisualDeckStorage,
|
||||
*aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, *aTabLog;
|
||||
*aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin,
|
||||
*aTabCardArtRules, *aTabLog;
|
||||
|
||||
int myAddTab(Tab *tab, QAction *manager = nullptr);
|
||||
void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager);
|
||||
|
|
@ -133,7 +136,7 @@ public:
|
|||
return userInfo;
|
||||
}
|
||||
[[nodiscard]] AbstractClient *getClient() const;
|
||||
[[nodiscard]] const UserListManager *getUserListManager() const
|
||||
[[nodiscard]] UserListManager *getUserListManager() const
|
||||
{
|
||||
return userListManager;
|
||||
}
|
||||
|
|
@ -185,6 +188,8 @@ private slots:
|
|||
void openTabDeckStorage();
|
||||
void openTabReplays();
|
||||
void openTabAdmin();
|
||||
void actTabCardArtRules(bool checked);
|
||||
void openTabCardArtRules();
|
||||
void openTabLog();
|
||||
|
||||
void updateCurrent(int index);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue