diff --git a/mainwindow.cpp b/mainwindow.cpp
index ebb1bfd..3fc477c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -17,6 +17,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
#endif
mSettings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "RogoSoftware", "yremote");
+ mNetworkManager = new QNetworkAccessManager(this);
restoreGeometry(mSettings->value("geometry", saveGeometry()).toByteArray());
move(mSettings->value("pos", pos()).toPoint());
@@ -44,6 +45,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
MainWindow::~MainWindow()
{
delete ui;
+ delete mSettings;
+ delete mNetworkManager;
}
void MainWindow::sendCommand(QString cmd)
@@ -53,9 +56,8 @@ void MainWindow::sendCommand(QString cmd)
request.setRawHeader("Content-Type", "text/xml; charset=UTF-8");
request.setRawHeader("Content-Length", QByteArray::number(cmd.size()));
- QNetworkAccessManager *networkManager = new QNetworkAccessManager(this);
- networkManager->post(request, cmd.toUtf8());
- connect(networkManager, &QNetworkAccessManager::finished, this, &MainWindow::replyFinished);
+ mNetworkManager->post(request, cmd.toUtf8());
+ connect(mNetworkManager, &QNetworkAccessManager::finished, this, &MainWindow::replyFinished);
}
void MainWindow::replyFinished(QNetworkReply* reply)
diff --git a/mainwindow.h b/mainwindow.h
index 46ead7b..3cb7d5b 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -39,19 +39,19 @@ private slots:
private:
Ui::MainWindow *ui;
- QString mAddress;
- QSettings* mSettings;
- QTimer mTimerValCollect;
- QTimer mTimerUpdateState;
- QTimer mTimerUpdateAddress;
-
bool mPowered = false;
int mVolume = 0;
QString mInput;
const int TIME_VOL_COLLECT = 400;
- const int TIME_UPDATE_STATE = 5000;
+ const int TIME_UPDATE_STATE = 10000;
const int TIME_UPDATE_ADDRESS = 1000;
-
+
+ QString mAddress;
+ QTimer mTimerValCollect;
+ QTimer mTimerUpdateState;
+ QTimer mTimerUpdateAddress;
+ QSettings* mSettings = nullptr;
+ QNetworkAccessManager *mNetworkManager = nullptr;
void sendCommand(QString cmd);
void updateUi();
@@ -61,6 +61,7 @@ private:
// QWidget interface
protected:
void moveEvent(QMoveEvent *) override;
+
};
}
diff --git a/mainwindow.ui b/mainwindow.ui
index f631219..27fc68f 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -6,16 +6,10 @@
0
0
- 373
- 166
+ 359
+ 170
-
-
- 0
- 0
-
-
Qt::NoContextMenu
@@ -24,53 +18,132 @@
false
-
-
- true
-
-
-
-
- 0
- 0
-
-
+
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Input
-
- false
-
-
-
-
-
- On
+
+ Qt::AlignBottom|Qt::AlignHCenter
false
+
+
+
+ 10
+ 30
+ 80
+ 21
+
+
+
+
+
+
+ HDMI 1
+
+
+ false
+
+
+ HDMI1
+
+
+
+
+
+ 10
+ 60
+ 80
+ 21
+
+
+
+ HDMI 2
+
+
+ HDMI2
+
+
+
+
+
+ 10
+ 90
+ 80
+ 21
+
+
+
+ HDMI 3
+
+
+ HDMI3
+
+
+
+
+
+ 110
+ 30
+ 80
+ 21
+
+
+
+ Spotify
+
+
+ Spotify
+
+
+
+
+
+ 110
+ 60
+ 80
+ 21
+
+
+
+ Airplay
+
+
+ IPOD
+
+
+
+
+
+ 110
+ 90
+ 80
+ 21
+
+
+
+ Audio In
+
+
+ AUDIO
+
+
- -
+
-
+
+
+ Address:
+
+
+
+ -
-805
@@ -101,7 +174,33 @@
- -
+
-
+
+
+ false
+
+
+
+
+
+ On
+
+
+ false
+
+
+
+ -
+
+
+ 10.0.0.227
+
+
+ Qt::AlignCenter
+
+
+
+ -
@@ -123,166 +222,21 @@
- -
-
-
-
+
-
+
+
+ Qt::Horizontal
-
- Qt::AlignCenter
+
+ QSizePolicy::MinimumExpanding
-
- false
+
+
+ 40
+ 20
+
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- HDMI 1
-
-
- false
-
-
- HDMI1
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Spotify
-
-
- Spotify
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- HDMI 2
-
-
- HDMI2
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Airplay
-
-
- IPOD
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- HDMI 3
-
-
- HDMI3
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Audio In
-
-
- AUDIO
-
-
-
-
-
-
- -
-
-
- Address:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- 10.0.0.227
-
-
- Qt::AlignCenter
-
-
- AV IP
-
-
+