onkelbeh
/
fwbuilder
mirror of https://github.com/fwbuilder/fwbuilder
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Use firewallbuilder.org for QSettings/registry keys

This commit is contained in:
Sirius Bakke 2019-11-22 22:52:16 +01:00
parent a8802a3bc9
commit 1c807a3a9b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packaging/fwbuilder.nsi.in
View File

@ -46,7 +46,7 @@ FunctionEnd
;
; Get installation folder from registry if available
InstallDirRegKey HKLM Software\fwbuilder.github.io\${APPNAME}\${GENERATION} "Install_Dir"
InstallDirRegKey HKLM Software\firewallbuilder.org\${APPNAME}\${GENERATION} "Install_Dir"
;****************************************************************************
;Interface Settings
@ -55,7 +55,7 @@ FunctionEnd
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\fwbuilder.github.io\${APPNAME}\${GENERATION}"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\firewallbuilder.org\${APPNAME}\${GENERATION}"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
LicenseText "GNU GENERAL PUBLIC LICENSE"
@ -180,7 +180,7 @@ Section "FWBuilder (required)"
; Write the installation path into the registry
WriteRegStr HKLM Software\fwbuilder.github.io\${APPNAME}\${GENERATION} "Install_Dir" "$INSTDIR"
WriteRegStr HKLM Software\firewallbuilder.org\${APPNAME}\${GENERATION} "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "DisplayName" "Firewall Builder ${VERSION}"
@ -209,10 +209,10 @@ Section "FWBuilder (required)"
;
; ******** THESE KEYS MUST MATCH THOSE USED BY the class FWBSettings
;
ReadRegStr $0 HKCU "Software\fwbuilder.github.io\${APPNAME}\${GENERATION}\SSH" "SSHPath"
ReadRegStr $0 HKCU "Software\firewallbuilder.org\${APPNAME}\${GENERATION}\SSH" "SSHPath"
StrCmp $0 "" 0 +3
WriteRegStr HKCU "Software\fwbuilder.github.io\${APPNAME}\${GENERATION}\SSH" "SSHPath" "$INSTDIR\plink.exe"
WriteRegStr HKCU "Software\fwbuilder.github.io\${APPNAME}\${GENERATION}\SSH" "SCPPath" "$INSTDIR\pscp.exe"
WriteRegStr HKCU "Software\firewallbuilder.org\${APPNAME}\${GENERATION}\SSH" "SSHPath" "$INSTDIR\plink.exe"
WriteRegStr HKCU "Software\firewallbuilder.org\${APPNAME}\${GENERATION}\SSH" "SCPPath" "$INSTDIR\pscp.exe"
; ========================================================================
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
@ -243,13 +243,13 @@ Section "Uninstall"
; remove registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}"
DeleteRegKey HKLM "Software\fwbuilder.github.io\${APPNAME}\${GENERATION}"
DeleteRegKey /ifempty HKLM "Software\fwbuilder.github.io\${APPNAME}"
DeleteRegKey /ifempty HKLM "Software\fwbuilder.github.io"
DeleteRegKey HKLM "Software\firewallbuilder.org\${APPNAME}\${GENERATION}"
DeleteRegKey /ifempty HKLM "Software\firewallbuilder.org\${APPNAME}"
DeleteRegKey /ifempty HKLM "Software\firewallbuilder.org"
DeleteRegKey HKCU "Software\fwbuilder.github.io\${APPNAME}\${GENERATION}"
DeleteRegKey /ifempty HKCU "Software\fwbuilder.github.io\${APPNAME}"
DeleteRegKey /ifempty HKCU "Software\fwbuilder.github.io"
DeleteRegKey HKCU "Software\firewallbuilder.org\${APPNAME}\${GENERATION}"
DeleteRegKey /ifempty HKCU "Software\firewallbuilder.org\${APPNAME}"
DeleteRegKey /ifempty HKCU "Software\firewallbuilder.org"
DeleteRegKey HKCR ".fwb"
DeleteRegKey HKCR ".fwl"

6
src/libgui/FWBSettings.cpp
View File

@ -110,7 +110,7 @@ const char* iconsInRulesSize = SETTINGS_PATH_PREFIX "/UI/Icons/IconsInRulesSize"
const char* rulesFont = SETTINGS_PATH_PREFIX "/UI/Fonts/RulesFont";
const char* treeFont = SETTINGS_PATH_PREFIX "/UI/Fonts/TreeFont";
const char* uiFont = SETTINGS_PATH_PREFIX "/UI/Fonts/UiFont";
const char* compilerOutputFont =
const char* compilerOutputFont =
SETTINGS_PATH_PREFIX "/UI/Fonts/CompilerOutputFont";
const char* clipComment = SETTINGS_PATH_PREFIX "/UI/ClipComment";
const char* checkUpdates = SETTINGS_PATH_PREFIX "/UI/CheckUpdates";
@ -147,7 +147,7 @@ const char* SSHTimeout = SETTINGS_PATH_PREFIX "/SSH/SSHTimeout";
const char * displayUnmodifiedRules = SETTINGS_PATH_PREFIX "/Diff/displayUnmodifiedRules";
const QString FWBSettings::ApplicationName = QStringLiteral("FirewallBuilder");
const QString FWBSettings::OrganizationName = QStringLiteral("fwbuilder.github.io");
const QString FWBSettings::OrganizationName = QStringLiteral("firewallbuilder.org");
/**
* Settings path defined here should match Windows registry paths used
@ -211,7 +211,7 @@ void FWBSettings::init(bool force_first_time_run)
} else
{
ok = uuid_settings->contains(appGUID_4_0);
if (ok)
if (ok)
{
uuid_settings->setValue(
appGUID, uuid_settings->value(appGUID_4_0).toString());