diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db575b..9137bbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,9 +41,9 @@ jobs: del /f /s /q "${{ runner.workspace }}\build\.ninja_log" del /f /s /q "${{ runner.workspace }}\build\abaddon.ilk" del /f /s /q "${{ runner.workspace }}\build\CMakeCache.txt" - xcopy /E /I "${{ github.workspace }}\css" "${{ runner.workspace }}\build\css" - xcopy /E /I "${{ github.workspace }}\res" "${{ runner.workspace }}\build\res" - xcopy /E /I "${{ github.workspace }}\fonts" "${{ runner.workspace }}\build\fonts" + xcopy /E /I "${{ github.workspace }}\res\css" "${{ runner.workspace }}\build\css" + xcopy /E /I "${{ github.workspace }}\res\res" "${{ runner.workspace }}\build\res" + xcopy /E /I "${{ github.workspace }}\res\fonts" "${{ runner.workspace }}\build\fonts" mkdir "${{ runner.workspace }}\build\share" xcopy /E /I "${{ github.workspace }}\ci\gtk-for-windows\gtk-nsis-pack\share\glib-2.0" "${{ runner.workspace }}\build\share\glib-2.0" copy "${{ github.workspace }}\ci\vcpkg\installed\x64-windows\tools\glib\gspawn-win64-helper.exe" "${{ runner.workspace }}\build\gspawn-win64-helper.exe" @@ -83,8 +83,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/artifactdir" cp "${{runner.workspace}}/build/abaddon" "${{ runner.workspace }}/artifactdir/abaddon" - cp -r "${{ github.workspace }}/css" "${{ runner.workspace }}/artifactdir/css" - cp -r "${{ github.workspace }}/res" "${{ runner.workspace }}/artifactdir/res" + cp -r "${{ github.workspace }}/res/css" "${{ runner.workspace }}/artifactdir/css" + cp -r "${{ github.workspace }}/res/res" "${{ runner.workspace }}/artifactdir/res" - name: Upload build uses: actions/upload-artifact@v2 @@ -136,8 +136,8 @@ jobs: run: | mkdir "${{ runner.workspace }}/artifactdir" cp "${{runner.workspace}}/build/abaddon" "${{ runner.workspace }}/artifactdir/abaddon" - cp -r "${{ github.workspace }}/css" "${{ runner.workspace }}/artifactdir/css" - cp -r "${{ github.workspace }}/res" "${{ runner.workspace }}/artifactdir/res" + cp -r "${{ github.workspace }}/res/css" "${{ runner.workspace }}/artifactdir/css" + cp -r "${{ github.workspace }}/res/res" "${{ runner.workspace }}/artifactdir/res" - name: Upload build uses: actions/upload-artifact@v2 diff --git a/.gitmodules b/.gitmodules index bcbf397..412fb9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "vcpkg"] path = ci/vcpkg url = https://github.com/microsoft/vcpkg/ -[submodule "thirdparty/simpleini"] - path = thirdparty/simpleini - url = https://github.com/brofield/simpleini -[submodule "thirdparty/IXWebSocket"] - path = thirdparty/IXWebSocket - url = https://github.com/machinezone/ixwebsocket [submodule "ci/vcpkg"] path = ci/vcpkg url = https://github.com/microsoft/vcpkg [submodule "ci/gtk-for-windows"] path = ci/gtk-for-windows url = https://github.com/tschoonj/GTK-for-Windows-Runtime-Environment-Installer +[submodule "subprojects/simpleini"] + path = subprojects/simpleini + url = https://github.com/brofield/simpleini +[submodule "subprojects/ixwebsocket"] + path = subprojects/ixwebsocket + url = https://github.com/machinezone/ixwebsocket diff --git a/CMakeLists.txt b/CMakeLists.txt index 638be3e..d27980b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(USE_OPEN_SSL TRUE) find_package(IXWebSocket QUIET) if (NOT IXWebSocket_FOUND) message("ixwebsocket was not found and will be included as a submodule") - add_subdirectory(thirdparty/IXWebSocket) + add_subdirectory(subprojects/ixwebsocket) include_directories(IXWEBSOCKET_INCLUDE_DIRS) endif() @@ -26,7 +26,7 @@ add_compile_definitions(SI_NO_CONVERSION) # only CSimpleIniA is used find_package(simpleini QUIET) if (NOT simpleini_FOUND) message("simpleini was not found and will be included as a submodule") - include_directories(thirdparty/simpleini) + include_directories(subprojects/simpleini) endif() if(MINGW OR WIN32) @@ -41,28 +41,16 @@ if(WIN32) link_libraries(${Fontconfig_LIBRARIES}) endif() -configure_file(${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h) +configure_file(${PROJECT_SOURCE_DIR}/src/config.h.in ${PROJECT_BINARY_DIR}/config.h) -file(GLOB ABADDON_SOURCES - "*.h" - "*.hpp" - "*.cpp" - "discord/*.hpp" - "discord/*.cpp" - "components/*.hpp" - "components/*.cpp" - "windows/*.hpp" - "windows/*.cpp" - "windows/guildsettings/*.hpp" - "windows/guildsettings/*.cpp" - "windows/profile/*.hpp" - "windows/profile/*.cpp" - "dialogs/*.hpp" - "dialogs/*.cpp" +file(GLOB_RECURSE ABADDON_SOURCES + "src/*.h" + "src/*.hpp" + "src/*.cpp" ) add_executable(abaddon ${ABADDON_SOURCES}) -target_include_directories(abaddon PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(abaddon PUBLIC ${PROJECT_SOURCE_DIR}/src) target_include_directories(abaddon PUBLIC ${PROJECT_BINARY_DIR}) target_include_directories(abaddon PUBLIC ${GTKMM_INCLUDE_DIRS}) target_include_directories(abaddon PUBLIC ${ZLIB_INCLUDE_DIRS}) diff --git a/css/application-low-priority.css b/res/css/application-low-priority.css similarity index 100% rename from css/application-low-priority.css rename to res/css/application-low-priority.css diff --git a/css/bare.css b/res/css/bare.css similarity index 100% rename from css/bare.css rename to res/css/bare.css diff --git a/css/main.css b/res/css/main.css similarity index 100% rename from css/main.css rename to res/css/main.css diff --git a/fonts/TwitterColorEmoji.ttf b/res/fonts/TwitterColorEmoji.ttf similarity index 100% rename from fonts/TwitterColorEmoji.ttf rename to res/fonts/TwitterColorEmoji.ttf diff --git a/fonts/conf.d/10-autohint.conf b/res/fonts/conf.d/10-autohint.conf similarity index 100% rename from fonts/conf.d/10-autohint.conf rename to res/fonts/conf.d/10-autohint.conf diff --git a/fonts/conf.d/10-hinting-full.conf b/res/fonts/conf.d/10-hinting-full.conf similarity index 100% rename from fonts/conf.d/10-hinting-full.conf rename to res/fonts/conf.d/10-hinting-full.conf diff --git a/fonts/conf.d/10-hinting-medium.conf b/res/fonts/conf.d/10-hinting-medium.conf similarity index 100% rename from fonts/conf.d/10-hinting-medium.conf rename to res/fonts/conf.d/10-hinting-medium.conf diff --git a/fonts/conf.d/10-hinting-none.conf b/res/fonts/conf.d/10-hinting-none.conf similarity index 100% rename from fonts/conf.d/10-hinting-none.conf rename to res/fonts/conf.d/10-hinting-none.conf diff --git a/fonts/conf.d/10-hinting-slight.conf b/res/fonts/conf.d/10-hinting-slight.conf similarity index 100% rename from fonts/conf.d/10-hinting-slight.conf rename to res/fonts/conf.d/10-hinting-slight.conf diff --git a/fonts/conf.d/10-no-sub-pixel.conf b/res/fonts/conf.d/10-no-sub-pixel.conf similarity index 100% rename from fonts/conf.d/10-no-sub-pixel.conf rename to res/fonts/conf.d/10-no-sub-pixel.conf diff --git a/fonts/conf.d/10-scale-bitmap-fonts.conf b/res/fonts/conf.d/10-scale-bitmap-fonts.conf similarity index 100% rename from fonts/conf.d/10-scale-bitmap-fonts.conf rename to res/fonts/conf.d/10-scale-bitmap-fonts.conf diff --git a/fonts/conf.d/10-sub-pixel-bgr.conf b/res/fonts/conf.d/10-sub-pixel-bgr.conf similarity index 100% rename from fonts/conf.d/10-sub-pixel-bgr.conf rename to res/fonts/conf.d/10-sub-pixel-bgr.conf diff --git a/fonts/conf.d/10-sub-pixel-rgb.conf b/res/fonts/conf.d/10-sub-pixel-rgb.conf similarity index 100% rename from fonts/conf.d/10-sub-pixel-rgb.conf rename to res/fonts/conf.d/10-sub-pixel-rgb.conf diff --git a/fonts/conf.d/10-sub-pixel-vbgr.conf b/res/fonts/conf.d/10-sub-pixel-vbgr.conf similarity index 100% rename from fonts/conf.d/10-sub-pixel-vbgr.conf rename to res/fonts/conf.d/10-sub-pixel-vbgr.conf diff --git a/fonts/conf.d/10-sub-pixel-vrgb.conf b/res/fonts/conf.d/10-sub-pixel-vrgb.conf similarity index 100% rename from fonts/conf.d/10-sub-pixel-vrgb.conf rename to res/fonts/conf.d/10-sub-pixel-vrgb.conf diff --git a/fonts/conf.d/10-unhinted.conf b/res/fonts/conf.d/10-unhinted.conf similarity index 100% rename from fonts/conf.d/10-unhinted.conf rename to res/fonts/conf.d/10-unhinted.conf diff --git a/fonts/conf.d/11-lcdfilter-default.conf b/res/fonts/conf.d/11-lcdfilter-default.conf similarity index 100% rename from fonts/conf.d/11-lcdfilter-default.conf rename to res/fonts/conf.d/11-lcdfilter-default.conf diff --git a/fonts/conf.d/11-lcdfilter-legacy.conf b/res/fonts/conf.d/11-lcdfilter-legacy.conf similarity index 100% rename from fonts/conf.d/11-lcdfilter-legacy.conf rename to res/fonts/conf.d/11-lcdfilter-legacy.conf diff --git a/fonts/conf.d/11-lcdfilter-light.conf b/res/fonts/conf.d/11-lcdfilter-light.conf similarity index 100% rename from fonts/conf.d/11-lcdfilter-light.conf rename to res/fonts/conf.d/11-lcdfilter-light.conf diff --git a/fonts/conf.d/20-unhint-small-vera.conf b/res/fonts/conf.d/20-unhint-small-vera.conf similarity index 100% rename from fonts/conf.d/20-unhint-small-vera.conf rename to res/fonts/conf.d/20-unhint-small-vera.conf diff --git a/fonts/conf.d/25-unhint-nonlatin.conf b/res/fonts/conf.d/25-unhint-nonlatin.conf similarity index 100% rename from fonts/conf.d/25-unhint-nonlatin.conf rename to res/fonts/conf.d/25-unhint-nonlatin.conf diff --git a/fonts/conf.d/30-metric-aliases.conf b/res/fonts/conf.d/30-metric-aliases.conf similarity index 100% rename from fonts/conf.d/30-metric-aliases.conf rename to res/fonts/conf.d/30-metric-aliases.conf diff --git a/fonts/conf.d/30-urw-aliases.conf b/res/fonts/conf.d/30-urw-aliases.conf similarity index 100% rename from fonts/conf.d/30-urw-aliases.conf rename to res/fonts/conf.d/30-urw-aliases.conf diff --git a/fonts/conf.d/40-nonlatin.conf b/res/fonts/conf.d/40-nonlatin.conf similarity index 100% rename from fonts/conf.d/40-nonlatin.conf rename to res/fonts/conf.d/40-nonlatin.conf diff --git a/fonts/conf.d/45-latin.conf b/res/fonts/conf.d/45-latin.conf similarity index 100% rename from fonts/conf.d/45-latin.conf rename to res/fonts/conf.d/45-latin.conf diff --git a/fonts/conf.d/49-sansserif.conf b/res/fonts/conf.d/49-sansserif.conf similarity index 100% rename from fonts/conf.d/49-sansserif.conf rename to res/fonts/conf.d/49-sansserif.conf diff --git a/fonts/conf.d/50-user.conf b/res/fonts/conf.d/50-user.conf similarity index 100% rename from fonts/conf.d/50-user.conf rename to res/fonts/conf.d/50-user.conf diff --git a/fonts/conf.d/51-local.conf b/res/fonts/conf.d/51-local.conf similarity index 100% rename from fonts/conf.d/51-local.conf rename to res/fonts/conf.d/51-local.conf diff --git a/fonts/conf.d/55-emoji-prepend.conf b/res/fonts/conf.d/55-emoji-prepend.conf similarity index 100% rename from fonts/conf.d/55-emoji-prepend.conf rename to res/fonts/conf.d/55-emoji-prepend.conf diff --git a/fonts/conf.d/60-latin.conf b/res/fonts/conf.d/60-latin.conf similarity index 100% rename from fonts/conf.d/60-latin.conf rename to res/fonts/conf.d/60-latin.conf diff --git a/fonts/conf.d/65-fonts-persian.conf b/res/fonts/conf.d/65-fonts-persian.conf similarity index 100% rename from fonts/conf.d/65-fonts-persian.conf rename to res/fonts/conf.d/65-fonts-persian.conf diff --git a/fonts/conf.d/65-khmer.conf b/res/fonts/conf.d/65-khmer.conf similarity index 100% rename from fonts/conf.d/65-khmer.conf rename to res/fonts/conf.d/65-khmer.conf diff --git a/fonts/conf.d/65-nonlatin.conf b/res/fonts/conf.d/65-nonlatin.conf similarity index 100% rename from fonts/conf.d/65-nonlatin.conf rename to res/fonts/conf.d/65-nonlatin.conf diff --git a/fonts/conf.d/69-unifont.conf b/res/fonts/conf.d/69-unifont.conf similarity index 100% rename from fonts/conf.d/69-unifont.conf rename to res/fonts/conf.d/69-unifont.conf diff --git a/fonts/conf.d/70-yes-bitmaps.conf b/res/fonts/conf.d/70-yes-bitmaps.conf similarity index 100% rename from fonts/conf.d/70-yes-bitmaps.conf rename to res/fonts/conf.d/70-yes-bitmaps.conf diff --git a/fonts/conf.d/80-delicious.conf b/res/fonts/conf.d/80-delicious.conf similarity index 100% rename from fonts/conf.d/80-delicious.conf rename to res/fonts/conf.d/80-delicious.conf diff --git a/fonts/conf.d/90-synthetic.conf b/res/fonts/conf.d/90-synthetic.conf similarity index 100% rename from fonts/conf.d/90-synthetic.conf rename to res/fonts/conf.d/90-synthetic.conf diff --git a/fonts/fonts.template.conf b/res/fonts/fonts.template.conf similarity index 100% rename from fonts/fonts.template.conf rename to res/fonts/fonts.template.conf diff --git a/res/battlenet.png b/res/res/battlenet.png similarity index 100% rename from res/battlenet.png rename to res/res/battlenet.png diff --git a/res/certifiedmoderator.png b/res/res/certifiedmoderator.png similarity index 100% rename from res/certifiedmoderator.png rename to res/res/certifiedmoderator.png diff --git a/res/checkmark.png b/res/res/checkmark.png similarity index 100% rename from res/checkmark.png rename to res/res/checkmark.png diff --git a/res/clock.png b/res/res/clock.png similarity index 100% rename from res/clock.png rename to res/res/clock.png diff --git a/res/crown.png b/res/res/crown.png similarity index 100% rename from res/crown.png rename to res/res/crown.png diff --git a/res/decamarks.png b/res/res/decamarks.png similarity index 100% rename from res/decamarks.png rename to res/res/decamarks.png diff --git a/res/discordbughunter.png b/res/res/discordbughunter.png similarity index 100% rename from res/discordbughunter.png rename to res/res/discordbughunter.png diff --git a/res/discordbughunter2.png b/res/res/discordbughunter2.png similarity index 100% rename from res/discordbughunter2.png rename to res/res/discordbughunter2.png diff --git a/res/discordstaff.png b/res/res/discordstaff.png similarity index 100% rename from res/discordstaff.png rename to res/res/discordstaff.png diff --git a/res/earlysupporter.png b/res/res/earlysupporter.png similarity index 100% rename from res/earlysupporter.png rename to res/res/earlysupporter.png diff --git a/res/earlyverifiedbotdeveloper.png b/res/res/earlyverifiedbotdeveloper.png similarity index 100% rename from res/earlyverifiedbotdeveloper.png rename to res/res/earlyverifiedbotdeveloper.png diff --git a/res/emojis.bin b/res/res/emojis.bin similarity index 100% rename from res/emojis.bin rename to res/res/emojis.bin diff --git a/res/facebook.png b/res/res/facebook.png similarity index 100% rename from res/facebook.png rename to res/res/facebook.png diff --git a/res/github.png b/res/res/github.png similarity index 100% rename from res/github.png rename to res/res/github.png diff --git a/res/guildsubscriber.png b/res/res/guildsubscriber.png similarity index 100% rename from res/guildsubscriber.png rename to res/res/guildsubscriber.png diff --git a/res/hypesquadbalance.png b/res/res/hypesquadbalance.png similarity index 100% rename from res/hypesquadbalance.png rename to res/res/hypesquadbalance.png diff --git a/res/hypesquadbravery.png b/res/res/hypesquadbravery.png similarity index 100% rename from res/hypesquadbravery.png rename to res/res/hypesquadbravery.png diff --git a/res/hypesquadbrilliance.png b/res/res/hypesquadbrilliance.png similarity index 100% rename from res/hypesquadbrilliance.png rename to res/res/hypesquadbrilliance.png diff --git a/res/hypesquadevents.png b/res/res/hypesquadevents.png similarity index 100% rename from res/hypesquadevents.png rename to res/res/hypesquadevents.png diff --git a/res/leagueoflegends.png b/res/res/leagueoflegends.png similarity index 100% rename from res/leagueoflegends.png rename to res/res/leagueoflegends.png diff --git a/res/partneredowner.png b/res/res/partneredowner.png similarity index 100% rename from res/partneredowner.png rename to res/res/partneredowner.png diff --git a/res/premium.png b/res/res/premium.png similarity index 100% rename from res/premium.png rename to res/res/premium.png diff --git a/res/reddit.png b/res/res/reddit.png similarity index 100% rename from res/reddit.png rename to res/res/reddit.png diff --git a/res/skype.png b/res/res/skype.png similarity index 100% rename from res/skype.png rename to res/res/skype.png diff --git a/res/spotify.png b/res/res/spotify.png similarity index 100% rename from res/spotify.png rename to res/res/spotify.png diff --git a/res/steam.png b/res/res/steam.png similarity index 100% rename from res/steam.png rename to res/res/steam.png diff --git a/res/twitch.png b/res/res/twitch.png similarity index 100% rename from res/twitch.png rename to res/res/twitch.png diff --git a/res/twitter.png b/res/res/twitter.png similarity index 100% rename from res/twitter.png rename to res/res/twitter.png diff --git a/res/typing_indicator.gif b/res/res/typing_indicator.gif similarity index 100% rename from res/typing_indicator.gif rename to res/res/typing_indicator.gif diff --git a/res/xbox.png b/res/res/xbox.png similarity index 100% rename from res/xbox.png rename to res/res/xbox.png diff --git a/res/youtube.png b/res/res/youtube.png similarity index 100% rename from res/youtube.png rename to res/res/youtube.png diff --git a/MurmurHash3.cpp b/src/MurmurHash3.cpp similarity index 100% rename from MurmurHash3.cpp rename to src/MurmurHash3.cpp diff --git a/MurmurHash3.h b/src/MurmurHash3.h similarity index 100% rename from MurmurHash3.h rename to src/MurmurHash3.h diff --git a/abaddon.cpp b/src/abaddon.cpp similarity index 100% rename from abaddon.cpp rename to src/abaddon.cpp diff --git a/abaddon.hpp b/src/abaddon.hpp similarity index 100% rename from abaddon.hpp rename to src/abaddon.hpp diff --git a/components/cellrendererpixbufanimation.cpp b/src/components/cellrendererpixbufanimation.cpp similarity index 100% rename from components/cellrendererpixbufanimation.cpp rename to src/components/cellrendererpixbufanimation.cpp diff --git a/components/cellrendererpixbufanimation.hpp b/src/components/cellrendererpixbufanimation.hpp similarity index 100% rename from components/cellrendererpixbufanimation.hpp rename to src/components/cellrendererpixbufanimation.hpp diff --git a/components/channels.cpp b/src/components/channels.cpp similarity index 100% rename from components/channels.cpp rename to src/components/channels.cpp diff --git a/components/channels.hpp b/src/components/channels.hpp similarity index 100% rename from components/channels.hpp rename to src/components/channels.hpp diff --git a/components/chatinput.cpp b/src/components/chatinput.cpp similarity index 100% rename from components/chatinput.cpp rename to src/components/chatinput.cpp diff --git a/components/chatinput.hpp b/src/components/chatinput.hpp similarity index 100% rename from components/chatinput.hpp rename to src/components/chatinput.hpp diff --git a/components/chatinputindicator.cpp b/src/components/chatinputindicator.cpp similarity index 100% rename from components/chatinputindicator.cpp rename to src/components/chatinputindicator.cpp diff --git a/components/chatinputindicator.hpp b/src/components/chatinputindicator.hpp similarity index 100% rename from components/chatinputindicator.hpp rename to src/components/chatinputindicator.hpp diff --git a/components/chatlist.cpp b/src/components/chatlist.cpp similarity index 100% rename from components/chatlist.cpp rename to src/components/chatlist.cpp diff --git a/components/chatlist.hpp b/src/components/chatlist.hpp similarity index 100% rename from components/chatlist.hpp rename to src/components/chatlist.hpp diff --git a/components/chatmessage.cpp b/src/components/chatmessage.cpp similarity index 100% rename from components/chatmessage.cpp rename to src/components/chatmessage.cpp diff --git a/components/chatmessage.hpp b/src/components/chatmessage.hpp similarity index 100% rename from components/chatmessage.hpp rename to src/components/chatmessage.hpp diff --git a/components/chatwindow.cpp b/src/components/chatwindow.cpp similarity index 100% rename from components/chatwindow.cpp rename to src/components/chatwindow.cpp diff --git a/components/chatwindow.hpp b/src/components/chatwindow.hpp similarity index 100% rename from components/chatwindow.hpp rename to src/components/chatwindow.hpp diff --git a/components/completer.cpp b/src/components/completer.cpp similarity index 100% rename from components/completer.cpp rename to src/components/completer.cpp diff --git a/components/completer.hpp b/src/components/completer.hpp similarity index 100% rename from components/completer.hpp rename to src/components/completer.hpp diff --git a/components/draglistbox.cpp b/src/components/draglistbox.cpp similarity index 100% rename from components/draglistbox.cpp rename to src/components/draglistbox.cpp diff --git a/components/draglistbox.hpp b/src/components/draglistbox.hpp similarity index 100% rename from components/draglistbox.hpp rename to src/components/draglistbox.hpp diff --git a/components/friendslist.cpp b/src/components/friendslist.cpp similarity index 100% rename from components/friendslist.cpp rename to src/components/friendslist.cpp diff --git a/components/friendslist.hpp b/src/components/friendslist.hpp similarity index 100% rename from components/friendslist.hpp rename to src/components/friendslist.hpp diff --git a/components/lazyimage.cpp b/src/components/lazyimage.cpp similarity index 100% rename from components/lazyimage.cpp rename to src/components/lazyimage.cpp diff --git a/components/lazyimage.hpp b/src/components/lazyimage.hpp similarity index 100% rename from components/lazyimage.hpp rename to src/components/lazyimage.hpp diff --git a/components/memberlist.cpp b/src/components/memberlist.cpp similarity index 100% rename from components/memberlist.cpp rename to src/components/memberlist.cpp diff --git a/components/memberlist.hpp b/src/components/memberlist.hpp similarity index 100% rename from components/memberlist.hpp rename to src/components/memberlist.hpp diff --git a/components/ratelimitindicator.cpp b/src/components/ratelimitindicator.cpp similarity index 100% rename from components/ratelimitindicator.cpp rename to src/components/ratelimitindicator.cpp diff --git a/components/ratelimitindicator.hpp b/src/components/ratelimitindicator.hpp similarity index 100% rename from components/ratelimitindicator.hpp rename to src/components/ratelimitindicator.hpp diff --git a/components/statusindicator.cpp b/src/components/statusindicator.cpp similarity index 100% rename from components/statusindicator.cpp rename to src/components/statusindicator.cpp diff --git a/components/statusindicator.hpp b/src/components/statusindicator.hpp similarity index 100% rename from components/statusindicator.hpp rename to src/components/statusindicator.hpp diff --git a/config.h.in b/src/config.h.in similarity index 100% rename from config.h.in rename to src/config.h.in diff --git a/constants.hpp b/src/constants.hpp similarity index 100% rename from constants.hpp rename to src/constants.hpp diff --git a/dialogs/confirm.cpp b/src/dialogs/confirm.cpp similarity index 100% rename from dialogs/confirm.cpp rename to src/dialogs/confirm.cpp diff --git a/dialogs/confirm.hpp b/src/dialogs/confirm.hpp similarity index 100% rename from dialogs/confirm.hpp rename to src/dialogs/confirm.hpp diff --git a/dialogs/editmessage.cpp b/src/dialogs/editmessage.cpp similarity index 100% rename from dialogs/editmessage.cpp rename to src/dialogs/editmessage.cpp diff --git a/dialogs/editmessage.hpp b/src/dialogs/editmessage.hpp similarity index 100% rename from dialogs/editmessage.hpp rename to src/dialogs/editmessage.hpp diff --git a/dialogs/friendpicker.cpp b/src/dialogs/friendpicker.cpp similarity index 100% rename from dialogs/friendpicker.cpp rename to src/dialogs/friendpicker.cpp diff --git a/dialogs/friendpicker.hpp b/src/dialogs/friendpicker.hpp similarity index 100% rename from dialogs/friendpicker.hpp rename to src/dialogs/friendpicker.hpp diff --git a/dialogs/joinguild.cpp b/src/dialogs/joinguild.cpp similarity index 100% rename from dialogs/joinguild.cpp rename to src/dialogs/joinguild.cpp diff --git a/dialogs/joinguild.hpp b/src/dialogs/joinguild.hpp similarity index 100% rename from dialogs/joinguild.hpp rename to src/dialogs/joinguild.hpp diff --git a/dialogs/setstatus.cpp b/src/dialogs/setstatus.cpp similarity index 100% rename from dialogs/setstatus.cpp rename to src/dialogs/setstatus.cpp diff --git a/dialogs/setstatus.hpp b/src/dialogs/setstatus.hpp similarity index 100% rename from dialogs/setstatus.hpp rename to src/dialogs/setstatus.hpp diff --git a/dialogs/token.cpp b/src/dialogs/token.cpp similarity index 100% rename from dialogs/token.cpp rename to src/dialogs/token.cpp diff --git a/dialogs/token.hpp b/src/dialogs/token.hpp similarity index 100% rename from dialogs/token.hpp rename to src/dialogs/token.hpp diff --git a/dialogs/verificationgate.cpp b/src/dialogs/verificationgate.cpp similarity index 100% rename from dialogs/verificationgate.cpp rename to src/dialogs/verificationgate.cpp diff --git a/dialogs/verificationgate.hpp b/src/dialogs/verificationgate.hpp similarity index 100% rename from dialogs/verificationgate.hpp rename to src/dialogs/verificationgate.hpp diff --git a/discord/activity.cpp b/src/discord/activity.cpp similarity index 100% rename from discord/activity.cpp rename to src/discord/activity.cpp diff --git a/discord/activity.hpp b/src/discord/activity.hpp similarity index 100% rename from discord/activity.hpp rename to src/discord/activity.hpp diff --git a/discord/auditlog.cpp b/src/discord/auditlog.cpp similarity index 100% rename from discord/auditlog.cpp rename to src/discord/auditlog.cpp diff --git a/discord/auditlog.hpp b/src/discord/auditlog.hpp similarity index 100% rename from discord/auditlog.hpp rename to src/discord/auditlog.hpp diff --git a/discord/ban.cpp b/src/discord/ban.cpp similarity index 100% rename from discord/ban.cpp rename to src/discord/ban.cpp diff --git a/discord/ban.hpp b/src/discord/ban.hpp similarity index 100% rename from discord/ban.hpp rename to src/discord/ban.hpp diff --git a/discord/channel.cpp b/src/discord/channel.cpp similarity index 100% rename from discord/channel.cpp rename to src/discord/channel.cpp diff --git a/discord/channel.hpp b/src/discord/channel.hpp similarity index 100% rename from discord/channel.hpp rename to src/discord/channel.hpp diff --git a/discord/discord.cpp b/src/discord/discord.cpp similarity index 100% rename from discord/discord.cpp rename to src/discord/discord.cpp diff --git a/discord/discord.hpp b/src/discord/discord.hpp similarity index 100% rename from discord/discord.hpp rename to src/discord/discord.hpp diff --git a/discord/emoji.cpp b/src/discord/emoji.cpp similarity index 100% rename from discord/emoji.cpp rename to src/discord/emoji.cpp diff --git a/discord/emoji.hpp b/src/discord/emoji.hpp similarity index 100% rename from discord/emoji.hpp rename to src/discord/emoji.hpp diff --git a/discord/errors.hpp b/src/discord/errors.hpp similarity index 100% rename from discord/errors.hpp rename to src/discord/errors.hpp diff --git a/discord/guild.cpp b/src/discord/guild.cpp similarity index 100% rename from discord/guild.cpp rename to src/discord/guild.cpp diff --git a/discord/guild.hpp b/src/discord/guild.hpp similarity index 100% rename from discord/guild.hpp rename to src/discord/guild.hpp diff --git a/discord/httpclient.cpp b/src/discord/httpclient.cpp similarity index 100% rename from discord/httpclient.cpp rename to src/discord/httpclient.cpp diff --git a/discord/httpclient.hpp b/src/discord/httpclient.hpp similarity index 100% rename from discord/httpclient.hpp rename to src/discord/httpclient.hpp diff --git a/discord/interactions.cpp b/src/discord/interactions.cpp similarity index 100% rename from discord/interactions.cpp rename to src/discord/interactions.cpp diff --git a/discord/interactions.hpp b/src/discord/interactions.hpp similarity index 100% rename from discord/interactions.hpp rename to src/discord/interactions.hpp diff --git a/discord/invite.cpp b/src/discord/invite.cpp similarity index 100% rename from discord/invite.cpp rename to src/discord/invite.cpp diff --git a/discord/invite.hpp b/src/discord/invite.hpp similarity index 100% rename from discord/invite.hpp rename to src/discord/invite.hpp diff --git a/discord/json.hpp b/src/discord/json.hpp similarity index 100% rename from discord/json.hpp rename to src/discord/json.hpp diff --git a/discord/member.cpp b/src/discord/member.cpp similarity index 100% rename from discord/member.cpp rename to src/discord/member.cpp diff --git a/discord/member.hpp b/src/discord/member.hpp similarity index 100% rename from discord/member.hpp rename to src/discord/member.hpp diff --git a/discord/message.cpp b/src/discord/message.cpp similarity index 100% rename from discord/message.cpp rename to src/discord/message.cpp diff --git a/discord/message.hpp b/src/discord/message.hpp similarity index 100% rename from discord/message.hpp rename to src/discord/message.hpp diff --git a/discord/objects.cpp b/src/discord/objects.cpp similarity index 100% rename from discord/objects.cpp rename to src/discord/objects.cpp diff --git a/discord/objects.hpp b/src/discord/objects.hpp similarity index 100% rename from discord/objects.hpp rename to src/discord/objects.hpp diff --git a/discord/permissions.cpp b/src/discord/permissions.cpp similarity index 100% rename from discord/permissions.cpp rename to src/discord/permissions.cpp diff --git a/discord/permissions.hpp b/src/discord/permissions.hpp similarity index 100% rename from discord/permissions.hpp rename to src/discord/permissions.hpp diff --git a/discord/relationship.cpp b/src/discord/relationship.cpp similarity index 100% rename from discord/relationship.cpp rename to src/discord/relationship.cpp diff --git a/discord/relationship.hpp b/src/discord/relationship.hpp similarity index 100% rename from discord/relationship.hpp rename to src/discord/relationship.hpp diff --git a/discord/role.cpp b/src/discord/role.cpp similarity index 100% rename from discord/role.cpp rename to src/discord/role.cpp diff --git a/discord/role.hpp b/src/discord/role.hpp similarity index 100% rename from discord/role.hpp rename to src/discord/role.hpp diff --git a/discord/snowflake.cpp b/src/discord/snowflake.cpp similarity index 100% rename from discord/snowflake.cpp rename to src/discord/snowflake.cpp diff --git a/discord/snowflake.hpp b/src/discord/snowflake.hpp similarity index 100% rename from discord/snowflake.hpp rename to src/discord/snowflake.hpp diff --git a/discord/sticker.cpp b/src/discord/sticker.cpp similarity index 100% rename from discord/sticker.cpp rename to src/discord/sticker.cpp diff --git a/discord/sticker.hpp b/src/discord/sticker.hpp similarity index 100% rename from discord/sticker.hpp rename to src/discord/sticker.hpp diff --git a/discord/store.cpp b/src/discord/store.cpp similarity index 100% rename from discord/store.cpp rename to src/discord/store.cpp diff --git a/discord/store.hpp b/src/discord/store.hpp similarity index 100% rename from discord/store.hpp rename to src/discord/store.hpp diff --git a/discord/user.cpp b/src/discord/user.cpp similarity index 100% rename from discord/user.cpp rename to src/discord/user.cpp diff --git a/discord/user.hpp b/src/discord/user.hpp similarity index 100% rename from discord/user.hpp rename to src/discord/user.hpp diff --git a/discord/usersettings.cpp b/src/discord/usersettings.cpp similarity index 100% rename from discord/usersettings.cpp rename to src/discord/usersettings.cpp diff --git a/discord/usersettings.hpp b/src/discord/usersettings.hpp similarity index 100% rename from discord/usersettings.hpp rename to src/discord/usersettings.hpp diff --git a/discord/webhook.cpp b/src/discord/webhook.cpp similarity index 100% rename from discord/webhook.cpp rename to src/discord/webhook.cpp diff --git a/discord/webhook.hpp b/src/discord/webhook.hpp similarity index 100% rename from discord/webhook.hpp rename to src/discord/webhook.hpp diff --git a/discord/websocket.cpp b/src/discord/websocket.cpp similarity index 100% rename from discord/websocket.cpp rename to src/discord/websocket.cpp diff --git a/discord/websocket.hpp b/src/discord/websocket.hpp similarity index 100% rename from discord/websocket.hpp rename to src/discord/websocket.hpp diff --git a/emojis.cpp b/src/emojis.cpp similarity index 100% rename from emojis.cpp rename to src/emojis.cpp diff --git a/emojis.hpp b/src/emojis.hpp similarity index 100% rename from emojis.hpp rename to src/emojis.hpp diff --git a/filecache.cpp b/src/filecache.cpp similarity index 100% rename from filecache.cpp rename to src/filecache.cpp diff --git a/filecache.hpp b/src/filecache.hpp similarity index 100% rename from filecache.hpp rename to src/filecache.hpp diff --git a/http.cpp b/src/http.cpp similarity index 100% rename from http.cpp rename to src/http.cpp diff --git a/http.hpp b/src/http.hpp similarity index 100% rename from http.hpp rename to src/http.hpp diff --git a/imgmanager.cpp b/src/imgmanager.cpp similarity index 100% rename from imgmanager.cpp rename to src/imgmanager.cpp diff --git a/imgmanager.hpp b/src/imgmanager.hpp similarity index 100% rename from imgmanager.hpp rename to src/imgmanager.hpp diff --git a/platform.cpp b/src/platform.cpp similarity index 100% rename from platform.cpp rename to src/platform.cpp diff --git a/platform.hpp b/src/platform.hpp similarity index 100% rename from platform.hpp rename to src/platform.hpp diff --git a/settings.cpp b/src/settings.cpp similarity index 100% rename from settings.cpp rename to src/settings.cpp diff --git a/settings.hpp b/src/settings.hpp similarity index 100% rename from settings.hpp rename to src/settings.hpp diff --git a/state.cpp b/src/state.cpp similarity index 100% rename from state.cpp rename to src/state.cpp diff --git a/state.hpp b/src/state.hpp similarity index 100% rename from state.hpp rename to src/state.hpp diff --git a/util.cpp b/src/util.cpp similarity index 100% rename from util.cpp rename to src/util.cpp diff --git a/util.hpp b/src/util.hpp similarity index 100% rename from util.hpp rename to src/util.hpp diff --git a/windows/guildsettings/auditlogpane.cpp b/src/windows/guildsettings/auditlogpane.cpp similarity index 100% rename from windows/guildsettings/auditlogpane.cpp rename to src/windows/guildsettings/auditlogpane.cpp diff --git a/windows/guildsettings/auditlogpane.hpp b/src/windows/guildsettings/auditlogpane.hpp similarity index 100% rename from windows/guildsettings/auditlogpane.hpp rename to src/windows/guildsettings/auditlogpane.hpp diff --git a/windows/guildsettings/banspane.cpp b/src/windows/guildsettings/banspane.cpp similarity index 100% rename from windows/guildsettings/banspane.cpp rename to src/windows/guildsettings/banspane.cpp diff --git a/windows/guildsettings/banspane.hpp b/src/windows/guildsettings/banspane.hpp similarity index 100% rename from windows/guildsettings/banspane.hpp rename to src/windows/guildsettings/banspane.hpp diff --git a/windows/guildsettings/emojispane.cpp b/src/windows/guildsettings/emojispane.cpp similarity index 100% rename from windows/guildsettings/emojispane.cpp rename to src/windows/guildsettings/emojispane.cpp diff --git a/windows/guildsettings/emojispane.hpp b/src/windows/guildsettings/emojispane.hpp similarity index 100% rename from windows/guildsettings/emojispane.hpp rename to src/windows/guildsettings/emojispane.hpp diff --git a/windows/guildsettings/infopane.cpp b/src/windows/guildsettings/infopane.cpp similarity index 100% rename from windows/guildsettings/infopane.cpp rename to src/windows/guildsettings/infopane.cpp diff --git a/windows/guildsettings/infopane.hpp b/src/windows/guildsettings/infopane.hpp similarity index 100% rename from windows/guildsettings/infopane.hpp rename to src/windows/guildsettings/infopane.hpp diff --git a/windows/guildsettings/invitespane.cpp b/src/windows/guildsettings/invitespane.cpp similarity index 100% rename from windows/guildsettings/invitespane.cpp rename to src/windows/guildsettings/invitespane.cpp diff --git a/windows/guildsettings/invitespane.hpp b/src/windows/guildsettings/invitespane.hpp similarity index 100% rename from windows/guildsettings/invitespane.hpp rename to src/windows/guildsettings/invitespane.hpp diff --git a/windows/guildsettings/memberspane.cpp b/src/windows/guildsettings/memberspane.cpp similarity index 100% rename from windows/guildsettings/memberspane.cpp rename to src/windows/guildsettings/memberspane.cpp diff --git a/windows/guildsettings/memberspane.hpp b/src/windows/guildsettings/memberspane.hpp similarity index 100% rename from windows/guildsettings/memberspane.hpp rename to src/windows/guildsettings/memberspane.hpp diff --git a/windows/guildsettings/rolespane.cpp b/src/windows/guildsettings/rolespane.cpp similarity index 100% rename from windows/guildsettings/rolespane.cpp rename to src/windows/guildsettings/rolespane.cpp diff --git a/windows/guildsettings/rolespane.hpp b/src/windows/guildsettings/rolespane.hpp similarity index 100% rename from windows/guildsettings/rolespane.hpp rename to src/windows/guildsettings/rolespane.hpp diff --git a/windows/guildsettingswindow.cpp b/src/windows/guildsettingswindow.cpp similarity index 100% rename from windows/guildsettingswindow.cpp rename to src/windows/guildsettingswindow.cpp diff --git a/windows/guildsettingswindow.hpp b/src/windows/guildsettingswindow.hpp similarity index 100% rename from windows/guildsettingswindow.hpp rename to src/windows/guildsettingswindow.hpp diff --git a/windows/mainwindow.cpp b/src/windows/mainwindow.cpp similarity index 100% rename from windows/mainwindow.cpp rename to src/windows/mainwindow.cpp diff --git a/windows/mainwindow.hpp b/src/windows/mainwindow.hpp similarity index 100% rename from windows/mainwindow.hpp rename to src/windows/mainwindow.hpp diff --git a/windows/pinnedwindow.cpp b/src/windows/pinnedwindow.cpp similarity index 100% rename from windows/pinnedwindow.cpp rename to src/windows/pinnedwindow.cpp diff --git a/windows/pinnedwindow.hpp b/src/windows/pinnedwindow.hpp similarity index 100% rename from windows/pinnedwindow.hpp rename to src/windows/pinnedwindow.hpp diff --git a/windows/profile/mutualfriendspane.cpp b/src/windows/profile/mutualfriendspane.cpp similarity index 100% rename from windows/profile/mutualfriendspane.cpp rename to src/windows/profile/mutualfriendspane.cpp diff --git a/windows/profile/mutualfriendspane.hpp b/src/windows/profile/mutualfriendspane.hpp similarity index 100% rename from windows/profile/mutualfriendspane.hpp rename to src/windows/profile/mutualfriendspane.hpp diff --git a/windows/profile/mutualguildspane.cpp b/src/windows/profile/mutualguildspane.cpp similarity index 100% rename from windows/profile/mutualguildspane.cpp rename to src/windows/profile/mutualguildspane.cpp diff --git a/windows/profile/mutualguildspane.hpp b/src/windows/profile/mutualguildspane.hpp similarity index 100% rename from windows/profile/mutualguildspane.hpp rename to src/windows/profile/mutualguildspane.hpp diff --git a/windows/profile/userinfopane.cpp b/src/windows/profile/userinfopane.cpp similarity index 100% rename from windows/profile/userinfopane.cpp rename to src/windows/profile/userinfopane.cpp diff --git a/windows/profile/userinfopane.hpp b/src/windows/profile/userinfopane.hpp similarity index 100% rename from windows/profile/userinfopane.hpp rename to src/windows/profile/userinfopane.hpp diff --git a/windows/profilewindow.cpp b/src/windows/profilewindow.cpp similarity index 100% rename from windows/profilewindow.cpp rename to src/windows/profilewindow.cpp diff --git a/windows/profilewindow.hpp b/src/windows/profilewindow.hpp similarity index 100% rename from windows/profilewindow.hpp rename to src/windows/profilewindow.hpp diff --git a/windows/threadswindow.cpp b/src/windows/threadswindow.cpp similarity index 100% rename from windows/threadswindow.cpp rename to src/windows/threadswindow.cpp diff --git a/windows/threadswindow.hpp b/src/windows/threadswindow.hpp similarity index 100% rename from windows/threadswindow.hpp rename to src/windows/threadswindow.hpp diff --git a/thirdparty/IXWebSocket b/subprojects/ixwebsocket similarity index 100% rename from thirdparty/IXWebSocket rename to subprojects/ixwebsocket diff --git a/thirdparty/simpleini b/subprojects/simpleini similarity index 100% rename from thirdparty/simpleini rename to subprojects/simpleini