diff options
| author | TrickyLeifa <date.epoch@gmail.com> | 2024-05-15 00:00:17 +0200 |
|---|---|---|
| committer | TrickyLeifa <date.epoch@gmail.com> | 2024-05-15 00:04:16 +0200 |
| commit | c9f52b7223685d2e7fca925594171f94dd8c6e3b (patch) | |
| tree | 740bb32a40da98a4d52836432f59a16b31333900 /src/main.cpp | |
| parent | 951766666621fa77e257e6b5616fe4ab1eb2a52f (diff) | |
Ported to CMake, ...
* Ported the project to CMake
* Android and Mac support dropped for the time
being.
* Tests, BASS and Discord-RPC are now options
* Restructured and reformated the project.
* Merged `include` and `src`
* Renamed `resource` to `data`
* Renamed various files
* External libraries headers are no longer included in `src`
* Replaced header guards with #pragma once
* Multiple refactors (keywords, headers)
* Added Qt6 compatibility
* Removed various unused functions and headers
* Reworked AOPacket
* When content is passed to AOPacket, it should be ensured that the content is already decoded.
* Encoding/decoding are now static methods.
* Fixed various memory leaks
* Removed animation code for AOImage
* AOImage is always using static images
* Simplified ChatLogPiece
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/src/main.cpp b/src/main.cpp index 2c36c53c..d582eb7b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,11 +5,13 @@ #include "datatypes.h" #include "lobby.h" #include "networkmanager.h" + #include <QDebug> +#include <QDirIterator> #include <QLibraryInfo> #include <QPluginLoader> -#include <QTranslator> #include <QResource> +#include <QTranslator> int main(int argc, char *argv[]) { @@ -17,11 +19,12 @@ int main(int argc, char *argv[]) AOApplication main_app(argc, argv); - #ifdef ANDROID - if(QtAndroid::checkPermission("android.permission.READ_EXTERNAL_STORAGE")==QtAndroid::PermissionResult::Denied) { - QtAndroid::requestPermissionsSync({"android.permission.READ_EXTERNAL_STORAGE","android.permission.WRITE_EXTERNAL_STORAGE"}); +#ifdef ANDROID + if (QtAndroid::checkPermission("android.permission.READ_EXTERNAL_STORAGE") == QtAndroid::PermissionResult::Denied) + { + QtAndroid::requestPermissionsSync({"android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"}); } - #endif +#endif AOApplication::addLibraryPath(AOApplication::applicationDirPath() + "/lib"); QResource::registerResource(main_app.get_asset("themes/" + Options::getInstance().theme() + ".rcc")); @@ -35,32 +38,37 @@ int main(int argc, char *argv[]) main_app.setFont(new_font); QFontDatabase fontDatabase; - QDirIterator it(get_base_path() + "fonts", - QDirIterator::Subdirectories); + QDirIterator it(get_base_path() + "fonts", QDirIterator::Subdirectories); while (it.hasNext()) + { fontDatabase.addApplicationFont(it.next()); + } QPluginLoader apngPlugin("qapng"); if (!apngPlugin.load()) + { qCritical() << "QApng plugin could not be loaded"; + } QPluginLoader webpPlugin("qwebp"); if (!webpPlugin.load()) + { qCritical() << "QWebp plugin could not be loaded"; + } - QString p_language = - Options::getInstance().language(); - if (p_language == " " || p_language == "") + QString p_language = Options::getInstance().language(); + if (p_language.trimmed().isEmpty()) + { p_language = QLocale::system().name(); + } QTranslator qtTranslator; - qtTranslator.load("qt_" + p_language, - QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + qtTranslator.load("qt_" + p_language, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); main_app.installTranslator(&qtTranslator); QTranslator appTranslator; - qDebug() << ":/resource/translations/ao_" + p_language; - appTranslator.load("ao_" + p_language, ":/resource/translations/"); + qDebug() << ":/data/translations/ao_" + p_language; + appTranslator.load("ao_" + p_language, ":/data/translations/"); main_app.installTranslator(&appTranslator); main_app.construct_lobby(); |
