1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

add reconnect button for connection settings

some ui guru should make it not stretch to width
This commit is contained in:
dubslow 2014-10-24 12:20:03 -05:00
parent 576fd7269e
commit 8153a3e8c3
3 changed files with 19 additions and 1 deletions

View File

@ -20,6 +20,7 @@
#include "src/widget/widget.h" #include "src/widget/widget.h"
#include "src/misc/settings.h" #include "src/misc/settings.h"
#include "src/misc/smileypack.h" #include "src/misc/smileypack.h"
#include "src/core.h"
#include <QMessageBox> #include <QMessageBox>
#include <QStyleFactory> #include <QStyleFactory>
@ -85,6 +86,7 @@ GeneralForm::GeneralForm(SettingsWidget *myParent) :
connect(bodyUI->cbUseProxy, &QCheckBox::stateChanged, this, &GeneralForm::onUseProxyUpdated); connect(bodyUI->cbUseProxy, &QCheckBox::stateChanged, this, &GeneralForm::onUseProxyUpdated);
connect(bodyUI->styleBrowser, SIGNAL(currentTextChanged(QString)), this, SLOT(onStyleSelected(QString))); connect(bodyUI->styleBrowser, SIGNAL(currentTextChanged(QString)), this, SLOT(onStyleSelected(QString)));
connect(bodyUI->autoAwaySpinBox, SIGNAL(editingFinished()), this, SLOT(onAutoAwayChanged())); connect(bodyUI->autoAwaySpinBox, SIGNAL(editingFinished()), this, SLOT(onAutoAwayChanged()));
connect(bodyUI->reconnectButton, &QPushButton::clicked, this, &GeneralForm::onReconnectClicked);
} }
GeneralForm::~GeneralForm() GeneralForm::~GeneralForm()
@ -178,6 +180,15 @@ void GeneralForm::onUseProxyUpdated()
Settings::getInstance().setUseProxy(state); Settings::getInstance().setUseProxy(state);
} }
void GeneralForm::onReconnectClicked()
{
if (Core::getInstance()->anyActiveCalls())
QMessageBox::warning(this, tr("Call active", "popup title"),
tr("You can't disconnect while a call is active!", "popup text"));
else
emit Widget::getInstance()->changeProfile(Settings::getInstance().getCurrentProfile());
}
void GeneralForm::reloadSmiles() void GeneralForm::reloadSmiles()
{ {
QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons(); QList<QStringList> emoticons = SmileyPack::getInstance().getEmoticons();

View File

@ -45,7 +45,7 @@ private slots:
void onSetStatusChange(); void onSetStatusChange();
void onAutoAwayChanged(); void onAutoAwayChanged();
void onSetMinimizeToTray(); void onSetMinimizeToTray();
void onReconnectClicked();
private: private:
Ui::GeneralSettings *bodyUI; Ui::GeneralSettings *bodyUI;

View File

@ -341,6 +341,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QPushButton" name="reconnectButton">
<property name="text">
<string comment="reconnect button">Reconnect</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>