forked from ShuriZma/suyu
1
0
Fork 0

Compare commits

...

27 Commits

Author SHA1 Message Date
ddutchie 85f94fbc08 Merge branch 'dev' into ddutchie/uitweaks 2024-03-19 16:29:06 -04:00
ddutchie 86829beb9d Update Docker Script 2024-03-19 14:17:39 -04:00
ddutchie e3ad2bd629 Tag 2024-03-19 14:08:44 -04:00
ddutchie c6031e8a9a Merge branch 'dev' into ddutchie/uitweaks 2024-03-19 14:06:51 -04:00
ddutchie 3619f350a1 Merge branch 'dev' into ddutchie/uitweaks 2024-03-19 08:21:35 -04:00
ddutchie c6feb95d8d Update main.cpp 2024-03-18 15:27:32 -04:00
ddutchie 5b0136dafe Merge branch 'dev' into ddutchie/uitweaks 2024-03-18 08:00:03 -04:00
ddutchie 69cc6e9b6e Add color 2024-03-18 07:59:51 -04:00
ddutchie 9d9a57a85a Add method to main.h 2024-03-17 18:02:11 -04:00
ddutchie 28ecb35260 Clang Format 2024-03-17 16:05:05 -04:00
ddutchie 91e22ebd81 Pop of Color, Add 800p 2024-03-17 16:00:02 -04:00
ddutchie 71d26161c1 Merge branch 'dev' into ddutchie/uitweaks 2024-03-17 15:52:20 -04:00
ddutchie d6d0505f1b Update loading_screen.cpp 2024-03-17 06:30:42 -04:00
ddutchie ac4c2702d7 Loader 2024-03-16 22:08:42 -04:00
ddutchie c5cbb74628 Merge branch 'dev' into ddutchie/uitweaks 2024-03-16 22:07:54 -04:00
ddutchie f43f50c1c5 Update loading_screen.cpp 2024-03-16 21:43:14 -04:00
ddutchie b96fcd1370 Cleanup 2024-03-16 20:40:51 -04:00
ddutchie 5cd903eabd Revert "Add Logo"
This reverts commit 8e08fc1ab9.
2024-03-16 20:35:27 -04:00
ddutchie 59e997ee07 Revert "Rework Add new Logos"
This reverts commit 6737a54cdb.
2024-03-16 20:35:22 -04:00
ddutchie 6737a54cdb Rework Add new Logos 2024-03-16 18:43:51 -04:00
ddutchie 8e08fc1ab9 Add Logo 2024-03-16 18:20:42 -04:00
ddutchie 2786311869 Update loading_screen.ui 2024-03-16 16:58:40 -04:00
ddutchie 8ff94c9191 Fix 2024-03-16 14:03:19 -04:00
ddutchie 6f85fbc9d4 Tweak Radius, Medium Font 2024-03-16 13:44:05 -04:00
ddutchie 6a5d65cc17 Hide logos change font 2024-03-16 13:14:11 -04:00
ddutchie a2d7dc61f0 Merge branch 'dev' into ddutchie/uitweaks 2024-03-16 12:45:08 -04:00
ddutchie 859ad39852 First Pass Loading Screen 2024-03-16 12:44:28 -04:00
7 changed files with 52 additions and 51 deletions

View File

@ -12,8 +12,6 @@ mkdir build || true && cd build
cmake .. \ cmake .. \
-DBoost_USE_STATIC_LIBS=ON \ -DBoost_USE_STATIC_LIBS=ON \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSUYU_USE_PRECOMPILED_HEADERS=OFF \
-DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \
-DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
-DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \
@ -26,7 +24,6 @@ cmake .. \
-DSUYU_USE_BUNDLED_FFMPEG=ON \ -DSUYU_USE_BUNDLED_FFMPEG=ON \
-DSUYU_ENABLE_LTO=ON \ -DSUYU_ENABLE_LTO=ON \
-DSUYU_CRASH_DUMPS=ON \ -DSUYU_CRASH_DUMPS=ON \
-DSUYU_USE_FASTER_LD=ON \
-GNinja -GNinja
ninja ninja

View File

@ -1,22 +1,6 @@
stages: stages:
- format - format
- build - build
variables:
# https://docs.gitlab.com/ee/ci/runners/configure_runners.html
TRANSFER_METER_FREQUENCY: "2s"
ARTIFACT_COMPRESSION_LEVEL: "fast"
CACHE_COMPRESSION_LEVEL: "fastest"
CACHE_REQUEST_TIMEOUT: 5
# Use FASTZIP for faster compression in cache and artifacts
# https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags
FF_USE_FASTZIP: true
# Our Variables
CACHE_DIR: "$CI_PROJECT_DIR/ccache"
CCACHE_DIR: $CACHE_DIR
#CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES
clang-format: clang-format:
stage: format stage: format
@ -32,20 +16,11 @@ clang-format:
# - Windows # - Windows
- Parallelized - Parallelized
- Format - Format
#LINUX BUILD - BUILDS LINUX APPIMAGE #LINUX BUILD - BUILDS LINUX APPIMAGE
build-linux: build-linux:
stage: build stage: build
image: suyuemu/cibuild:linux-x64 image: suyuemu/cibuild:linux-x64
resource_group: linux-ci resource_group: linux-ci
cache:
key: "$CI_COMMIT_REF_NAME-ccache"
paths:
- $CACHE_DIR
before_script:
- mkdir -p $CACHE_DIR
- chmod -R 777 $CACHE_DIR
- ls -la $CACHE_DIR
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_DEPTH: 1 GIT_SUBMODULE_DEPTH: 1
@ -59,7 +34,6 @@ build-linux:
tags: tags:
- Linux - Linux
- Parallelized - Parallelized
#ANDROID BUILD - BUILDS APK #ANDROID BUILD - BUILDS APK
android: android:
stage: build stage: build
@ -80,4 +54,3 @@ android:
tags: tags:
- Android - Android
- Parallelized - Parallelized

View File

@ -31,23 +31,22 @@ constexpr char PROGRESSBAR_STYLE_BUILD[] = R"(
QProgressBar { QProgressBar {
background-color: black; background-color: black;
border: 2px solid white; border: 2px solid white;
border-radius: 4px; border-radius: 10px;
padding: 2px; padding: 2px;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: #ff3c28; background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(98, 160, 234, 255), stop:1 rgba(237, 51, 59, 255));
width: 1px; border-radius: 6px;
})"; })";
constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"( constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"(
QProgressBar { QProgressBar {
background-color: #0ab9e6; background-color: black;
border: 2px solid white; border: 2px solid white;
border-radius: 4px; border-radius: 10px;
padding: 2px; padding: 4px;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: #ff3c28;
})"; })";
LoadingScreen::LoadingScreen(QWidget* parent) LoadingScreen::LoadingScreen(QWidget* parent)
@ -99,7 +98,7 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
#ifdef SUYU_QT_MOVIE_MISSING #ifdef SUYU_QT_MOVIE_MISSING
QPixmap map; QPixmap map;
map.loadFromData(buffer.data(), buffer.size()); map.loadFromData(buffer.data(), buffer.size());
ui->banner->setPixmap(map); setPixmap(map);
#else #else
backing_mem = std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()), backing_mem = std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()),
static_cast<int>(buffer.size())); static_cast<int>(buffer.size()));
@ -116,6 +115,8 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
map.loadFromData(buffer.data(), static_cast<uint>(buffer.size())); map.loadFromData(buffer.data(), static_cast<uint>(buffer.size()));
ui->logo->setPixmap(map); ui->logo->setPixmap(map);
} }
ui->logo->setVisible(false);
ui->banner->setVisible(false);
slow_shader_compile_start = false; slow_shader_compile_start = false;
OnLoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0); OnLoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);

View File

@ -49,6 +49,9 @@
</property> </property>
<item alignment="Qt::AlignLeft|Qt::AlignTop"> <item alignment="Qt::AlignLeft|Qt::AlignTop">
<widget class="QLabel" name="logo"> <widget class="QLabel" name="logo">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -78,7 +81,7 @@
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: black; color: white; <string notr="true">background-color: black; color: white;
font: 75 20pt &quot;Arial&quot;;</string> font: 500 20pt &quot;Ubuntu&quot;;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Loading Shaders 387 / 1628</string> <string>Loading Shaders 387 / 1628</string>
@ -96,19 +99,25 @@ font: 75 20pt &quot;Arial&quot;;</string>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>500</width> <width>500</width>
<height>40</height> <height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>30</height>
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QProgressBar { <string notr="true">QProgressBar {
color: white; background-color: black;
border: 2px solid white; border: 2px solid white;
outline-color: black; border-radius: 10px;
border-radius: 20px; padding: 2px;
} }
QProgressBar::chunk { QProgressBar::chunk {
background-color: white; background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(98, 160, 234, 255), stop:1 rgba(237, 51, 59, 255));
border-radius: 15px; border-radius: 6px;
}</string> }</string>
</property> </property>
<property name="value"> <property name="value">
@ -129,7 +138,7 @@ border-radius: 15px;
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: black; color: white; <string notr="true">background-color: black; color: white;
font: 75 15pt &quot;Arial&quot;;</string> font: 500 15pt &quot;Ubuntu&quot;;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Estimated Time 5m 4s</string> <string>Estimated Time 5m 4s</string>
@ -140,6 +149,9 @@ font: 75 15pt &quot;Arial&quot;;</string>
</item> </item>
<item alignment="Qt::AlignRight|Qt::AlignBottom"> <item alignment="Qt::AlignRight|Qt::AlignBottom">
<widget class="QLabel" name="banner"> <widget class="QLabel" name="banner">
<property name="enabled">
<bool>false</bool>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: black;</string> <string notr="true">background-color: black;</string>
</property> </property>

View File

@ -1535,11 +1535,12 @@ void GMainWindow::ConnectMenuEvents() {
connect_menu(ui->action_Show_Folders_In_List, &GMainWindow::OnToggleFoldersInList); connect_menu(ui->action_Show_Folders_In_List, &GMainWindow::OnToggleFoldersInList);
connect_menu(ui->action_Reset_Window_Size_720, &GMainWindow::ResetWindowSize720); connect_menu(ui->action_Reset_Window_Size_720, &GMainWindow::ResetWindowSize720);
connect_menu(ui->action_Reset_Window_Size_800, &GMainWindow::ResetWindowSize800);
connect_menu(ui->action_Reset_Window_Size_900, &GMainWindow::ResetWindowSize900); connect_menu(ui->action_Reset_Window_Size_900, &GMainWindow::ResetWindowSize900);
connect_menu(ui->action_Reset_Window_Size_1080, &GMainWindow::ResetWindowSize1080); connect_menu(ui->action_Reset_Window_Size_1080, &GMainWindow::ResetWindowSize1080);
ui->menu_Reset_Window_Size->addActions({ui->action_Reset_Window_Size_720, ui->menu_Reset_Window_Size->addActions(
ui->action_Reset_Window_Size_900, {ui->action_Reset_Window_Size_720, ui->action_Reset_Window_Size_800,
ui->action_Reset_Window_Size_1080}); ui->action_Reset_Window_Size_900, ui->action_Reset_Window_Size_1080});
// Multiplayer // Multiplayer
connect(ui->action_View_Lobby, &QAction::triggered, multiplayer_state, connect(ui->action_View_Lobby, &QAction::triggered, multiplayer_state,
@ -3530,6 +3531,14 @@ void GMainWindow::ResetWindowSize720() {
ResetWindowSize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); ResetWindowSize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);
} }
void GMainWindow::ResetWindowSize800() {
if (!ui->action_Single_Window_Mode->isChecked()) {
render_window->resize(1280, 800);
} else {
resize(1280, 800);
}
}
void GMainWindow::ResetWindowSize900() { void GMainWindow::ResetWindowSize900() {
ResetWindowSize(1600U, 900U); ResetWindowSize(1600U, 900U);
} }

View File

@ -393,6 +393,7 @@ private slots:
void ToggleWindowMode(); void ToggleWindowMode();
void ResetWindowSize(u32 width, u32 height); void ResetWindowSize(u32 width, u32 height);
void ResetWindowSize720(); void ResetWindowSize720();
void ResetWindowSize800();
void ResetWindowSize900(); void ResetWindowSize900();
void ResetWindowSize1080(); void ResetWindowSize1080();
void OnAlbum(); void OnAlbum();

View File

@ -45,7 +45,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1280</width> <width>1280</width>
<height>21</height> <height>22</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menu_File"> <widget class="QMenu" name="menu_File">
@ -102,6 +102,14 @@
<property name="iconText"> <property name="iconText">
<string>Reset Window Size to 720p</string> <string>Reset Window Size to 720p</string>
</property> </property>
</action>
<action name="action_Reset_Window_Size_800">
<property name="text">
<string>Reset Window Size to &amp;800p</string>
</property>
<property name="iconText">
<string>Reset Window Size to 800p</string>
</property>
</action> </action>
<action name="action_Reset_Window_Size_900"> <action name="action_Reset_Window_Size_900">
<property name="text"> <property name="text">