Changeset - ceb86f2d0c0a
Parent rev.
Child rev.
[Not reviewed]
update-checker
0 7 3
Hasan Yavuz ÖZDERYA - 8 years ago 2017-08-19 15:19:31
hy@ozderya.net
added update check dialog
10 files changed with 219 insertions and 14 deletions:
CMakeLists.txt
2
serialplot.pro
6
3
src/mainwindow.cpp
5
5
src/mainwindow.h
2
2
src/mainwindow.ui
13
3
src/updatecheckdialog.cpp
68
src/updatecheckdialog.h
46
src/updatecheckdialog.ui
58
src/updatechecker.cpp
14
1
src/updatechecker.h
5
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -68,24 +68,25 @@ qt5_wrap_ui(UI_FILES
 
  src/about_dialog.ui
 
  src/snapshotview.ui
 
  src/commandpanel.ui
 
  src/commandwidget.ui
 
  src/dataformatpanel.ui
 
  src/plotcontrolpanel.ui
 
  src/recordpanel.ui
 
  src/numberformatbox.ui
 
  src/endiannessbox.ui
 
  src/binarystreamreadersettings.ui
 
  src/asciireadersettings.ui
 
  src/framedreadersettings.ui
 
  src/updatecheckdialog.ui
 
  )
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
  qt5_add_resources(RES_FILES misc/icons.qrc misc/winicons.qrc)

			




	
	
	
		
 
else (WIN32)

			




	
	
	
		
 
  qt5_add_resources(RES_FILES misc/icons.qrc)

			




	
	
	
		
 
endif (WIN32)

			




	
	
	
		
 

			




	
	
	
		
 
add_executable(${PROGRAM_NAME} WIN32

			




	
	
	
		
 
  src/main.cpp

			




	
	
	
		
 
  src/mainwindow.cpp

			




	
	
	
		
 
  src/portcontrol.cpp

			




	
	
		
 
@@ -119,24 +120,25 @@ add_executable(${PROGRAM_NAME} WIN32

			




	
	
	
		
 
  src/abstractreader.cpp

			




	
	
	
		
 
  src/binarystreamreader.cpp

			




	
	
	
		
 
  src/binarystreamreadersettings.cpp

			




	
	
	
		
 
  src/asciireader.cpp

			




	
	
	
		
 
  src/asciireadersettings.cpp

			




	
	
	
		
 
  src/demoreader.cpp

			




	
	
	
		
 
  src/framedreader.cpp

			




	
	
	
		
 
  src/framedreadersettings.cpp

			




	
	
	
		
 
  src/plotmanager.cpp

			




	
	
	
		
 
  src/numberformat.cpp

			




	
	
	
		
 
  src/updatechecker.cpp

			




	
	
	
		
 
  src/versionnumber.cpp

			




	
	
	
		
 
  src/updatecheckdialog.cpp

			




	
	
	
		
 
  misc/windows_icon.rc

			




	
	
	
		
 
  ${UI_FILES}

			




	
	
	
		
 
  ${RES_FILES}

			




	
	
	
		
 
  )

			




	
	
	
		
 

			




	
	
	
		
 
# Use the Widgets module from Qt 5.

			




	
	
	
		
 
target_link_libraries(${PROGRAM_NAME}

			




	
	
	
		
 
  ${QWT_LIBRARY}

			




	
	
	
		
 
  ${QTCOLORWIDGETS_LIBRARIES}

			




	
	
	
		
 
  )

			




	
	
	
		
 
qt5_use_modules(${PROGRAM_NAME} Widgets SerialPort Network)

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    serialplot.pro
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,25 +60,26 @@ SOURCES += \

			




	
	
	
		
 
    src/endiannessbox.cpp \

			




	
	
	
		
 
    src/framedreadersettings.cpp \

			




	
	
	
		
 
    src/abstractreader.cpp \

			




	
	
	
		
 
    src/binarystreamreader.cpp \

			




	
	
	
		
 
    src/binarystreamreadersettings.cpp \

			




	
	
	
		
 
    src/asciireadersettings.cpp \

			




	
	
	
		
 
    src/asciireader.cpp \

			




	
	
	
		
 
    src/demoreader.cpp \

			




	
	
	
		
 
    src/framedreader.cpp \

			




	
	
	
		
 
    src/plotmanager.cpp \

			




	
	
	
		
 
    src/numberformat.cpp \

			




	
	
	
		
 
    src/recordpanel.cpp \

			




	
	
	
		
 
    src/updatechecker.cpp

			




	
	
	
		
 
    src/updatechecker.cpp \

			




	
	
	
		
 
    src/updatecheckdialog.cpp

			




	
	
	
		
 

			




	
	
	
		
 
HEADERS += \

			




	
	
	
		
 
    src/mainwindow.h \

			




	
	
	
		
 
    src/utils.h \

			




	
	
	
		
 
    src/portcontrol.h \

			




	
	
	
		
 
    src/floatswap.h \

			




	
	
	
		
 
    src/plot.h \

			




	
	
	
		
 
    src/zoomer.h \

			




	
	
	
		
 
    src/hidabletabwidget.h \

			




	
	
	
		
 
    src/framebuffer.h \

			




	
	
	
		
 
    src/scalepicker.h \

			




	
	
	
		
 
    src/scalezoomer.h \

			




	
	
		
 
@@ -101,39 +102,41 @@ HEADERS += \

			




	
	
	
		
 
    src/framedreadersettings.h \

			




	
	
	
		
 
    src/abstractreader.h \

			




	
	
	
		
 
    src/binarystreamreader.h \

			




	
	
	
		
 
    src/binarystreamreadersettings.h \

			




	
	
	
		
 
    src/asciireadersettings.h \

			




	
	
	
		
 
    src/asciireader.h \

			




	
	
	
		
 
    src/demoreader.h \

			




	
	
	
		
 
    src/framedreader.h \

			




	
	
	
		
 
    src/plotmanager.h \

			




	
	
	
		
 
    src/setting_defines.h \

			




	
	
	
		
 
    src/numberformat.h \

			




	
	
	
		
 
    src/recordpanel.h \

			




	
	
	
		
 
    src/updatechecker.h

			




	
	
	
		
 
    src/updatechecker.h \

			




	
	
	
		
 
    src/updatecheckdialog.h

			




	
	
	
		
 

			




	
	
	
		
 
FORMS += \

			




	
	
	
		
 
    src/mainwindow.ui \

			




	
	
	
		
 
    src/about_dialog.ui \

			




	
	
	
		
 
    src/portcontrol.ui \

			




	
	
	
		
 
    src/snapshotview.ui \

			




	
	
	
		
 
    src/commandpanel.ui \

			




	
	
	
		
 
    src/commandwidget.ui \

			




	
	
	
		
 
    src/dataformatpanel.ui \

			




	
	
	
		
 
    src/plotcontrolpanel.ui \

			




	
	
	
		
 
    src/numberformatbox.ui \

			




	
	
	
		
 
    src/endiannessbox.ui \

			




	
	
	
		
 
    src/framedreadersettings.ui \

			




	
	
	
		
 
    src/binarystreamreadersettings.ui \

			




	
	
	
		
 
    src/asciireadersettings.ui \

			




	
	
	
		
 
    src/recordpanel.ui

			




	
	
	
		
 
    src/recordpanel.ui \

			




	
	
	
		
 
    src/updatecheckdialog.ui

			




	
	
	
		
 

			




	
	
	
		
 
INCLUDEPATH += qmake/ src/

			




	
	
	
		
 

			




	
	
	
		
 
CONFIG += c++11

			




	
	
	
		
 

			




	
	
	
		
 
RESOURCES += misc/icons.qrc

			




	
	
	
		
 

			




	
	
	
		
 
win32 {

			




	
	
	
		
 
    RESOURCES += misc/winicons.qrc

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/mainwindow.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,29 +51,29 @@ const QMap<int, QString> panelSettingMap

			




	
	
	
		
 
        {0, "Port"},

			




	
	
	
		
 
        {1, "DataFormat"},

			




	
	
	
		
 
        {2, "Plot"},

			




	
	
	
		
 
        {3, "Commands"}

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
MainWindow::MainWindow(QWidget *parent) :

			




	
	
	
		
 
    QMainWindow(parent),

			




	
	
	
		
 
    ui(new Ui::MainWindow),

			




	
	
	
		
 
    aboutDialog(this),

			




	
	
	
		
 
    portControl(&serialPort),

			




	
	
	
		
 
    channelMan(1, 1, this),

			




	
	
	
		
 
    updateChecker(this),

			




	
	
	
		
 
    snapshotMan(this, &channelMan),

			




	
	
	
		
 
    commandPanel(&serialPort),

			




	
	
	
		
 
    dataFormatPanel(&serialPort, &channelMan, &recorder),

			




	
	
	
		
 
    recordPanel(&recorder, &channelMan)

			




	
	
	
		
 
    recordPanel(&recorder, &channelMan),

			




	
	
	
		
 
    updateCheckDialog(this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    plotMan = new PlotManager(ui->plotArea, channelMan.infoModel());

			




	
	
	
		
 

			




	
	
	
		
 
    ui->tabWidget->insertTab(0, &portControl, "Port");

			




	
	
	
		
 
    ui->tabWidget->insertTab(1, &dataFormatPanel, "Data Format");

			




	
	
	
		
 
    ui->tabWidget->insertTab(2, &plotControlPanel, "Plot");

			




	
	
	
		
 
    ui->tabWidget->insertTab(3, &commandPanel, "Commands");

			




	
	
	
		
 
    ui->tabWidget->insertTab(4, &recordPanel, "Record");

			




	
	
	
		
 
    ui->tabWidget->setCurrentIndex(0);

			




	
	
	
		
 
    auto tbPortControl = portControl.toolBar();

			




	
	
		
 
@@ -104,24 +104,27 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
    ui->menuView->addSeparator();

			




	
	
	
		
 

			




	
	
	
		
 
    QMenu* tbMenu = ui->menuView->addMenu("Toolbars");

			




	
	
	
		
 
    tbMenu->addAction(ui->plotToolBar->toggleViewAction());

			




	
	
	
		
 
    tbMenu->addAction(portControl.toolBar()->toggleViewAction());

			




	
	
	
		
 

			




	
	
	
		
 
    // init UI signals

			




	
	
	
		
 

			




	
	
	
		
 
    // Help menu signals

			




	
	
	
		
 
    QObject::connect(ui->actionHelpAbout, &QAction::triggered,

			




	
	
	
		
 
              &aboutDialog, &QWidget::show);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionCheckUpdate, &QAction::triggered,

			




	
	
	
		
 
              &updateCheckDialog, &QWidget::show);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionReportBug, &QAction::triggered,

			




	
	
	
		
 
                     [](){QDesktopServices::openUrl(QUrl(BUG_REPORT_URL));});

			




	
	
	
		
 

			




	
	
	
		
 
    // File menu signals

			




	
	
	
		
 
    QObject::connect(ui->actionExportCsv, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onExportCsv);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionSaveSettings, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onSaveSettings);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionLoadSettings, &QAction::triggered,

			




	
	
	
		
 
                     this, &MainWindow::onLoadSettings);

			




	
	
		
 
@@ -230,27 +233,24 @@ MainWindow::MainWindow(QWidget *parent) 

			




	
	
	
		
 
    ui->statusBar->addPermanentWidget(&spsLabel);

			




	
	
	
		
 
    QObject::connect(&dataFormatPanel,

			




	
	
	
		
 
                     &DataFormatPanel::samplesPerSecondChanged,

			




	
	
	
		
 
                     this, &MainWindow::onSpsChanged);

			




	
	
	
		
 

			




	
	
	
		
 
    // init demo

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     this, &MainWindow::enableDemo);

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->actionDemoMode, &QAction::toggled,

			




	
	
	
		
 
                     plotMan, &PlotManager::showDemoIndicator);

			




	
	
	
		
 

			




	
	
	
		
 
    // TEST UPDATE CHECKER

			




	
	
	
		
 
    updateChecker.checkUpdate();

			




	
	
	
		
 

			




	
	
	
		
 
    // load default settings

			




	
	
	
		
 
    QSettings settings("serialplot", "serialplot");

			




	
	
	
		
 
    loadAllSettings(&settings);

			




	
	
	
		
 

			




	
	
	
		
 
    // ensure command panel has 1 command if none loaded

			




	
	
	
		
 
    if (!commandPanel.numOfCommands())

			




	
	
	
		
 
    {

			




	
	
	
		
 
        commandPanel.newCommandAction()->trigger();

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // Important: This should be after newCommandAction is triggered

			




	
	
	
		
 
    // (above) we don't want user to be greeted with command panel on

			




        

    


    
    

    

        

                

                    src/mainwindow.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,25 +36,25 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "portcontrol.h"

			




	
	
	
		
 
#include "commandpanel.h"

			




	
	
	
		
 
#include "dataformatpanel.h"

			




	
	
	
		
 
#include "plotcontrolpanel.h"

			




	
	
	
		
 
#include "recordpanel.h"

			




	
	
	
		
 
#include "ui_about_dialog.h"

			




	
	
	
		
 
#include "framebuffer.h"

			




	
	
	
		
 
#include "channelmanager.h"

			




	
	
	
		
 
#include "snapshotmanager.h"

			




	
	
	
		
 
#include "plotmanager.h"

			




	
	
	
		
 
#include "datarecorder.h"

			




	
	
	
		
 
#include "updatechecker.h"

			




	
	
	
		
 
#include "updatecheckdialog.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class MainWindow;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class MainWindow : public QMainWindow

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit MainWindow(QWidget *parent = 0);

			




	
	
	
		
 
    ~MainWindow();

			




	
	
		
 
@@ -71,31 +71,31 @@ private:

			




	
	
	
		
 
    void setupAboutDialog();

			




	
	
	
		
 

			




	
	
	
		
 
    QSerialPort serialPort;

			




	
	
	
		
 
    PortControl portControl;

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned int numOfSamples;

			




	
	
	
		
 

			




	
	
	
		
 
    QList<QwtPlotCurve*> curves;

			




	
	
	
		
 
    ChannelManager channelMan;

			




	
	
	
		
 
    PlotManager* plotMan;

			




	
	
	
		
 
    SnapshotManager snapshotMan;

			




	
	
	
		
 
    DataRecorder recorder;       // operated by `recordPanel`

			




	
	
	
		
 
    UpdateChecker updateChecker;

			




	
	
	
		
 

			




	
	
	
		
 
    QLabel spsLabel;

			




	
	
	
		
 
    CommandPanel commandPanel;

			




	
	
	
		
 
    DataFormatPanel dataFormatPanel;

			




	
	
	
		
 
    RecordPanel recordPanel;

			




	
	
	
		
 
    PlotControlPanel plotControlPanel;

			




	
	
	
		
 
    UpdateCheckDialog updateCheckDialog;

			




	
	
	
		
 

			




	
	
	
		
 
    bool isDemoRunning();

			




	
	
	
		
 
    /// Stores settings for all modules

			




	
	
	
		
 
    void saveAllSettings(QSettings* settings);

			




	
	
	
		
 
    /// Load settings for all modules

			




	
	
	
		
 
    void loadAllSettings(QSettings* settings);

			




	
	
	
		
 
    /// Stores main window settings into a `QSettings`

			




	
	
	
		
 
    void saveMWSettings(QSettings* settings);

			




	
	
	
		
 
    /// Loads main window settings from a `QSettings`

			




	
	
	
		
 
    void loadMWSettings(QSettings* settings);

			




	
	
	
		
 

			




	
	
	
		
 
    /// `QWidget::closeEvent` handler

			




        

    


    
    

    

        

                

                    src/mainwindow.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -81,33 +81,34 @@

			




	
	
	
		
 
       </layout>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </widget>

			




	
	
	
		
 
    </item>

			




	
	
	
		
 
   </layout>

			




	
	
	
		
 
  </widget>

			




	
	
	
		
 
  <widget class="QMenuBar" name="menuBar">

			




	
	
	
		
 
   <property name="geometry">

			




	
	
	
		
 
    <rect>

			




	
	
	
		
 
     <x>0</x>

			




	
	
	
		
 
     <y>0</y>

			




	
	
	
		
 
     <width>653</width>

			




	
	
	
		
 
     <height>27</height>

			




	
	
	
		
 
     <height>25</height>

			




	
	
	
		
 
    </rect>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <widget class="QMenu" name="menuHelp">

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>&amp;Help</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionDemoMode"/>

			




	
	
	
		
 
    <addaction name="actionReportBug"/>

			




	
	
	
		
 
    <addaction name="actionCheckUpdate"/>

			




	
	
	
		
 
    <addaction name="actionHelpAbout"/>

			




	
	
	
		
 
   </widget>

			




	
	
	
		
 
   <widget class="QMenu" name="menuFile">

			




	
	
	
		
 
    <property name="title">

			




	
	
	
		
 
     <string>&amp;File</string>

			




	
	
	
		
 
    </property>

			




	
	
	
		
 
    <addaction name="actionSaveSettings"/>

			




	
	
	
		
 
    <addaction name="actionLoadSettings"/>

			




	
	
	
		
 
    <addaction name="actionExportCsv"/>

			




	
	
	
		
 
    <addaction name="separator"/>

			




	
	
	
		
 
    <addaction name="actionQuit"/>

			




	
	
	
		
 
   </widget>

			




	
	
		
 
@@ -133,39 +134,43 @@

			




	
	
	
		
 
   <addaction name="actionPause"/>

			




	
	
	
		
 
   <addaction name="actionClear"/>

			




	
	
	
		
 
  </widget>

			




	
	
	
		
 
  <widget class="QStatusBar" name="statusBar"/>

			




	
	
	
		
 
  <action name="actionPause">

			




	
	
	
		
 
   <property name="checkable">

			




	
	
	
		
 
    <bool>true</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="checked">

			




	
	
	
		
 
    <bool>false</bool>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="icon">

			




	
	
	
		
 
    <iconset theme="player_pause"/>

			




	
	
	
		
 
    <iconset theme="player_pause">

			




	
	
	
		
 
     <normaloff/>

			




	
	
	
		
 
    </iconset>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Pause</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Pause Plotting</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="shortcut">

			




	
	
	
		
 
    <string>P</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionClear">

			




	
	
	
		
 
   <property name="icon">

			




	
	
	
		
 
    <iconset theme="editclear"/>

			




	
	
	
		
 
    <iconset theme="editclear">

			




	
	
	
		
 
     <normaloff/>

			




	
	
	
		
 
    </iconset>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>Clear</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="shortcut">

			




	
	
	
		
 
    <string>Ctrl+K</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionHelpAbout">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;About</string>

			




	
	
	
		
 
   </property>

			




	
	
		
 
@@ -212,24 +217,29 @@

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Save Settings to a File</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionLoadSettings">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;Load Settings</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
   <property name="toolTip">

			




	
	
	
		
 
    <string>Load Settings from a File</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
  <action name="actionCheckUpdate">

			




	
	
	
		
 
   <property name="text">

			




	
	
	
		
 
    <string>&amp;Check Update</string>

			




	
	
	
		
 
   </property>

			




	
	
	
		
 
  </action>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <layoutdefault spacing="6" margin="11"/>

			




	
	
	
		
 
 <customwidgets>

			




	
	
	
		
 
  <customwidget>

			




	
	
	
		
 
   <class>HidableTabWidget</class>

			




	
	
	
		
 
   <extends>QTabWidget</extends>

			




	
	
	
		
 
   <header>hidabletabwidget.h</header>

			




	
	
	
		
 
   <container>1</container>

			




	
	
	
		
 
  </customwidget>

			




	
	
	
		
 
 </customwidgets>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections/>

			




        

    


    
    

    

        

                

                    src/updatecheckdialog.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2017 Hasan Yavuz Özderya

			




	
	
	
		
 

			




	
	
	
		
 
  This file is part of serialplot.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is free software: you can redistribute it and/or modify

			




	
	
	
		
 
  it under the terms of the GNU General Public License as published by

			




	
	
	
		
 
  the Free Software Foundation, either version 3 of the License, or

			




	
	
	
		
 
  (at your option) any later version.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is distributed in the hope that it will be useful,

			




	
	
	
		
 
  but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
  GNU General Public License for more details.

			




	
	
	
		
 

			




	
	
	
		
 
  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#include "updatecheckdialog.h"

			




	
	
	
		
 
#include "ui_updatecheckdialog.h"

			




	
	
	
		
 

			




	
	
	
		
 
UpdateCheckDialog::UpdateCheckDialog(QWidget *parent) :

			




	
	
	
		
 
    QDialog(parent),

			




	
	
	
		
 
    ui(new Ui::UpdateCheckDialog)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&updateChecker, &UpdateChecker::checkFailed,

			




	
	
	
		
 
            [this](QString errorMessage)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                ui->label->setText(QString("Update check failed.\n") + errorMessage);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&updateChecker, &UpdateChecker::checkFinished,

			




	
	
	
		
 
            [this](bool found, QString newVersion, QString downloadUrl)

			




	
	
	
		
 
            {

			




	
	
	
		
 
                QString text;

			




	
	
	
		
 
                if (!found)

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    text = "There is no update yet.";

			




	
	
	
		
 
                }

			




	
	
	
		
 
                else

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    text = QString("Found update to version %1. Click to <a href=\"%2\">download</a>.")\

			




	
	
	
		
 
                        .arg(newVersion).arg(downloadUrl);

			




	
	
	
		
 
                    qDebug() << text;

			




	
	
	
		
 
                }

			




	
	
	
		
 

			




	
	
	
		
 
                ui->label->setText(text);

			




	
	
	
		
 
            });

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
UpdateCheckDialog::~UpdateCheckDialog()

			




	
	
	
		
 
{

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateCheckDialog::showEvent(QShowEvent *event)

			




	
	
	
		
 
{

			




	
	
	
		
 
    updateChecker.checkUpdate();

			




	
	
	
		
 
    ui->label->setText("Checking update...");

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateCheckDialog::closeEvent(QShowEvent *event)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (updateChecker.isChecking()) updateChecker.cancelCheck();

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    src/updatecheckdialog.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
/*

			




	
	
	
		
 
  Copyright © 2017 Hasan Yavuz Özderya

			




	
	
	
		
 

			




	
	
	
		
 
  This file is part of serialplot.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is free software: you can redistribute it and/or modify

			




	
	
	
		
 
  it under the terms of the GNU General Public License as published by

			




	
	
	
		
 
  the Free Software Foundation, either version 3 of the License, or

			




	
	
	
		
 
  (at your option) any later version.

			




	
	
	
		
 

			




	
	
	
		
 
  serialplot is distributed in the hope that it will be useful,

			




	
	
	
		
 
  but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
  GNU General Public License for more details.

			




	
	
	
		
 

			




	
	
	
		
 
  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef UPDATECHECKDIALOG_H

			




	
	
	
		
 
#define UPDATECHECKDIALOG_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QDialog>

			




	
	
	
		
 
#include "updatechecker.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class UpdateCheckDialog;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class UpdateCheckDialog : public QDialog

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit UpdateCheckDialog(QWidget *parent = 0);

			




	
	
	
		
 
    ~UpdateCheckDialog();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::UpdateCheckDialog *ui;

			




	
	
	
		
 
    UpdateChecker updateChecker;

			




	
	
	
		
 

			




	
	
	
		
 
    void showEvent(QShowEvent *event);

			




	
	
	
		
 
    void closeEvent(QShowEvent *event);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // UPDATECHECKDIALOG_H

			




        

    


    
    

    

        

                

                    src/updatecheckdialog.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
<?xml version="1.0" encoding="UTF-8"?>

			




	
	
	
		
 
<ui version="4.0">

			




	
	
	
		
 
 <class>UpdateCheckDialog</class>

			




	
	
	
		
 
 <widget class="QDialog" name="UpdateCheckDialog">

			




	
	
	
		
 
  <property name="geometry">

			




	
	
	
		
 
   <rect>

			




	
	
	
		
 
    <x>0</x>

			




	
	
	
		
 
    <y>0</y>

			




	
	
	
		
 
    <width>400</width>

			




	
	
	
		
 
    <height>148</height>

			




	
	
	
		
 
   </rect>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <property name="windowTitle">

			




	
	
	
		
 
   <string>Check Update</string>

			




	
	
	
		
 
  </property>

			




	
	
	
		
 
  <layout class="QVBoxLayout" name="verticalLayout">

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <widget class="QLabel" name="label">

			




	
	
	
		
 
     <property name="text">

			




	
	
	
		
 
      <string>Checking update...</string>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="openExternalLinks">

			




	
	
	
		
 
      <bool>true</bool>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </widget>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <widget class="QDialogButtonBox" name="buttonBox">

			




	
	
	
		
 
     <property name="orientation">

			




	
	
	
		
 
      <enum>Qt::Horizontal</enum>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
     <property name="standardButtons">

			




	
	
	
		
 
      <set>QDialogButtonBox::Close</set>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </widget>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
  </layout>

			




	
	
	
		
 
 </widget>

			




	
	
	
		
 
 <resources/>

			




	
	
	
		
 
 <connections>

			




	
	
	
		
 
  <connection>

			




	
	
	
		
 
   <sender>buttonBox</sender>

			




	
	
	
		
 
   <signal>clicked(QAbstractButton*)</signal>

			




	
	
	
		
 
   <receiver>UpdateCheckDialog</receiver>

			




	
	
	
		
 
   <slot>close()</slot>

			




	
	
	
		
 
   <hints>

			




	
	
	
		
 
    <hint type="sourcelabel">

			




	
	
	
		
 
     <x>199</x>

			




	
	
	
		
 
     <y>125</y>

			




	
	
	
		
 
    </hint>

			




	
	
	
		
 
    <hint type="destinationlabel">

			




	
	
	
		
 
     <x>199</x>

			




	
	
	
		
 
     <y>73</y>

			




	
	
	
		
 
    </hint>

			




	
	
	
		
 
   </hints>

			




	
	
	
		
 
  </connection>

			




	
	
	
		
 
 </connections>

			




	
	
	
		
 
</ui>

			




        

    


    
    

    

        

                

                    src/updatechecker.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -25,32 +25,44 @@

			




	
	
	
		
 
#include <algorithm>

			




	
	
	
		
 
#include <functional>

			




	
	
	
		
 

			




	
	
	
		
 
#include "updatechecker.h"

			




	
	
	
		
 

			




	
	
	
		
 
// This link returns the list of downloads in JSON format. Note that we only use

			




	
	
	
		
 
// the first page because results are sorted new to old.

			




	
	
	
		
 
const char BB_DOWNLOADS_URL[] = "https://api.bitbucket.org/2.0/repositories/hyozd/serialplot/downloads?fields=values.name,values.links.self.href";

			




	
	
	
		
 

			




	
	
	
		
 
UpdateChecker::UpdateChecker(QObject *parent) :

			




	
	
	
		
 
    QObject(parent), nam(this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    activeReply = NULL;

			




	
	
	
		
 

			




	
	
	
		
 
    connect(&nam, &QNetworkAccessManager::finished,

			




	
	
	
		
 
            this, &UpdateChecker::onReqFinished);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool UpdateChecker::isChecking() const

			




	
	
	
		
 
{

			




	
	
	
		
 
    return activeReply != NULL && !activeReply->isFinished();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateChecker::checkUpdate()

			




	
	
	
		
 
{

			




	
	
	
		
 
    auto req = QNetworkRequest(QUrl(BB_DOWNLOADS_URL));

			




	
	
	
		
 
    nam.get(req);

			




	
	
	
		
 
    activeReply = nam.get(req);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateChecker::cancelCheck()

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (activeReply != NULL) activeReply->abort();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void UpdateChecker::onReqFinished(QNetworkReply* reply)

			




	
	
	
		
 
{

			




	
	
	
		
 
    if (reply->error() != QNetworkReply::NoError)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        emit checkFailed(QString("Network error: ") + reply->errorString());

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QJsonParseError error;

			




	
	
	
		
 
        auto data = QJsonDocument::fromJson(reply->readAll(), &error);

			




	
	
		
 
@@ -73,24 +85,25 @@ void UpdateChecker::onReqFinished(QNetwo

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    emit checkFinished(

			




	
	
	
		
 
                        true, updateFile.version.toString(), updateFile.link);

			




	
	
	
		
 
                }

			




	
	
	
		
 
                else

			




	
	
	
		
 
                {

			




	
	
	
		
 
                    emit checkFinished(false, "", "");

			




	
	
	
		
 
                }

			




	
	
	
		
 
            }

			




	
	
	
		
 
        }

			




	
	
	
		
 
    }

			




	
	
	
		
 
    reply->deleteLater();

			




	
	
	
		
 
    activeReply = NULL;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
bool UpdateChecker::parseData(const QJsonDocument& data, QList<FileInfo>& files) const

			




	
	
	
		
 
{

			




	
	
	
		
 
    /* Data is expected to be in this form:

			




	
	
	
		
 

			




	
	
	
		
 
    {

			




	
	
	
		
 
       "values": [

			




	
	
	
		
 
       {

			




	
	
	
		
 
         "name": "serialplot-0.9.1-x86_64.AppImage",

			




	
	
	
		
 
         "links": {

			




	
	
	
		
 
           "self": {

			




        

    


    
    

    

        

                

                    src/updatechecker.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -24,49 +24,54 @@

			




	
	
	
		
 
#include <QNetworkAccessManager>

			




	
	
	
		
 
#include <QNetworkReply>

			




	
	
	
		
 
#include <QList>

			




	
	
	
		
 

			




	
	
	
		
 
#include "versionnumber.h"

			




	
	
	
		
 

			




	
	
	
		
 
class UpdateChecker : public QObject

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 
public:

			




	
	
	
		
 
    explicit UpdateChecker(QObject *parent = 0);

			




	
	
	
		
 

			




	
	
	
		
 
    bool isChecking() const;

			




	
	
	
		
 

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void checkFinished(bool found, QString newVersion, QString downloadUrl);

			




	
	
	
		
 
    void checkFailed(QString errorMessage);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    void checkUpdate();

			




	
	
	
		
 
    void cancelCheck();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    enum class FileArch

			




	
	
	
		
 
    {

			




	
	
	
		
 
        unknown,

			




	
	
	
		
 
        i386,

			




	
	
	
		
 
        amd64,

			




	
	
	
		
 
        arm

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    struct FileInfo

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QString name;

			




	
	
	
		
 
        QString link;

			




	
	
	
		
 
        bool hasVersion;

			




	
	
	
		
 
        VersionNumber version;

			




	
	
	
		
 
        FileArch arch;

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    QNetworkAccessManager nam;

			




	
	
	
		
 
    QNetworkReply* activeReply;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Parses json and creates a list of files

			




	
	
	
		
 
    bool parseData(const QJsonDocument& data, QList<FileInfo>& files) const;

			




	
	
	
		
 
    /// Finds the update file in the file list. Returns `-1` if no new version

			




	
	
	
		
 
    /// is found.

			




	
	
	
		
 
    bool findUpdate(const QList<FileInfo>& files, FileInfo& foundFile) const;

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void onReqFinished(QNetworkReply* reply);

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // UPDATECHECKER_H

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-13856
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support