From f55cbe543be1ef35420c435495280909be90bdfe Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 14 Aug 2022 23:16:55 +0200 Subject: [PATCH] move themes into bin folder (#849) * as if this is going to work * use android libs and spec for android * install ndk and use clang over g++ * shut the fuck up * SHUT THE FUCK UP * shut up shut up shut up * get remove from favs button * move themes into bin folder * bin folder now already comes with repo * actually install old ndk version * Delete .gitlab-ci.yml * apply font for version --- .github/workflows/build.yml | 4 -- .gitignore | 10 ++- .gitmodules | 6 +- base/favorite_servers_sample.ini | 5 -- base/misc/default/config.ini | 59 ------------------ base/themes | 1 - {base => bin/base}/misc/default/chatbox.png | Bin {base => bin/base}/misc/default/holdit.opus | Bin .../base}/misc/default/holdit_bubble.gif | Bin .../base}/misc/default/objection.opus | Bin .../base}/misc/default/objection_bubble.gif | Bin {base => bin/base}/misc/default/takethat.opus | Bin .../base}/misc/default/takethat_bubble.gif | Bin bin/base/themes | 1 + src/lobby.cpp | 1 + 15 files changed, 14 insertions(+), 73 deletions(-) delete mode 100644 base/favorite_servers_sample.ini delete mode 100644 base/misc/default/config.ini delete mode 160000 base/themes rename {base => bin/base}/misc/default/chatbox.png (100%) rename {base => bin/base}/misc/default/holdit.opus (100%) rename {base => bin/base}/misc/default/holdit_bubble.gif (100%) rename {base => bin/base}/misc/default/objection.opus (100%) rename {base => bin/base}/misc/default/objection_bubble.gif (100%) rename {base => bin/base}/misc/default/takethat.opus (100%) rename {base => bin/base}/misc/default/takethat_bubble.gif (100%) create mode 160000 bin/base/themes diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 84cee28..5058abf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,10 +80,6 @@ jobs: ${{steps.qt.outputs.make}} ${{steps.qt.outputs.make}} INSTALL_ROOT="${{steps.qt.outputs.installdir}}" install - - name: Create bin folder - run: | - mkdir bin - - name: Install Windows Discord RPC if: contains(matrix.os, 'windows') run: | diff --git a/.gitignore b/.gitignore index 0d133dd..19b796f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *~ *.db *.user +*.exe *.dll *.so *.pro.autosave @@ -14,7 +15,13 @@ moc* base-full/ logs/ bass.lib -bin/ +bin/base/background/ +bin/base/cases/ +bin/base/characters/ +bin/base/evidence/ +bin/base/fonts/ +bin/base/sounds/ +bin/user* bins/ build/ release/ @@ -25,6 +32,7 @@ base/sounds base/callwords.ini base/config.ini base/serverlist.txt +*.ini .qmake.stash .vs/ diff --git a/.gitmodules b/.gitmodules index 1376cc1..d056f05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "base/themes"] - path = base/themes - url = https://github.com/AttorneyOnline/AO2-Themes +[submodule "bin/base/themes"] + path = bin/base/themes + url = https://github.com/AttorneyOnline/AO2-Themes.git diff --git a/base/favorite_servers_sample.ini b/base/favorite_servers_sample.ini deleted file mode 100644 index 10126d2..0000000 --- a/base/favorite_servers_sample.ini +++ /dev/null @@ -1,5 +0,0 @@ -[0] -name=Default Local Server -address=127.0.0.1 -port=27016 -protocol=tcp \ No newline at end of file diff --git a/base/misc/default/config.ini b/base/misc/default/config.ini deleted file mode 100644 index b3bf9a8..0000000 --- a/base/misc/default/config.ini +++ /dev/null @@ -1,59 +0,0 @@ -c0 = 255, 255, 255 -c0_name = White -c0_talking = 1 - -c1 = 0, 255, 0 -c1_name = Green -c1_start = ` -c1_end = ` -c1_remove = 1 -c1_talking = 1 - -c2 = 255, 0, 0 -c2_name = Red -c2_start = ~ -c2_end = ~ -c2_remove = 1 -c2_talking = 1 - -c3 = 255, 165, 0 -c3_name = Orange -c3_start = | -c3_end = | -c3_remove = 1 -c3_talking = 0 - -c4 = 45, 150, 255 -c4_name = Blue -c4_start = ( -c4_end = ) -c4_remove = 0 -c4_talking = 0 - -c5 = 255, 255, 0 -c5_name = Yellow -c5_start = º -c5_end = º -c5_remove = 1 -c5_talking = 1 - -c6 = 255, 192, 203 -c6_name = Pink -c6_start = № -c6_end = № -c6_remove = 1 -c6_talking = 1 - -c7 = 0, 255, 255 -c7_name = Cyan -c7_start = √ -c7_end = √ -c7_remove = 1 -c7_talking = 1 - -c8 = 187, 187, 187 -c8_name = Gray -c8_start = [ -c8_end = ] -c8_remove = 0 -c8_talking = 1 \ No newline at end of file diff --git a/base/themes b/base/themes deleted file mode 160000 index 859f59b..0000000 --- a/base/themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 859f59b5d441fbf6c4d992a1af3ece35f1b0e946 diff --git a/base/misc/default/chatbox.png b/bin/base/misc/default/chatbox.png similarity index 100% rename from base/misc/default/chatbox.png rename to bin/base/misc/default/chatbox.png diff --git a/base/misc/default/holdit.opus b/bin/base/misc/default/holdit.opus similarity index 100% rename from base/misc/default/holdit.opus rename to bin/base/misc/default/holdit.opus diff --git a/base/misc/default/holdit_bubble.gif b/bin/base/misc/default/holdit_bubble.gif similarity index 100% rename from base/misc/default/holdit_bubble.gif rename to bin/base/misc/default/holdit_bubble.gif diff --git a/base/misc/default/objection.opus b/bin/base/misc/default/objection.opus similarity index 100% rename from base/misc/default/objection.opus rename to bin/base/misc/default/objection.opus diff --git a/base/misc/default/objection_bubble.gif b/bin/base/misc/default/objection_bubble.gif similarity index 100% rename from base/misc/default/objection_bubble.gif rename to bin/base/misc/default/objection_bubble.gif diff --git a/base/misc/default/takethat.opus b/bin/base/misc/default/takethat.opus similarity index 100% rename from base/misc/default/takethat.opus rename to bin/base/misc/default/takethat.opus diff --git a/base/misc/default/takethat_bubble.gif b/bin/base/misc/default/takethat_bubble.gif similarity index 100% rename from base/misc/default/takethat_bubble.gif rename to bin/base/misc/default/takethat_bubble.gif diff --git a/bin/base/themes b/bin/base/themes new file mode 160000 index 0000000..32a130d --- /dev/null +++ b/bin/base/themes @@ -0,0 +1 @@ +Subproject commit 32a130d1a35220b27deecf22f59c83e92cac1fee diff --git a/src/lobby.cpp b/src/lobby.cpp index c483132..c4eecb4 100644 --- a/src/lobby.cpp +++ b/src/lobby.cpp @@ -225,6 +225,7 @@ void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier) void Lobby::set_fonts() { + set_font(ui_version, "version"); set_font(ui_player_count, "player_count"); set_font(ui_description, "description"); set_font(ui_chatbox, "chatbox");