projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix parents for all dialog windows
[quassel.git]
/
src
/
qtui
/
coreconnectdlg.cpp
diff --git
a/src/qtui/coreconnectdlg.cpp
b/src/qtui/coreconnectdlg.cpp
index
e22bfc5
..
4a749a7
100644
(file)
--- a/
src/qtui/coreconnectdlg.cpp
+++ b/
src/qtui/coreconnectdlg.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-27,7
+27,8
@@
#include "coreaccountsettingspage.h"
#include "icon.h"
#include "coreaccountsettingspage.h"
#include "icon.h"
-CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent)
+CoreConnectDlg::CoreConnectDlg(QWidget* parent)
+ : QDialog(parent)
{
_settingsPage = new CoreAccountSettingsPage(this);
_settingsPage->setStandAlone(true);
{
_settingsPage = new CoreAccountSettingsPage(this);
_settingsPage->setStandAlone(true);
@@
-41,11
+42,11
@@
CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent)
setWindowTitle(tr("Connect to Core"));
setWindowIcon(icon::get("network-disconnect"));
setWindowTitle(tr("Connect to Core"));
setWindowIcon(icon::get("network-disconnect"));
- auto
*
layout = new QVBoxLayout(this);
+ auto
*
layout = new QVBoxLayout(this);
layout->addWidget(_settingsPage);
layout->addWidget(_settingsPage);
- auto
*
buttonBox = new QDialogButtonBox(this);
- buttonBox->setStandardButtons(QDialogButtonBox::Ok
|
QDialogButtonBox::Cancel);
+ auto
*
buttonBox = new QDialogButtonBox(this);
+ buttonBox->setStandardButtons(QDialogButtonBox::Ok
|
QDialogButtonBox::Cancel);
layout->addWidget(buttonBox);
connect(_settingsPage, &CoreAccountSettingsPage::connectToCore, this, &QDialog::accept);
layout->addWidget(buttonBox);
connect(_settingsPage, &CoreAccountSettingsPage::connectToCore, this, &QDialog::accept);
@@
-53,25
+54,22
@@
CoreConnectDlg::CoreConnectDlg(QWidget *parent) : QDialog(parent)
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
}
-
AccountId CoreConnectDlg::selectedAccount() const
{
return _settingsPage->selectedAccount();
}
AccountId CoreConnectDlg::selectedAccount() const
{
return _settingsPage->selectedAccount();
}
-
void CoreConnectDlg::accept()
{
_settingsPage->save();
QDialog::accept();
}
void CoreConnectDlg::accept()
{
_settingsPage->save();
QDialog::accept();
}
-
/******** CoreConnectAuthDlg ****************************************************************/
/******** CoreConnectAuthDlg ****************************************************************/
-CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount
*account, QWidget *
parent)
- : QDialog(parent)
,
- _account(account)
+CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount
* account, QWidget*
parent)
+ : QDialog(parent)
+
,
_account(account)
{
ui.setupUi(this);
{
ui.setupUi(this);
@@
-89,7
+87,6
@@
CoreConnectAuthDlg::CoreConnectAuthDlg(CoreAccount *account, QWidget *parent)
ui.password->setFocus();
}
ui.password->setFocus();
}
-
void CoreConnectAuthDlg::accept()
{
_account->setUser(ui.user->text());
void CoreConnectAuthDlg::accept()
{
_account->setUser(ui.user->text());
@@
-99,7
+96,6
@@
void CoreConnectAuthDlg::accept()
QDialog::accept();
}
QDialog::accept();
}
-
void CoreConnectAuthDlg::setButtonStates()
{
bool valid = !(ui.user->text().isEmpty() || ui.password->text().isEmpty());
void CoreConnectAuthDlg::setButtonStates()
{
bool valid = !(ui.user->text().isEmpty() || ui.password->text().isEmpty());