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

use settings dialog in widget

This commit is contained in:
Marcel 2014-09-12 15:46:34 +02:00
parent 4e5d1c170b
commit 1b2855e05b
2 changed files with 6 additions and 1 deletions

View File

@ -31,6 +31,7 @@
#include "widget/friendlistwidget.h"
#include "camera.h"
#include "widget/form/chatform.h"
#include "widget/settingsdialog.h"
#include <QMessageBox>
#include <QDebug>
#include <QFile>
@ -155,6 +156,7 @@ Widget::Widget(QWidget *parent)
ui->statusButton->style()->polish(ui->statusButton);
camera = new Camera;
settingsDialog = new SettingsDialog(this);
// Disable some widgets until we're connected to the DHT
ui->statusButton->setEnabled(false);
@ -333,7 +335,8 @@ void Widget::onTransferClicked()
void Widget::onSettingsClicked()
{
settingsDialog->readConfig();
settingsDialog->show();
}
void Widget::hideMainForms()

View File

@ -37,6 +37,7 @@ class QMenu;
class Core;
class Camera;
class FriendListWidget;
class SettingsDialog;
class Widget : public QMainWindow
{
@ -134,6 +135,7 @@ private:
QThread* coreThread;
AddFriendForm friendForm;
FilesForm filesForm;
SettingsDialog* settingsDialog;
static Widget* instance;
GenericChatroomWidget* activeChatroomWidget;
FriendListWidget* contactListWidget;