OSDN Git Service

[UI][Qt][DISPLAY] Fix not affect configuration : UI <-> VM <-> CONFIG-FILE around...
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 2 Oct 2015 00:10:09 +0000 (09:10 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 2 Oct 2015 00:10:09 +0000 (09:10 +0900)
Please enter the commit message for your changes. Lines starting

source/src/config.cpp
source/src/qt/gui/menu_screen.cpp

index f763c3b..cb7d596 100644 (file)
@@ -265,7 +265,7 @@ void init_config()
        config.multiple_speakers = false;
        config.general_sound_level = 0;
 
-#if defined(USE_QT)
+#if defined(_USE_QT)
        config.use_opengl_scanline = false;
        config.opengl_scanline_vert = false;
        config.opengl_scanline_horiz = false;
@@ -432,7 +432,7 @@ void load_config()
 #ifdef USE_SCREEN_ROTATE
        config.rotate_type = GetPrivateProfileBool(_T("Screen"), _T("RotateType"), config.rotate_type, config_path);
 #endif
-#if defined(USE_QT)
+#if defined(_USE_QT)
        config.use_opengl_scanline = GetPrivateProfileBool(_T("Screen"), _T("UseOpenGLScanLine"),
                                                                                                           config.use_opengl_scanline, config_path);
        config.opengl_scanline_vert = GetPrivateProfileBool(_T("Screen"), _T("OpenGLScanLineVert"),
@@ -623,7 +623,7 @@ void save_config()
 #ifdef USE_SCREEN_ROTATE
        WritePrivateProfileBool(_T("Screen"), _T("RotateType"), config.rotate_type, config_path);
 #endif
-#if defined(USE_QT)
+#if defined(_USE_QT)
        WritePrivateProfileBool(_T("Screen"), _T("UseOpenGLScanLine"),
                                                        config.use_opengl_scanline, config_path);
        WritePrivateProfileBool(_T("Screen"), _T("OpenGLScanLineVert"),
index 058704e..e8a3e75 100644 (file)
@@ -123,7 +123,7 @@ void Ui_MainWindow::ConfigScreenMenu(void)
        actionOpenGL_Filter->setObjectName(QString::fromUtf8("actionOpenGL_Filter"));
        actionOpenGL_Filter->setEnabled(true);
        actionOpenGL_Filter->setCheckable(true);
-       if(config.use_opengl_filters == 0) actionOpenGL_Filter->setChecked(true);
+       if(config.use_opengl_filters) actionOpenGL_Filter->setChecked(true);
        connect(actionOpenGL_Filter, SIGNAL(toggled(bool)), this, SLOT(set_gl_crt_filter(bool)));
 
        actionDot_by_Dot = new Action_Control(this);