projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2852153
)
Fix parents for all dialog windows
author
Nicolas Cornu
<nicolac76@yahoo.fr>
Sun, 2 May 2021 10:54:39 +0000
(12:54 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Sun, 30 May 2021 12:56:33 +0000
(14:56 +0200)
src/qtui/mainwin.cpp
patch
|
blob
|
history
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
9678652
..
b446130
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-809,7
+809,7
@@
void MainWin::changeActiveBufferView(int bufferViewId)
void MainWin::showPasswordChangeDlg()
{
if (Client::isCoreFeatureEnabled(Quassel::Feature::PasswordChange)) {
void MainWin::showPasswordChangeDlg()
{
if (Client::isCoreFeatureEnabled(Quassel::Feature::PasswordChange)) {
- PasswordChangeDlg{}.exec();
+ PasswordChangeDlg{
this
}.exec();
}
else {
QMessageBox box(QMessageBox::Warning,
}
else {
QMessageBox box(QMessageBox::Warning,
@@
-918,7
+918,7
@@
void MainWin::hideCurrentBuffer()
void MainWin::showNotificationsDlg()
{
void MainWin::showNotificationsDlg()
{
- SettingsPageDlg{new NotificationsSettingsPage{}}.exec();
+ SettingsPageDlg{new NotificationsSettingsPage{}
, this
}.exec();
}
void MainWin::onConfigureNetworksTriggered()
}
void MainWin::onConfigureNetworksTriggered()
@@
-1355,7
+1355,7
@@
void MainWin::setDisconnectedState()
void MainWin::userAuthenticationRequired(CoreAccount* account, bool* valid, const QString& errorMessage)
{
Q_UNUSED(errorMessage)
void MainWin::userAuthenticationRequired(CoreAccount* account, bool* valid, const QString& errorMessage)
{
Q_UNUSED(errorMessage)
- CoreConnectAuthDlg dlg(account);
+ CoreConnectAuthDlg dlg(account
, this
);
*valid = (dlg.exec() == QDialog::Accepted);
}
*valid = (dlg.exec() == QDialog::Accepted);
}
@@
-1407,7
+1407,7
@@
void MainWin::handleSslErrors(const QSslSocket* socket, bool* accepted, bool* pe
box.exec();
role = box.buttonRole(box.clickedButton());
if (role == QMessageBox::HelpRole) {
box.exec();
role = box.buttonRole(box.clickedButton());
if (role == QMessageBox::HelpRole) {
- SslInfoDlg dlg(socket);
+ SslInfoDlg dlg(socket
, this
);
dlg.exec();
}
} while (role == QMessageBox::HelpRole);
dlg.exec();
}
} while (role == QMessageBox::HelpRole);
@@
-1432,7
+1432,7
@@
void MainWin::handleCoreConnectionError(const QString& error)
void MainWin::showCoreConnectionDlg()
{
void MainWin::showCoreConnectionDlg()
{
- CoreConnectDlg dlg;
+ CoreConnectDlg dlg
{this}
;
if (dlg.exec() == QDialog::Accepted) {
AccountId accId = dlg.selectedAccount();
if (accId.isValid())
if (dlg.exec() == QDialog::Accepted) {
AccountId accId = dlg.selectedAccount();
if (accId.isValid())
@@
-1480,7
+1480,7
@@
void MainWin::showChannelList(NetworkId netId, const QString& channelFilters, bo
void MainWin::showNetworkConfig(NetworkId netId)
{
void MainWin::showNetworkConfig(NetworkId netId)
{
- SettingsPageDlg dlg{new NetworksSettingsPage{}};
+ SettingsPageDlg dlg{new NetworksSettingsPage{}
, this
};
if (netId.isValid())
qobject_cast<NetworksSettingsPage*>(dlg.currentPage())->bufferList_Open(netId);
dlg.exec();
if (netId.isValid())
qobject_cast<NetworksSettingsPage*>(dlg.currentPage())->bufferList_Open(netId);
dlg.exec();
@@
-1488,7
+1488,7
@@
void MainWin::showNetworkConfig(NetworkId netId)
void MainWin::showIgnoreList(QString newRule)
{
void MainWin::showIgnoreList(QString newRule)
{
- SettingsPageDlg dlg{new IgnoreListSettingsPage{}};
+ SettingsPageDlg dlg{new IgnoreListSettingsPage{}
, this
};
// prepare config dialog for new rule
if (!newRule.isEmpty())
qobject_cast<IgnoreListSettingsPage*>(dlg.currentPage())->editIgnoreRule(newRule);
// prepare config dialog for new rule
if (!newRule.isEmpty())
qobject_cast<IgnoreListSettingsPage*>(dlg.currentPage())->editIgnoreRule(newRule);
@@
-1497,7
+1497,7
@@
void MainWin::showIgnoreList(QString newRule)
void MainWin::showCoreInfoDlg()
{
void MainWin::showCoreInfoDlg()
{
- CoreInfoDlg{}.exec();
+ CoreInfoDlg{
this
}.exec();
}
void MainWin::showAwayLog()
}
void MainWin::showAwayLog()