rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correctly test if it's green edition

This commit is contained in:
royqh1979@gmail.com 2021-11-05 12:37:40 +08:00
parent 32e354b800
commit 6183542f34
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RedPandaIDE/settings.cpp
View File

@ -1128,7 +1128,7 @@ void Settings::Editor::doLoad()
//Font
//font
mFontName = stringValue("font_name","consolas");
mFontSize = intValue("font_size",QGuiApplication::font().pointSize());
mFontSize = intValue("font_size",14);
mFontOnlyMonospaced = boolValue("font_only_monospaced",true);
//gutter

4
RedPandaIDE/settingsdialog/environmentfileassociationwidget.cpp
View File

@ -145,9 +145,9 @@ bool FileAssociationModel::checkAssociation(const QString &extension, const QStr
QString keyString = QString("%1\\Shell\\%2\\Command").arg(filetype).arg(verb);
QString value1,value2;
if (!readRegistry(HKEY_CLASSES_ROOT,keyString.toLocal8Bit(),value1))
if (!readRegistry(HKEY_CLASSES_ROOT,keyString.toLocal8Bit(),"",value1))
return false;
if (!readRegistry(HKEY_CLASSES_ROOT,extension.toLocal8Bit(),value2))
if (!readRegistry(HKEY_CLASSES_ROOT,extension.toLocal8Bit(),"",value2))
return false;
return (value2 == filetype)

31
RedPandaIDE/utils.cpp
View File

@ -89,21 +89,26 @@ bool isTextAllAscii(const QString& text) {
}
static bool gIsGreenEdition = false;
static bool gIsGreenEdition = true;
static bool gIsGreenEditionInited = false;
bool isGreenEdition()
{
if (!gIsGreenEditionInited) {
QString keyString = QString("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\RedPanda-C++");
QString value1,value2;
if (!readRegistry(HKEY_LOCAL_MACHINE,keyString.toLocal8Bit(),value1))
return false;
QSettings settings("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\RedPanda-C++",
QSettings::NativeFormat);
QString regPath = extractFileDir(QFileInfo(settings.value("UninstallString").toString()).absolutePath());
QString value;
if (!readRegistry(HKEY_LOCAL_MACHINE,keyString.toLocal8Bit(),"UninstallString",value)) {
keyString = "SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\RedPanda-C++";
if (!readRegistry(HKEY_LOCAL_MACHINE,keyString.toLocal8Bit(),"UninstallString",value)) {
value="";
}
}
if (!value.isEmpty()) {
QString regPath = extractFileDir(value);
QString appPath = QApplication::instance()->applicationDirPath();
gIsGreenEdition = ( excludeTrailingPathDelimiter(regPath) != excludeTrailingPathDelimiter(appPath));
QString appPath = QApplication::instance()->applicationDirPath();
gIsGreenEdition = excludeTrailingPathDelimiter(regPath).compare(excludeTrailingPathDelimiter(appPath),
Qt::CaseInsensitive)!=0;
}
gIsGreenEditionInited = true;
}
return gIsGreenEdition;
@ -864,19 +869,19 @@ bool haveGoodContrast(const QColor& c1, const QColor &c2) {
return std::abs(lightness1 - lightness2)>=120;
}
bool readRegistry(HKEY key,QByteArray subKey, QString& value) {
bool readRegistry(HKEY key,const QByteArray& subKey, const QByteArray& name, QString& value) {
DWORD dataSize;
LONG result;
result = RegGetValueA(key,subKey,
"", RRF_RT_REG_SZ | RRF_RT_REG_MULTI_SZ,
name, RRF_RT_REG_SZ | RRF_RT_REG_MULTI_SZ,
NULL,
NULL,
&dataSize);
if (result!=ERROR_SUCCESS)
return false;
char * buffer = new char[dataSize+10];
result = RegGetValueA(HKEY_CLASSES_ROOT,subKey,
"", RRF_RT_REG_SZ | RRF_RT_REG_MULTI_SZ,
result = RegGetValueA(key,subKey,
name, RRF_RT_REG_SZ | RRF_RT_REG_MULTI_SZ,
NULL,
buffer,
&dataSize);

2
RedPandaIDE/utils.h
View File

@ -191,7 +191,7 @@ QString fromByteArray(const QByteArray& s);
int getNewFileNumber();
bool readRegistry(HKEY key,QByteArray subKey, QString& value);
bool readRegistry(HKEY key,const QByteArray& subKey, const QByteArray& name, QString& value);
class CppParser;
void resetCppParser(std::shared_ptr<CppParser> parser);