projects
/
irwi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix, two connection dialogs opened when opening select remote dlg
[irwi]
/
src
/
settingsdlg.cpp
diff --git
a/src/settingsdlg.cpp
b/src/settingsdlg.cpp
index
43e590b
..
c88da36
100644
(file)
--- a/
src/settingsdlg.cpp
+++ b/
src/settingsdlg.cpp
@@
-16,8
+16,8
@@
SettingsDlg::SettingsDlg(QWidget *parent)
{
QSettings settings(this);
m_layout = new QVBoxLayout(this);
{
QSettings settings(this);
m_layout = new QVBoxLayout(this);
- m_btnLayout = new QHBoxLayout(this);
- m_remoteNameLayout = new QHBoxLayout(this);
+ m_btnLayout = new QHBoxLayout();
+ m_remoteNameLayout = new QHBoxLayout();
m_advSettingsBtn = new QPushButton(tr("Advanced"), this);
m_selectRemoteBtn = new QPushButton(tr("Select remote"), this);
m_advSettingsBtn = new QPushButton(tr("Advanced"), this);
m_selectRemoteBtn = new QPushButton(tr("Select remote"), this);
@@
-67,7
+67,6
@@
SettingsDlg::SettingsDlg(QWidget *parent)
enableRateBtns(false);
} else {
setRemote(selectedRemote);
enableRateBtns(false);
} else {
setRemote(selectedRemote);
- m_remote.updateInfo();
setBusy();
}
}
setBusy();
}
}
@@
-94,13
+93,13
@@
void SettingsDlg::setBusy(bool busy)
void SettingsDlg::showAdvSettingsDlg()
{
void SettingsDlg::showAdvSettingsDlg()
{
- AdvSettingsDlg dlg(this);
+ AdvSettingsDlg dlg;
dlg.exec();
}
void SettingsDlg::showSelectRemoteDlg()
{
dlg.exec();
}
void SettingsDlg::showSelectRemoteDlg()
{
- SelectRemoteDlg dlg(this);
+ SelectRemoteDlg dlg;
connect(&dlg, SIGNAL(remoteChanged(Remote)),
this, SLOT(setRemote(Remote)));
dlg.exec();
connect(&dlg, SIGNAL(remoteChanged(Remote)),
this, SLOT(setRemote(Remote)));
dlg.exec();
@@
-108,7
+107,7
@@
void SettingsDlg::showSelectRemoteDlg()
void SettingsDlg::showAboutDlg()
{
void SettingsDlg::showAboutDlg()
{
- AboutDlg dlg(this);
+ AboutDlg dlg;
dlg.exec();
}
dlg.exec();
}