From 5efb25dca3269c4391df7191ceb8bc3c7a0a342f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 19 Aug 2015 00:42:29 +0300 Subject: [PATCH] edit mobilewidget.ui, main and wifi tab now only will be update if they are active --- sources/gui/src/mainwidget.cpp | 6 ++++-- sources/gui/src/mainwindow.cpp | 8 ++++++++ sources/gui/src/mainwindow.h | 7 ++++--- sources/gui/src/mobilewidget.ui | 6 ------ sources/gui/src/wifimenuwidget.cpp | 6 ++++-- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/sources/gui/src/mainwidget.cpp b/sources/gui/src/mainwidget.cpp index 93f4d5c..5fce06f 100644 --- a/sources/gui/src/mainwidget.cpp +++ b/sources/gui/src/mainwidget.cpp @@ -94,8 +94,10 @@ void MainWidget::update() { if (debug) qDebug() << PDEBUG; - updateMainTab(); - updateMenuMain(); + if (mainWindow->currentTab() == 0) { + updateMainTab(); + updateMenuMain(); + } if (timer.interval() != 0) return timer.start(); } diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp index 58a2097..1e7d064 100644 --- a/sources/gui/src/mainwindow.cpp +++ b/sources/gui/src/mainwindow.cpp @@ -111,6 +111,14 @@ MainWindow::~MainWindow() } +int MainWindow::currentTab() +{ + if (debug) qDebug() << PDEBUG; + + return ui->stackedWidget->currentIndex(); +} + + Qt::ToolBarArea MainWindow::getToolBarArea() { if (debug) qDebug() << PDEBUG; diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h index 5974233..f17ca40 100644 --- a/sources/gui/src/mainwindow.h +++ b/sources/gui/src/mainwindow.h @@ -42,11 +42,12 @@ class MainWindow : public QMainWindow Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0, + explicit MainWindow(QWidget *parent = nullptr, const QVariantMap args = QVariantMap(), - QTranslator *qtAppTranslator = 0, - QTranslator *appTranslator = 0); + QTranslator *qtAppTranslator = nullptr, + QTranslator *appTranslator = nullptr); ~MainWindow(); + int currentTab(); Qt::ToolBarArea getToolBarArea(); void emitNeedToBeConfigured(); QStringList printSettings(); diff --git a/sources/gui/src/mobilewidget.ui b/sources/gui/src/mobilewidget.ui index d835064..c372d42 100644 --- a/sources/gui/src/mobilewidget.ui +++ b/sources/gui/src/mobilewidget.ui @@ -89,9 +89,6 @@ The username and password to connect with - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - @@ -125,9 +122,6 @@ The access point (apn) to connect on - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - diff --git a/sources/gui/src/wifimenuwidget.cpp b/sources/gui/src/wifimenuwidget.cpp index 5d9d6a9..ed33915 100644 --- a/sources/gui/src/wifimenuwidget.cpp +++ b/sources/gui/src/wifimenuwidget.cpp @@ -75,8 +75,10 @@ void WiFiMenuWidget::update() { if (debug) qDebug() << PDEBUG; - updateWifiTab(); - updateMenuWifi(); + if (mainWindow->currentTab() == 2) { + updateWifiTab(); + updateMenuWifi(); + } if (timer.interval() != 0) return timer.start(); }