The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixup for #548: fix detection of portable app
Some checks failed
CMake / build (build/xca-*-Linux.tar.gz, Unix Makefiles, linux, /usr, ubuntu, 5.15.2, ubuntu-latest) (push) Has been cancelled
Details
CMake / build (build/xca-*-Linux.tar.gz, Unix Makefiles, linux, /usr, ubuntu, 6.6.2, ubuntu-latest) (push) Has been cancelled
Details
CMake / build (build/xca-*.dmg, Unix Makefiles, mac, /opt/homebrew/opt/openssl, macos, 6.6.2, macos-latest) (push) Has been cancelled
Details
CMake / build (build/xca-*.msi build/xca-portable-*.zip , MinGW Makefiles, windows, D:\msys2\msys64\mingw64, windows, 5.15.2, windows-2019, win64_mingw81) (push) Has been cancelled
Details

Browse Source 
Don't call getHomeDir() in global constructor before main()
This commit is contained in:
Christian Hohnstaedt 2024-09-08 12:14:50 +02:00
parent d256da3858
commit 418b78ce52
3 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/func.cpp
View File

@ -117,6 +117,7 @@ static QString registryInstallDir()
int portable_app()
{
static int portable = -1;
qDebug() << "portable" << portable;
QString f1, f2;
if (portable == -1) {
#if defined(Q_OS_WIN32)

43
lib/settings.cpp
View File

@ -28,6 +28,7 @@ QString svalue::get() const
{
return setting ? setting->get(key) : QString();
}
void svalue::set(const QString &val)
{
if (setting)
@ -36,22 +37,27 @@ void svalue::set(const QString &val)
settings::settings()
{
defaul["mandatory_dn"] = "";
defaul["explicit_dn"] = "C,ST,L,O,OU,CN,emailAddress";
defaul["string_opt"] = "MASK:0x2002";
defaul["workingdir"] = getHomeDir() + "/";
defaul["default_hash"] = digest::getDefault().name();
defaul["pkcs12_enc_algo"] = encAlgo::getDefault().name();
defaul["ical_expiry"] = "1W";
defaul["cert_expiry"] = "80%";
defaul["serial_len"] = "64";
defaul["fp_separator"] = ":";
defaul["fp_digits"] = "2";
defaul["hide_unusable"] = "no";
defaul["KeyFormat"] = QString::number(DEFAULT_KEY_CLIPBOARD_TYPE);
defaul["CertFormat"] = QString::number(DEFAULT_CERT_CLIPBOARD_TYPE);
hostspecific = QStringList({ "pkcs11path", "workingdir", "mw_geometry" });
}
hostspecific << "pkcs11path" << "workingdir" << "mw_geometry";
const QMap<QString, QString> settings::defaults() const
{
return QMap<QString, QString> {
{ "mandatory_dn", "" },
{ "explicit_dn", "C,ST,L,O,OU,CN,emailAddress" },
{ "string_opt", "MASK:0x2002" },
{ "workingdir", getHomeDir() + "/" },
{ "default_hash", digest::getDefault().name() },
{ "pkcs12_enc_algo", encAlgo::getDefault().name() },
{ "ical_expiry", "1W" },
{ "cert_expiry", "80%" },
{ "serial_len", "64" },
{ "fp_separator", ":" },
{ "fp_digits", "2" },
{ "hide_unusable", "no" },
{ "KeyFormat", QString::number(DEFAULT_KEY_CLIPBOARD_TYPE) },
{ "CertFormat", QString::number(DEFAULT_CERT_CLIPBOARD_TYPE) },
};
}
void settings::clear()
@ -59,8 +65,9 @@ void settings::clear()
loaded = false;
values.clear();
db_keys.clear();
foreach(QString key, defaul.keys())
setAction(key, defaul[key]);
const QMap<QString, QString> def = defaults();
for(QString key : def.keys())
setAction(key, def[key]);
}
void settings::setAction(const QString &key, const QString &value)
@ -93,7 +100,7 @@ void settings::setAction(const QString &key, const QString &value)
QString settings::defaults(const QString &key)
{
return defaul[key];
return defaults()[key];
}
void settings::load_settings()

2
lib/settings.h
View File

@ -95,11 +95,11 @@ class settings
bool loaded{};
QStringList db_keys{}, hostspecific{};
QMap<QString, QString> values{};
QMap<QString, QString> defaul{};
void load_settings();
QString get(QString key);
void set(QString key, QString value);
void setAction(const QString &key, const QString &value);
const QMap<QString, QString> defaults() const;
public:
settings();