Changeset - 8a90fdbd636c
[Not reviewed]
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:
0 comments (0 inline, 0 general)
CMakeLists.txt
Show inline comments
 
@@ -178,6 +178,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} 
 
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
src/main.cpp
Show inline comments
 
@@ -36,7 +36,7 @@ void messageHandler(QtMsgType type, cons
 
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;
src/mainwindow.cpp
Show inline comments
 
@@ -253,7 +253,7 @@ MainWindow::MainWindow(QWidget *parent) 
 
    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
 
@@ -302,7 +302,7 @@ void MainWindow::closeEvent(QCloseEvent 
 
    }
 

	
 
    // save settings
 
    QSettings settings("serialplot", "serialplot");
 
    QSettings settings(PROGRAM_NAME_STRING, PROGRAM_NAME_STRING);
 
    saveAllSettings(&settings);
 
    settings.sync();
 

	
0 comments (0 inline, 0 general)