tempo-plotter Changeset - 8a90fdbd636c · protofusion repositories

Changeset - 8a90fdbd636c

Parent rev.

Child rev.

[Not reviewed]

feature/command-line-options

0 3 0

Mehmet Aslan - 7 years ago 2019-03-30 06:04:21
aaslan-mehmet@hotmail.com

ApplicationName get from PROGRAM_NAME macro in CMakeLists.txt
Default settings name get from PROGRAM_NAME macro in CMakeLists.txt

3 files changed with 4 insertions and 3 deletions:

CMakeLists.txt

src/main.cpp

src/mainwindow.cpp

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -175,12 +175,13 @@ include(GetVersion) @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_STRING=\\\"${VERSION_STRING}\\\" ")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MAJOR=${VERSION_MAJOR} ")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_MINOR=${VERSION_MINOR} ")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_PATCH=${VERSION_PATCH} ")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_REVISION=\\\"${VERSION_REVISION}\\\" ")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPROGRAM_NAME_STRING=\\\"${PROGRAM_NAME}\\\" ")
 # add make run target
 add_custom_target(run
     COMMAND ${PROGRAM_NAME}
     DEPENDS ${PROGRAM_NAME}
     WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}

src/main.cpp

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ void messageHandler(QtMsgType type, cons @@
     pMainWindow->messageHandler(type, context, msg);
+}
 int main(int argc, char *argv[])
+{
     QApplication a(argc, argv);
-    QApplication::setApplicationName("SerialPlot");
+    QApplication::setApplicationName(PROGRAM_NAME_STRING);
     QApplication::setApplicationVersion(VERSION_STRING);
     MainWindow w;
     pMainWindow = &w;
     qInstallMessageHandler(messageHandler);
     w.handleCommandLineOptions(a);

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -250,13 +250,13 @@ MainWindow::MainWindow(QWidget *parent) @@
     // init stream connections
     connect(&dataFormatPanel, &DataFormatPanel::sourceChanged,
             this, &MainWindow::onSourceChanged);
     onSourceChanged(dataFormatPanel.activeSource());
     // load default settings
-    QSettings settings("serialplot", "serialplot");
+    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);
     loadAllSettings(&settings);
     // ensure command panel has 1 command if none loaded
     if (!commandPanel.numOfCommands())
+    {
         commandPanel.newCommandAction()->trigger();
@@ @@ -299,13 +299,13 @@ void MainWindow::closeEvent(QCloseEvent @@
             event->ignore();
             return;
+        }
+    }
     // save settings
-    QSettings settings("serialplot", "serialplot");
+    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);
     saveAllSettings(&settings);
     settings.sync();
     if (settings.status() != QSettings::NoError)
+    {
         QString errorText;

0 comments (0 inline, 0 general)