mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-07-29 12:18:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: move record path to userdata.ini

Browse source
This commit is contained in:
rankun 2020-02-19 18:16:42 +08:00
commit fd63fae6d1
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -12,3 +12,4 @@
/build/ /build/
build-* build-*
*.DS_Store *.DS_Store
userdata.ini

4
QtScrcpy/main.cpp
View file

@ -45,13 +45,13 @@ int main(int argc, char *argv[])
qputenv("QTSCRCPY_ADB_PATH", "../../../../third_party/adb/win/adb.exe"); qputenv("QTSCRCPY_ADB_PATH", "../../../../third_party/adb/win/adb.exe");
qputenv("QTSCRCPY_SERVER_PATH", "../../../../third_party/scrcpy-server"); qputenv("QTSCRCPY_SERVER_PATH", "../../../../third_party/scrcpy-server");
qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../keymap"); qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../keymap");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../../config/config.ini"); qputenv("QTSCRCPY_CONFIG_PATH", "../../../../config");
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb"); qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb");
qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server"); qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server");
qputenv("QTSCRCPY_CONFIG_PATH", "../../../config/config.ini"); qputenv("QTSCRCPY_CONFIG_PATH", "../../../config");
#endif #endif
//加载样式表 //加载样式表

29
QtScrcpy/util/config.cpp
View file

@ -6,12 +6,10 @@
#define GROUP_COMMON "common" #define GROUP_COMMON "common"
// config
#define COMMON_TITLE_KEY "WindowTitle" #define COMMON_TITLE_KEY "WindowTitle"
#define COMMON_TITLE_DEF QCoreApplication::applicationName() #define COMMON_TITLE_DEF QCoreApplication::applicationName()
#define COMMON_RECORD_KEY "RecordPath"
#define COMMON_RECORD_DEF ""
#define COMMON_PUSHFILE_KEY "PushFilePath" #define COMMON_PUSHFILE_KEY "PushFilePath"
#define COMMON_PUSHFILE_DEF "/sdcard/" #define COMMON_PUSHFILE_DEF "/sdcard/"
@ -33,12 +31,19 @@
#define COMMON_RENDER_EXPIRED_FRAMES_KEY "RenderExpiredFrames" #define COMMON_RENDER_EXPIRED_FRAMES_KEY "RenderExpiredFrames"
#define COMMON_RENDER_EXPIRED_FRAMES_DEF 0 #define COMMON_RENDER_EXPIRED_FRAMES_DEF 0
// user data
#define COMMON_RECORD_KEY "RecordPath"
#define COMMON_RECORD_DEF ""
QString Config::s_configPath = ""; QString Config::s_configPath = "";
Config::Config(QObject *parent) : QObject(parent) Config::Config(QObject *parent) : QObject(parent)
{ {
m_settings = new QSettings(getConfigPath(), QSettings::IniFormat); m_settings = new QSettings(getConfigPath() + "/config.ini", QSettings::IniFormat);
m_settings->setIniCodec("UTF-8"); m_settings->setIniCodec("UTF-8");
m_userData = new QSettings(getConfigPath() + "/userdata.ini", QSettings::IniFormat);
m_userData->setIniCodec("UTF-8");
} }
Config &Config::getInstance() Config &Config::getInstance()
@ -52,8 +57,8 @@ const QString& Config::getConfigPath()
if (s_configPath.isEmpty()) { if (s_configPath.isEmpty()) {
s_configPath = QString::fromLocal8Bit(qgetenv("QTSCRCPY_CONFIG_PATH")); s_configPath = QString::fromLocal8Bit(qgetenv("QTSCRCPY_CONFIG_PATH"));
QFileInfo fileInfo(s_configPath); QFileInfo fileInfo(s_configPath);
if (s_configPath.isEmpty() || !fileInfo.isFile()) { if (s_configPath.isEmpty() || !fileInfo.isDir()) {
s_configPath = QCoreApplication::applicationDirPath() + "/config/config.ini"; s_configPath = QCoreApplication::applicationDirPath() + "/config";
} }
} }
return s_configPath; return s_configPath;
@ -62,17 +67,17 @@ const QString& Config::getConfigPath()
QString Config::getRecordPath() QString Config::getRecordPath()
{ {
QString record; QString record;
m_settings->beginGroup(GROUP_COMMON); m_userData->beginGroup(GROUP_COMMON);
record = m_settings->value(COMMON_RECORD_KEY, COMMON_RECORD_DEF).toString(); record = m_userData->value(COMMON_RECORD_KEY, COMMON_RECORD_DEF).toString();
m_settings->endGroup(); m_userData->endGroup();
return record; return record;
} }
void Config::setRecordPath(const QString &path) void Config::setRecordPath(const QString &path)
{ {
m_settings->beginGroup(GROUP_COMMON); m_userData->beginGroup(GROUP_COMMON);
m_settings->setValue(COMMON_RECORD_KEY, path); m_userData->setValue(COMMON_RECORD_KEY, path);
m_settings->endGroup(); m_userData->endGroup();
} }
QString Config::getServerVersion() QString Config::getServerVersion()

1
QtScrcpy/util/config.h
View file

@ -28,6 +28,7 @@ private:
private: private:
static QString s_configPath; static QString s_configPath;
QPointer<QSettings> m_settings; QPointer<QSettings> m_settings;
QPointer<QSettings> m_userData;
}; };
#endif // CONFIG_H #endif // CONFIG_H