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

Build system update, minor fix
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Syping 2021-02-17 23:16:00 +01:00
parent 0686b9a65d
commit 962b1c82c3
7 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/windows_docker.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
DOCKER_IMAGE=sypingauto/gta5view-build:1.9-static DOCKER_IMAGE=sypingauto/gta5view-build:1.10-static
PROJECT_DIR_DOCKER=/gta5view PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \ cd ${PROJECT_DIR} && \

2
.ci/wininstall_docker.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
DOCKER_IMAGE=sypingauto/gta5view-build:1.9-shared DOCKER_IMAGE=sypingauto/gta5view-build:1.10-shared
PROJECT_DIR_DOCKER=/gta5view PROJECT_DIR_DOCKER=/gta5view
cd ${PROJECT_DIR} && \ cd ${PROJECT_DIR} && \

4
.drone.yml
View file

@ -6,7 +6,7 @@ environment:
steps: steps:
- name: Windows Installer - name: Windows Installer
image: sypingauto/gta5view-build:1.9-shared image: sypingauto/gta5view-build:1.10-shared
environment: environment:
BUILD_SCRIPT: "wininstall_build.sh" BUILD_SCRIPT: "wininstall_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
@ -18,7 +18,7 @@ steps:
- name: gta5view - name: gta5view
path: /srv/gta5view path: /srv/gta5view
- name: Windows Portable - name: Windows Portable
image: sypingauto/gta5view-build:1.9-static image: sypingauto/gta5view-build:1.10-static
environment: environment:
BUILD_SCRIPT: "windows_build.sh" BUILD_SCRIPT: "windows_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"

4
.gitlab-ci.yml
View file

@ -6,7 +6,7 @@ variables:
Windows Installer: Windows Installer:
stage: build stage: build
image: sypingauto/gta5view-build:1.9-shared image: sypingauto/gta5view-build:1.10-shared
variables: variables:
BUILD_SCRIPT: "wininstall_build.sh" BUILD_SCRIPT: "wininstall_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"
@ -19,7 +19,7 @@ Windows Installer:
Windows Portable: Windows Portable:
stage: build stage: build
image: sypingauto/gta5view-build:1.9-static image: sypingauto/gta5view-build:1.10-static
variables: variables:
BUILD_SCRIPT: "windows_build.sh" BUILD_SCRIPT: "windows_build.sh"
QT_SELECT: "qt5-x86_64-w64-mingw32" QT_SELECT: "qt5-x86_64-w64-mingw32"

7
MapLocationDialog.cpp
View file

@ -1,6 +1,6 @@
/***************************************************************************** /*****************************************************************************
* gta5view Grand Theft Auto V Profile Viewer * gta5view Grand Theft Auto V Profile Viewer
* Copyright (C) 2017-2020 Syping * Copyright (C) 2017-2021 Syping
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,7 +21,6 @@
#include "IconLoader.h" #include "IconLoader.h"
#include "AppEnv.h" #include "AppEnv.h"
#include <QPainter> #include <QPainter>
#include <QDebug>
#include <QStyle> #include <QStyle>
MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) : MapLocationDialog::MapLocationDialog(double x, double y, QWidget *parent) :
@ -121,7 +120,7 @@ void MapLocationDialog::updatePosFromEvent(double x, double y)
x_pos = x_per * 2340; // 2340 is 100% for X (Cayo Perico) x_pos = x_per * 2340; // 2340 is 100% for X (Cayo Perico)
y_pos = y_per * -2340; // -2340 is 100% for Y (Cayo Perico) y_pos = y_per * -2340; // -2340 is 100% for Y (Cayo Perico)
x_pos = x_pos + 3560; // +3560 gets corrected for X (Cayo Perico) x_pos = x_pos + 3560; // +3560 gets corrected for X (Cayo Perico)
y_pos = y_pos - 3980; // -4000 gets corrected for Y (Cayo Perico) y_pos = y_pos - 3980; // -3980 gets corrected for Y (Cayo Perico)
} }
else { else {
x_pos = x_per * 10000; // 10000 is 100% for X (Los Santos) x_pos = x_per * 10000; // 10000 is 100% for X (Los Santos)
@ -196,7 +195,7 @@ void MapLocationDialog::mouseMoveEvent(QMouseEvent *ev)
#elif QT_VERSION >= 0x050000 #elif QT_VERSION >= 0x050000
const QPointF localPos = ev->localPos(); const QPointF localPos = ev->localPos();
#else #else
const QPoint localPos = ev->pos(); const QPointF localPos = ev->posF();
#endif #endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
qreal screenRatioPR = AppEnv::screenRatioPR(); qreal screenRatioPR = AppEnv::screenRatioPR();

4
README.md
View file

@ -15,8 +15,8 @@ Grand Theft Auto V Savegame and Snapmatic viewer/editor
# Note: Install Docker Community Edition and Git before continuing # Note: Install Docker Community Edition and Git before continuing
git clone https://gitlab.com/Syping/gta5view && cd gta5view git clone https://gitlab.com/Syping/gta5view && cd gta5view
docker pull sypingauto/gta5view-build:1.9-static docker pull sypingauto/gta5view-build:1.10-static
docker run --rm -v ${PWD}:/gta5view -it sypingauto/gta5view-build:1.9-static docker run --rm -v ${PWD}:/gta5view -it sypingauto/gta5view-build:1.10-static
cd /gta5view && mkdir -p build && cd build cd /gta5view && mkdir -p build && cd build
mingw64-qt-cmake ../ mingw64-qt-cmake ../
make -j $(nproc --all) make -j $(nproc --all)

1
main.cpp
View file

@ -49,7 +49,6 @@
#include <QLayout> #include <QLayout>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <QDebug>
#include <QFont> #include <QFont>
#include <QFile> #include <QFile>