From a890859c55a15e3ddb4bbce1e502b6fe6cd7b55c Mon Sep 17 00:00:00 2001 From: "Leroy.H.Y" Date: Tue, 25 Jun 2019 19:12:45 +0800 Subject: [PATCH] [Format] Formatted UI file names. Signed-off-by: Leroy.H.Y Former-commit-id: adae62393fb6de2f1af12799de9a4a5cb44c0d67 --- Hv2ray.pro | 25 +++++++------- src/constants.h | 15 +++++++++ src/main.cpp | 33 +++++++++++++------ src/utils.h | 2 ++ src/vinteract.cpp | 2 +- ...tWindow.cpp => w_ConnectionEditWindow.cpp} | 4 +-- ...nEditWindow.h => w_ConnectionEditWindow.h} | 0 ...ditWindow.ui => w_ConnectionEditWindow.ui} | 0 src/{ImportConfig.cpp => w_ImportConfig.cpp} | 4 +-- src/{ImportConfig.h => w_ImportConfig.h} | 0 src/{ImportConfig.ui => w_ImportConfig.ui} | 0 src/{MainWindow.cpp => w_MainWindow.cpp} | 8 ++--- src/{MainWindow.h => w_MainWindow.h} | 5 +-- src/{MainWindow.ui => w_MainWindow.ui} | 0 ...encesWindow.cpp => w_PrefrencesWindow.cpp} | 2 +- ...refrencesWindow.h => w_PrefrencesWindow.h} | 0 ...frencesWindow.ui => w_PrefrencesWindow.ui} | 0 17 files changed, 64 insertions(+), 36 deletions(-) create mode 100644 src/constants.h rename src/{ConnectionEditWindow.cpp => w_ConnectionEditWindow.cpp} (93%) rename src/{ConnectionEditWindow.h => w_ConnectionEditWindow.h} (100%) rename src/{ConnectionEditWindow.ui => w_ConnectionEditWindow.ui} (100%) rename src/{ImportConfig.cpp => w_ImportConfig.cpp} (98%) rename src/{ImportConfig.h => w_ImportConfig.h} (100%) rename src/{ImportConfig.ui => w_ImportConfig.ui} (100%) rename src/{MainWindow.cpp => w_MainWindow.cpp} (98%) rename src/{MainWindow.h => w_MainWindow.h} (93%) rename src/{MainWindow.ui => w_MainWindow.ui} (100%) rename src/{PrefrencesWindow.cpp => w_PrefrencesWindow.cpp} (99%) rename src/{PrefrencesWindow.h => w_PrefrencesWindow.h} (100%) rename src/{PrefrencesWindow.ui => w_PrefrencesWindow.ui} (100%) diff --git a/Hv2ray.pro b/Hv2ray.pro index 92b630e3..62efcd61 100644 --- a/Hv2ray.pro +++ b/Hv2ray.pro @@ -27,29 +27,30 @@ CONFIG += c++11 VPATH += ./src SOURCES += \ + w_MainWindow.cpp \ + w_ConnectionEditWindow.cpp \ + w_ImportConfig.cpp \ + w_PrefrencesWindow.cpp \ main.cpp \ - MainWindow.cpp \ - ConnectionEditWindow.cpp \ - ImportConfig.cpp \ - PrefrencesWindow.cpp \ vinteract.cpp \ utils.cpp \ runguard.cpp HEADERS += \ - MainWindow.h \ - ConnectionEditWindow.h \ - ImportConfig.h \ - PrefrencesWindow.h \ + w_MainWindow.h \ + w_ConnectionEditWindow.h \ + w_ImportConfig.h \ + w_PrefrencesWindow.h \ + constants.h \ vinteract.h \ utils.h \ runguard.h FORMS += \ - MainWindow.ui \ - ConnectionEditWindow.ui \ - ImportConfig.ui \ - PrefrencesWindow.ui + w_MainWindow.ui \ + w_ConnectionEditWindow.ui \ + w_ImportConfig.ui \ + w_PrefrencesWindow.ui RESOURCES += \ resources.qrc diff --git a/src/constants.h b/src/constants.h new file mode 100644 index 00000000..c75d92db --- /dev/null +++ b/src/constants.h @@ -0,0 +1,15 @@ +#include +#include + +#ifndef CONSTANTS_H +#define CONSTANTS_H + +// Macros +#define HV2RAY_CONFIG_DIR_NAME ".hv2ray" + + +namespace Hv2rayUtils { + static QDir ConfigDir; +} // namespace Hv2rayConsts + +#endif // CONSTANTS_H diff --git a/src/main.cpp b/src/main.cpp index 2a7f729d..a0e5892e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -11,15 +12,19 @@ #include "runguard.h" #include "utils.h" -#include "MainWindow.h" -#include "ConnectionEditWindow.h" +#include "w_MainWindow.h" +#include "w_ConnectionEditWindow.h" +#include "constants.h" using namespace std; +using namespace Hv2rayUtils; void firstRunCheck() { - if(!QDir("conf").exists()) { - QDir().mkdir("conf"); + ConfigDir = QDir(QDir::homePath() + HV2RAY_CONFIG_DIR_NAME); + + if(!ConfigDir.exists()) { + QDir(QDir::homePath()).mkdir(".hv2ray"); qDebug() << "Config directory created."; } @@ -65,17 +70,25 @@ int main(int argc, char *argv[]) QApplication _qApp(argc, argv); QTranslator translator; - if (translator.load(QString(":/translations/zh-CN.qm"), QString("translations"))) + if (translator.load(":/translations/zh-CN.qm", "translations")) { cout << "Loaded Chinese translations" << endl; } + else if (translator.load(":/translations/en-US.qm", "translations")){ + cout << "Loaded English translations" << endl; + } else { + showWarnMessageBox(nullptr, "Failed to load translations", + "Failed to load translations, user experience may be downgraded. \r\n \ + 无法加载语言文件，用户体验可能会降级."); + } + _qApp.installTranslator(&translator); - RunGuard guard("Hv2ray"); - if(!guard.isSingleInstance()) { - showWarnMessageBox(nullptr, QObject::tr("Hv2Ray"), QObject::tr("AnotherInstanceRunning")); - return -1; - } + RunGuard guard("Hv2ray-Instance-Identifier"); + if(!guard.isSingleInstance()) { + showWarnMessageBox(nullptr, QObject::tr("Hv2Ray"), QObject::tr("AnotherInstanceRunning")); + return -1; + } QDir::setCurrent(QFileInfo(QCoreApplication::applicationFilePath()).path()); diff --git a/src/utils.h b/src/utils.h index d9f1b861..ec8000aa 100644 --- a/src/utils.h +++ b/src/utils.h @@ -1,3 +1,5 @@ +#include + #ifndef UTILS_H #define UTILS_H #include diff --git a/src/vinteract.cpp b/src/vinteract.cpp index 898486cb..623b5b3c 100644 --- a/src/vinteract.cpp +++ b/src/vinteract.cpp @@ -4,7 +4,7 @@ #include #include "utils.h" -#include "MainWindow.h" +#include "w_MainWindow.h" #include "vinteract.h" bool validationCheck(QString path) diff --git a/src/ConnectionEditWindow.cpp b/src/w_ConnectionEditWindow.cpp similarity index 93% rename from src/ConnectionEditWindow.cpp rename to src/w_ConnectionEditWindow.cpp index c8239c20..ca8b5db6 100644 --- a/src/ConnectionEditWindow.cpp +++ b/src/w_ConnectionEditWindow.cpp @@ -1,7 +1,7 @@ -#include "ConnectionEditWindow.h" +#include "w_ConnectionEditWindow.h" #include "ui_ConnectionEditWindow.h" #include -#include "MainWindow.h" +#include "w_MainWindow.h" #include #include #include diff --git a/src/ConnectionEditWindow.h b/src/w_ConnectionEditWindow.h similarity index 100% rename from src/ConnectionEditWindow.h rename to src/w_ConnectionEditWindow.h diff --git a/src/ConnectionEditWindow.ui b/src/w_ConnectionEditWindow.ui similarity index 100% rename from src/ConnectionEditWindow.ui rename to src/w_ConnectionEditWindow.ui diff --git a/src/ImportConfig.cpp b/src/w_ImportConfig.cpp similarity index 98% rename from src/ImportConfig.cpp rename to src/w_ImportConfig.cpp index 1ee03959..aad660e6 100644 --- a/src/ImportConfig.cpp +++ b/src/w_ImportConfig.cpp @@ -10,10 +10,10 @@ #include "Python.h" #pragma pop_macro("slots") -#include "ConnectionEditWindow.h" +#include "w_ConnectionEditWindow.h" #include "vinteract.h" #include "utils.h" -#include "ImportConfig.h" +#include "w_ImportConfig.h" #include "ui_ImportConfig.h" ImportConfig::ImportConfig(QWidget *parent) : diff --git a/src/ImportConfig.h b/src/w_ImportConfig.h similarity index 100% rename from src/ImportConfig.h rename to src/w_ImportConfig.h diff --git a/src/ImportConfig.ui b/src/w_ImportConfig.ui similarity index 100% rename from src/ImportConfig.ui rename to src/w_ImportConfig.ui diff --git a/src/MainWindow.cpp b/src/w_MainWindow.cpp similarity index 98% rename from src/MainWindow.cpp rename to src/w_MainWindow.cpp index eace8dec..3c5fe542 100644 --- a/src/MainWindow.cpp +++ b/src/w_MainWindow.cpp @@ -9,10 +9,10 @@ #include #include "ui_MainWindow.h" -#include "PrefrencesWindow.h" -#include "MainWindow.h" -#include "ConnectionEditWindow.h" -#include "ImportConfig.h" +#include "w_PrefrencesWindow.h" +#include "w_MainWindow.h" +#include "w_ConnectionEditWindow.h" +#include "w_ImportConfig.h" #include "vinteract.h" #include "utils.h" diff --git a/src/MainWindow.h b/src/w_MainWindow.h similarity index 93% rename from src/MainWindow.h rename to src/w_MainWindow.h index a46dba8f..a4f3247c 100644 --- a/src/MainWindow.h +++ b/src/w_MainWindow.h @@ -1,9 +1,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#define confDir "conf/" -#define confDatabase "conf/conf.db" #include -#include "ConnectionEditWindow.h" +#include "w_ConnectionEditWindow.h" #include #include #include @@ -56,7 +54,6 @@ private: Ui::MainWindow *ui; void closeEvent(QCloseEvent *); void createTrayAction(); - void CreateTrayIcon(); }; diff --git a/src/MainWindow.ui b/src/w_MainWindow.ui similarity index 100% rename from src/MainWindow.ui rename to src/w_MainWindow.ui diff --git a/src/PrefrencesWindow.cpp b/src/w_PrefrencesWindow.cpp similarity index 99% rename from src/PrefrencesWindow.cpp rename to src/w_PrefrencesWindow.cpp index 6aa155fd..648bf5f9 100644 --- a/src/PrefrencesWindow.cpp +++ b/src/w_PrefrencesWindow.cpp @@ -11,7 +11,7 @@ #include #include "utils.h" -#include "PrefrencesWindow.h" +#include "w_PrefrencesWindow.h" PrefrencesWindow::PrefrencesWindow(QWidget *parent) : QDialog(parent), diff --git a/src/PrefrencesWindow.h b/src/w_PrefrencesWindow.h similarity index 100% rename from src/PrefrencesWindow.h rename to src/w_PrefrencesWindow.h diff --git a/src/PrefrencesWindow.ui b/src/w_PrefrencesWindow.ui similarity index 100% rename from src/PrefrencesWindow.ui rename to src/w_PrefrencesWindow.ui