Syping
/
gta5view
1
0
Fork 0
Code Issues Pull Requests Releases 12 Wiki Activity

Fixed Qt4/Qt5 builds

This commit is contained in:
Rafael 2016-11-02 07:43:59 +01:00
parent ea8141be4a
commit 6f8ef5bfa5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OptionsDialog.cpp
View File

@ -200,7 +200,7 @@ void OptionsDialog::applySettings()
settings->setValue("Language", ui->cbLanguage->itemData(ui->cbLanguage->currentIndex())); settings->setValue("Language", ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()));
#endif #endif
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050200
settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked()); settings->setValue("NavigationBar", ui->cbSnapmaticNavigationBar->isChecked());
#endif #endif
#endif #endif
@ -412,7 +412,7 @@ void OptionsDialog::setupCustomGTAFolder()
void OptionsDialog::setupSnapmaticPictureViewer() void OptionsDialog::setupSnapmaticPictureViewer()
{ {
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050200
settings->beginGroup("Interface"); settings->beginGroup("Interface");
ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", false).toBool()); ui->cbSnapmaticNavigationBar->setChecked(settings->value("NavigationBar", false).toBool());
settings->endGroup(); settings->endGroup();

10
PictureDialog.cpp
View File

@ -28,9 +28,9 @@
#include "UiModLabel.h" #include "UiModLabel.h"
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050200
#include <QtWinExtras/QtWin> #include <QtWinExtras/QtWin>
#include <QWinEvent> #include <QtWinExtras/QWinEvent>
#endif #endif
#endif #endif
@ -102,7 +102,7 @@ void PictureDialog::addPreviousNextButtons()
{ {
// Windows Vista additions // Windows Vista additions
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050200
QPalette palette; QPalette palette;
QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this); QToolBar *uiToolbar = new QToolBar("Picture Toolbar", this);
layout()->setMenuBar(uiToolbar); layout()->setMenuBar(uiToolbar);
@ -117,7 +117,7 @@ void PictureDialog::addPreviousNextButtons()
void PictureDialog::stylizeDialog() void PictureDialog::stylizeDialog()
{ {
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050200
if (QtWin::isCompositionEnabled()) if (QtWin::isCompositionEnabled())
{ {
QtWin::extendFrameIntoClientArea(this, 0, this->layout()->menuBar()->height(), 0, 0); QtWin::extendFrameIntoClientArea(this, 0, this->layout()->menuBar()->height(), 0, 0);
@ -138,7 +138,7 @@ void PictureDialog::stylizeDialog()
bool PictureDialog::event(QEvent *event) bool PictureDialog::event(QEvent *event)
{ {
#ifdef GTA5SYNC_WIN #ifdef GTA5SYNC_WIN
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050200
if (navienabled) if (navienabled)
{ {
if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange) if (event->type() == QWinEvent::CompositionChange || event->type() == QWinEvent::ColorizationChange)