redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-21 20:27:45 +00:00
Code Activity

Revert to Qt5

Browse source 
* Fixes theming issues for Linux desktop environments which do not have styles written for Qt6 yet.
This commit is contained in:
redstrate 2021-11-18 07:30:38 -05:00
parent 8990fad533
commit 00b3688e24
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
find_package(Qt6 COMPONENTS Core Widgets Network CONFIG REQUIRED) find_package(Qt5 COMPONENTS Core Widgets Network CONFIG REQUIRED)
add_subdirectory(external) add_subdirectory(external)
@ -19,7 +19,7 @@ add_executable(xivlauncher
src/settingswindow.cpp src/settingswindow.cpp
src/blowfish.cpp) src/blowfish.cpp)
target_link_libraries(xivlauncher Qt6::Core Qt6::Widgets Qt6::Network qt6keychain) target_link_libraries(xivlauncher Qt5::Core Qt5::Widgets Qt5::Network qt5keychain)
# disgusting, thanks qtkeychain # disgusting, thanks qtkeychain
target_include_directories(xivlauncher PRIVATE target_include_directories(xivlauncher PRIVATE

2
external/CMakeLists.txt vendored
View file

@ -6,7 +6,7 @@ FetchContent_Declare(
GIT_TAG v0.12.0 GIT_TAG v0.12.0
) )
set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE) set(BUILD_WITH_QT6 OFF CACHE BOOL "" FORCE)
set(QTKEYCHAIN_STATIC ON CACHE BOOL "" FORCE) set(QTKEYCHAIN_STATIC ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(qtkeychain) FetchContent_MakeAvailable(qtkeychain)

6
src/settingswindow.cpp
View file

@ -64,7 +64,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
directXCombo->addItem("DirectX 9"); directXCombo->addItem("DirectX 9");
gameBoxLayout->addRow("DirectX Version", directXCombo); gameBoxLayout->addRow("DirectX Version", directXCombo);
connect(directXCombo, &QComboBox::currentIndexChanged, [=](int index) { connect(directXCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=](int index) {
getCurrentProfile().useDX9 = directXCombo->currentIndex() == 1; getCurrentProfile().useDX9 = directXCombo->currentIndex() == 1;
this->window.saveSettings(); this->window.saveSettings();
}); });
@ -109,7 +109,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
serverType->insertItem(0, "Square Enix"); serverType->insertItem(0, "Square Enix");
serverType->insertItem(1, "Sapphire"); serverType->insertItem(1, "Sapphire");
connect(serverType, &QComboBox::currentIndexChanged, [=](int index) { connect(serverType, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=](int index) {
getCurrentProfile().isSapphire = index == 1; getCurrentProfile().isSapphire = index == 1;
reloadControls(); reloadControls();
@ -174,7 +174,7 @@ SettingsWindow::SettingsWindow(LauncherWindow& window, QWidget* parent) : window
selectWineButton = new QPushButton("Select Wine Executable"); selectWineButton = new QPushButton("Select Wine Executable");
wineBoxLayout->addWidget(selectWineButton); wineBoxLayout->addWidget(selectWineButton);
connect(wineVersionCombo, &QComboBox::currentIndexChanged, [this](int index) { connect(wineVersionCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this](int index) {
getCurrentProfile().wineVersion = index; getCurrentProfile().wineVersion = index;
this->window.readWineInfo(getCurrentProfile()); this->window.readWineInfo(getCurrentProfile());

4
src/xivlauncher.cpp
View file

@ -43,7 +43,7 @@ void LauncherWindow::setSSL(QNetworkRequest& request) {
void LauncherWindow::buildRequest(QNetworkRequest& request) { void LauncherWindow::buildRequest(QNetworkRequest& request) {
setSSL(request); setSSL(request);
request.setHeader(QNetworkRequest::UserAgentHeader, request.setHeader(QNetworkRequest::UserAgentHeader,
QString("SQEXAuthor/2.0.0(Windows 6.2; ja-jp; %1)").arg(QSysInfo::bootUniqueId())); QString("SQEXAuthor/2.0.0(Windows 6.2; ja-jp; %1)").arg(QString(QSysInfo::bootUniqueId())));
request.setRawHeader("Accept", request.setRawHeader("Accept",
"image/gif, image/jpeg, image/pjpeg, application/x-ms-application, application/xaml+xml, application/x-ms-xbap, */*"); "image/gif, image/jpeg, image/pjpeg, application/x-ms-application, application/xaml+xml, application/x-ms-xbap, */*");
request.setRawHeader("Accept-Encoding", "gzip, deflate"); request.setRawHeader("Accept-Encoding", "gzip, deflate");
@ -366,7 +366,7 @@ LauncherWindow::LauncherWindow(QWidget* parent) :
auto layout = new QFormLayout(); auto layout = new QFormLayout();
profileSelect = new QComboBox(); profileSelect = new QComboBox();
connect(profileSelect, &QComboBox::currentIndexChanged, [=](int index) { connect(profileSelect, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [=](int index) {
reloadControls(); reloadControls();
}); });

2
src/xivlauncher.h
View file

@ -105,6 +105,6 @@ private:
QCheckBox* rememberUsernameBox, *rememberPasswordBox; QCheckBox* rememberUsernameBox, *rememberPasswordBox;
QPushButton* registerButton; QPushButton* registerButton;
QList<ProfileSettings> profileSettings; QVector<ProfileSettings> profileSettings;
int defaultProfileIndex = 0; int defaultProfileIndex = 0;
}; };