gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-05 20:39:59 -08:00
Code Issues Packages Projects Releases Wiki Activity

Always set TabSupervisor as parent in Tab subclasses (#5449)

Browse Source 
* refactor closeTab

* always set tab parent to tabSupervisor

* set tabSupervisor parent

* use close instead of deleteLater

* be more clear about overloads
This commit is contained in:
RickyRister
2025-01-11 23:34:11 -08:00
committed by GitHub
parent 3a4ec1062b
commit a6fc88c79a
18 changed files with 25 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cockatrice/src/client/tabs/tab.cpp
View File

@@ -1,13 +1,14 @@
#include "tab.h"
#include "../ui/widgets/cards/card_info_display_widget.h"
#include "./tab_supervisor.h"
#include <QApplication>
#include <QDebug>
#include <QScreen>
Tab::Tab(TabSupervisor *_tabSupervisor, QWidget *parent)
: QMainWindow(parent), tabSupervisor(_tabSupervisor), contentsChanged(false), infoPopup(0)
Tab::Tab(TabSupervisor *_tabSupervisor)
: QMainWindow(_tabSupervisor), tabSupervisor(_tabSupervisor), contentsChanged(false), infoPopup(0)
{
setAttribute(Qt::WA_DeleteOnClose);
}

2
cockatrice/src/client/tabs/tab.h
View File

@@ -31,7 +31,7 @@ private:
QList<QMenu *> tabMenus;
public:
explicit Tab(TabSupervisor *_tabSupervisor, QWidget *parent = nullptr);
explicit Tab(TabSupervisor *_tabSupervisor);
const QList<QMenu *> &getTabMenus() const
{
return tabMenus;

7
cockatrice/src/client/tabs/tab_account.cpp
View File

@@ -18,11 +18,8 @@
#include <QPushButton>
#include <QVBoxLayout>
TabUserLists::TabUserLists(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
const ServerInfo_User &userInfo,
QWidget *parent)
: Tab(_tabSupervisor, parent), client(_client)
TabUserLists::TabUserLists(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo)
: Tab(_tabSupervisor), client(_client)
{
allUsersList = new UserList(_tabSupervisor, client, UserList::AllUsersList);
buddyList = new UserList(_tabSupervisor, client, UserList::BuddyList);

5
cockatrice/src/client/tabs/tab_account.h
View File

@@ -46,10 +46,7 @@ private:
void addToList(const std::string &listName, const QString &userName);
public:
TabUserLists(TabSupervisor *_tabSupervisor,
AbstractClient *_client,
const ServerInfo_User &userInfo,
QWidget *parent = nullptr);
TabUserLists(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &userInfo);
void retranslateUi() override;
QString getTabText() const override
{

4
cockatrice/src/client/tabs/tab_admin.cpp
View File

@@ -54,8 +54,8 @@ int ShutdownDialog::getMinutes() const
return minutesEdit->value();
}
TabAdmin::TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin, QWidget *parent)
: Tab(_tabSupervisor, parent), locked(true), client(_client), fullAdmin(_fullAdmin)
TabAdmin::TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin)
: Tab(_tabSupervisor), locked(true), client(_client), fullAdmin(_fullAdmin)
{
updateServerMessageButton = new QPushButton;
connect(updateServerMessageButton, &QPushButton::clicked, this, &TabAdmin::actUpdateServerMessage);

2
cockatrice/src/client/tabs/tab_admin.h
View File

@@ -54,7 +54,7 @@ private slots:
void actLock();
public:
TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin, QWidget *parent = nullptr);
TabAdmin(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _fullAdmin);
void retranslateUi() override;
QString getTabText() const override
{

5
cockatrice/src/client/tabs/tab_deck_editor.cpp
View File

@@ -698,8 +698,7 @@ void TabDeckEditor::loadLayout()
QTimer::singleShot(100, this, SLOT(freeDocksSize()));
}
TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
: Tab(_tabSupervisor, parent), modified(false)
TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor), modified(false)
{
setObjectName("TabDeckEditor");
@@ -982,7 +981,7 @@ void TabDeckEditor::closeRequest(bool forced)
}
emit deckEditorClosing(this);
deleteLater();
close();
}
void TabDeckEditor::actNewDeck()

2
cockatrice/src/client/tabs/tab_deck_editor.h
View File

@@ -163,7 +163,7 @@ private:
QWidget *centralWidget;
public:
explicit TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent = nullptr);
explicit TabDeckEditor(TabSupervisor *_tabSupervisor);
void retranslateUi() override;
QString getTabText() const override;
void setDeck(DeckLoader *_deckLoader);

2
cockatrice/src/client/tabs/tab_game.cpp
View File

@@ -707,7 +707,7 @@ void TabGame::closeRequest(bool forced)
emit gameClosing(this);
deleteLater();
close();
}
void TabGame::replayNextEvent(Player::EventProcessingOptions options)

3
cockatrice/src/client/tabs/tab_logs.cpp
View File

@@ -21,8 +21,7 @@
#include <QtGui>
#include <QtWidgets>
TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent)
: Tab(_tabSupervisor, parent), client(_client)
TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
{
roomTable = new QTableWidget();
roomTable->setColumnCount(6);

2
cockatrice/src/client/tabs/tab_logs.h
View File

@@ -53,7 +53,7 @@ private slots:
void restartLayout();
public:
TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent = nullptr);
TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client);
~TabLog() override;
void retranslateUi() override;
QString getTabText() const override

2
cockatrice/src/client/tabs/tab_message.cpp
View File

@@ -88,7 +88,7 @@ QString TabMessage::getTabText() const
void TabMessage::closeRequest(bool /*forced*/)
{
emit talkClosing(this);
deleteLater();
close();
}
void TabMessage::sendMessage()

2
cockatrice/src/client/tabs/tab_room.cpp
View File

@@ -174,7 +174,7 @@ void TabRoom::closeRequest(bool /*forced*/)
{
sendRoomCommand(prepareRoomCommand(Command_LeaveRoom()));
emit roomClosing(this);
deleteLater();
close();
}
void TabRoom::tabActivated()

3
cockatrice/src/client/tabs/tab_server.cpp
View File

@@ -138,8 +138,7 @@ void RoomSelector::joinClicked()
emit joinRoomRequest(id, true);
}
TabServer::TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent)
: Tab(_tabSupervisor, parent), client(_client)
TabServer::TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client)
{
roomSelector = new RoomSelector(client);
serverInfoBox = new QTextBrowser;

2
cockatrice/src/client/tabs/tab_server.h
View File

@@ -55,7 +55,7 @@ private:
bool shouldEmitUpdate = false;
public:
TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client, QWidget *parent = nullptr);
TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client);
void retranslateUi() override;
QString getTabText() const override
{

15
cockatrice/src/client/tabs/tab_supervisor.cpp
View File

@@ -339,19 +339,12 @@ void TabSupervisor::updatePingTime(int value, int max)
setTabIcon(indexOf(tabServer), QIcon(PingPixmapGenerator::generatePixmap(15, value, max)));
}
void TabSupervisor::closeButtonPressed()
{
Tab *tab = static_cast<Tab *>(static_cast<CloseButton *>(sender())->property("tab").value<QObject *>());
tab->closeRequest();
}
void TabSupervisor::addCloseButtonToTab(Tab *tab, int tabIndex)
{
QTabBar::ButtonPosition closeSide =
(QTabBar::ButtonPosition)tabBar()->style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, tabBar());
CloseButton *closeButton = new CloseButton;
connect(closeButton, &CloseButton::clicked, this, &TabSupervisor::closeButtonPressed);
closeButton->setProperty("tab", QVariant::fromValue((QObject *)tab));
auto closeSide = static_cast<QTabBar::ButtonPosition>(
tabBar()->style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, tabBar()));
auto *closeButton = new CloseButton(tab);
connect(closeButton, &CloseButton::clicked, tab, [tab] { tab->closeRequest(); });
tabBar()->setTabButton(tabIndex, closeSide, closeButton);
}

1
cockatrice/src/client/tabs/tab_supervisor.h
View File

@@ -135,7 +135,6 @@ public slots:
void openReplay(GameReplay *replay);
void maximizeMainWindow();
private slots:
void closeButtonPressed();
void updateCurrent(int index);
void updatePingTime(int value, int max);
void gameJoined(const Event_GameJoined &event);

2
cockatrice/src/client/ui/window_main.cpp
View File

@@ -866,7 +866,7 @@ MainWindow::MainWindow(QWidget *parent)
createActions();
createMenus();
tabSupervisor = new TabSupervisor(client);
tabSupervisor = new TabSupervisor(client, this);
connect(tabSupervisor, &TabSupervisor::setMenu, this, &MainWindow::updateTabMenu);
connect(tabSupervisor, &TabSupervisor::localGameEnded, this, &MainWindow::localGameEnded);
connect(tabSupervisor, &TabSupervisor::showWindowIfHidden, this, &MainWindow::showWindowIfHidden);