Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Separate major companion versions - 2.1 part, copy settings the most recent prior installation found and store them separately, and install in OpenTX\Companion 2.1 to allow running both versions

Browse source
This commit is contained in:
Andre Bernet 2015-03-30 14:11:21 +04:00
parent 37ed485282
commit aa2542f9c0
3 changed files with 75 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

70
companion/src/appdata.cpp
View file

@ -20,7 +20,7 @@ AppData g;
// ** CompStoreObj class******************** // ** CompStoreObj class********************
void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3) void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3)
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (tag2.isEmpty()) if (tag2.isEmpty())
{ {
settings.remove(tag1); settings.remove(tag1);
@ -43,7 +43,7 @@ void CompStoreObj::clear (const QString tag1, const QString tag2, const QString
void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1, const QString group2 ) void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -56,7 +56,7 @@ void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QSt
void CompStoreObj::store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1, const QString group2 ) void CompStoreObj::store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -69,7 +69,7 @@ void CompStoreObj::store(const QStringList newSList, QStringList &stringList, co
void CompStoreObj::store(const QString newString, QString &string, const QString tag, const QString group1, const QString group2 ) void CompStoreObj::store(const QString newString, QString &string, const QString tag, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -82,7 +82,7 @@ void CompStoreObj::store(const QString newString, QString &string, const QString
void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, const QString group1, const QString group2 ) void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -95,7 +95,7 @@ void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, co
void CompStoreObj::store(const int newNumber, int &number, const QString tag, const QString group1, const QString group2 ) void CompStoreObj::store(const int newNumber, int &number, const QString tag, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -109,7 +109,7 @@ void CompStoreObj::store(const int newNumber, int &number, const QString tag, co
// Retrieval functions // Retrieval functions
void CompStoreObj::retrieve( QByteArray &array, const QString tag, const QString def, const QString group1, const QString group2 ) void CompStoreObj::retrieve( QByteArray &array, const QString tag, const QString def, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -121,7 +121,7 @@ void CompStoreObj::retrieve( QByteArray &array, const QString tag, const QString
void CompStoreObj::retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1, const QString group2 ) void CompStoreObj::retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -133,7 +133,7 @@ void CompStoreObj::retrieve( QStringList &stringList, const QString tag, const Q
void CompStoreObj::retrieve( QString &string, const QString tag, const QString def, const QString group1, const QString group2 ) void CompStoreObj::retrieve( QString &string, const QString tag, const QString def, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -145,7 +145,7 @@ void CompStoreObj::retrieve( QString &string, const QString tag, const QString d
void CompStoreObj::retrieve( bool &truth, const QString tag, const bool def, const QString group1, const QString group2 ) void CompStoreObj::retrieve( bool &truth, const QString tag, const bool def, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -157,7 +157,7 @@ void CompStoreObj::retrieve( bool &truth, const QString tag, const bool def, con
void CompStoreObj::retrieve( int &number, const QString tag, const int def, const QString group1, const QString group2 ) void CompStoreObj::retrieve( int &number, const QString tag, const int def, const QString group1, const QString group2 )
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
if (!group1.isEmpty()) settings.beginGroup(group1); if (!group1.isEmpty()) settings.beginGroup(group1);
if (!group2.isEmpty()) settings.beginGroup(group2); if (!group2.isEmpty()) settings.beginGroup(group2);
@ -241,7 +241,7 @@ JStickData::JStickData()
void JStickData::remove() void JStickData::remove()
{ {
// Remove all JStickData values from settings file // Remove all JStickData values from settings file
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
settings.beginGroup( "JsCalibration" ); settings.beginGroup( "JsCalibration" );
settings.remove( QString( "stick%1_axe").arg(index) ); settings.remove( QString( "stick%1_axe").arg(index) );
settings.remove( QString( "stick%1_min").arg(index) ); settings.remove( QString( "stick%1_min").arg(index) );
@ -256,7 +256,7 @@ void JStickData::remove()
bool JStickData::existsOnDisk() bool JStickData::existsOnDisk()
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
settings.beginGroup("JsCalibration"); settings.beginGroup("JsCalibration");
int axe = settings.value( QString("stick%1_axe").arg(index), -1 ).toInt(); int axe = settings.value( QString("stick%1_axe").arg(index), -1 ).toInt();
settings.endGroup(); settings.endGroup();
@ -377,7 +377,7 @@ Profile& Profile::operator=(const Profile& rhs)
void Profile::remove() void Profile::remove()
{ {
// Remove all profile values from settings file // Remove all profile values from settings file
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
settings.beginGroup("Profiles"); settings.beginGroup("Profiles");
settings.remove(QString("profile%1").arg(index)); settings.remove(QString("profile%1").arg(index));
settings.endGroup(); settings.endGroup();
@ -388,7 +388,7 @@ void Profile::remove()
bool Profile::existsOnDisk() bool Profile::existsOnDisk()
{ {
QSettings settings(PRODUCT, COMPANY); QSettings settings(COMPANY, PRODUCT);
settings.beginGroup("Profiles"); settings.beginGroup("Profiles");
settings.beginGroup(QString("profile%1").arg(index)); settings.beginGroup(QString("profile%1").arg(index));
QStringList keyList = settings.allKeys(); QStringList keyList = settings.allKeys();
@ -577,11 +577,43 @@ AppData::AppData()
for (int i=0; i<MAX_JOYSTICKS; i++) for (int i=0; i<MAX_JOYSTICKS; i++)
joystick[i].init( i ); joystick[i].init( i );
// Import settings from companion9x, but only do it one time. // Copy existing 2.0.16 settings if present
QSettings c9x_settings("companion9x", "companion9x"); QSettings settings(COMPANY, PRODUCT);
QSettings settings(PRODUCT, COMPANY); if (profile[0].name().isEmpty())
if (profile[0].name().isEmpty() )
{ {
QSettings settings20("OpenTX", "Companion 2.0");
QStringList keys = settings20.allKeys();
for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
{
settings.setValue(*i, settings20.value(*i));
}
//Reload profiles
for (int i=0; i<MAX_PROFILES; i++)
profile[i].init( i );
}
// Else copy existing <2.0.16 settings if present
if (profile[0].name().isEmpty())
{
QSettings pre2016settings("OpenTX", "OpenTX Companion");
QStringList keys = pre2016settings.allKeys();
for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
{
settings.setValue(*i, pre2016settings.value(*i));
}
//Reload profiles
for (int i=0; i<MAX_PROFILES; i++)
profile[i].init( i );
}
// Else import settings from companion9x if present
if (profile[0].name().isEmpty())
{
QSettings c9x_settings("companion9x", "companion9x");
// Copy all settings from companion9x to companion // Copy all settings from companion9x to companion
QStringList keys = c9x_settings.allKeys(); QStringList keys = c9x_settings.allKeys();
for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++) for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)

4
companion/src/appdata.h
View file

@ -24,8 +24,8 @@
#include <QString> #include <QString>
#include <QSettings> #include <QSettings>
#define COMPANY "OpenTX Companion" #define COMPANY "OpenTX"
#define PRODUCT "OpenTX" #define PRODUCT "Companion 2.1"
#define MAX_PROFILES 15 #define MAX_PROFILES 15
#define MAX_JOYSTICKS 8 #define MAX_JOYSTICKS 8

42
companion/targets/windows/companion-vs.nsi.in
View file

@ -12,14 +12,14 @@
;General ;General
;Name and file ;Name and file
Name "OpenTX Companion" Name "OpenTX Companion 2.1"
OutFile "companionInstall_@C9X_VERSION@.exe" OutFile "companionInstall_@C9X_VERSION@.exe"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES\OpenTX" InstallDir "$PROGRAMFILES\OpenTX\Companion 2.1"
;Get installation folder from registry if available ;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\OpenTX" "" InstallDirRegKey HKCU "Software\OpenTX\Companion 2.1" ""
;Compressor options ;Compressor options
SetCompressor /FINAL /SOLID lzma SetCompressor /FINAL /SOLID lzma
@ -66,7 +66,7 @@
;Start Menu Folder Page Configuration ;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenTX" !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenTX\Companion 2.1"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
@ -77,7 +77,7 @@
!define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED !define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch OpenTX Companion" !define MUI_FINISHPAGE_RUN_TEXT "Launch OpenTX Companion 2.1"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED # !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt # !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
@ -134,7 +134,7 @@ Section "OpenTX Companion" SecDummy
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
;Store installation folder ;Store installation folder
WriteRegStr HKCU "Software\OpenTX" "" $INSTDIR WriteRegStr HKCU "Software\OpenTX\Companion 2.1" "" $INSTDIR
;Associate with extentions ,bin and .hex ;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File" ${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
@ -147,20 +147,20 @@ Section "OpenTX Companion" SecDummy
WriteUninstaller "$INSTDIR\Uninstall.exe" WriteUninstaller "$INSTDIR\Uninstall.exe"
;Registry information for add/remove programs ;Registry information for add/remove programs
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayName" "OpenTX Companion" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1" "DisplayName" "OpenTX Companion 2.1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "DisplayIcon" "$\"$INSTDIR\companion.exe$\"" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1" "DisplayIcon" "$\"$INSTDIR\companion.exe$\""
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "Publisher" "OpenTX" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1" "Publisher" "OpenTX"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "URLInfoAbout" "http://www.open-tx.org" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1" "URLInfoAbout" "http://www.open-tx.org"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts ;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Companion 2.1.lnk" "$INSTDIR\companion.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\simulator.lnk" "$INSTDIR\simulator.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Firmware Simulator 2.1.lnk" "$INSTDIR\simulator.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall Companion 2.1.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
@ -207,8 +207,10 @@ Section "Uninstall"
Delete "$INSTDIR\Uninstall.exe" Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\lang\*.*" Delete "$INSTDIR\lang\*.*"
Delete "$INSTDIR\phonon_backend\*.*"
RMDir "$INSTDIR\lang" RMDir "$INSTDIR\lang"
RMDir "$INSTDIR\phonon_backend"
RMDir "$INSTDIR" RMDir "$INSTDIR"
${unregisterExtension} ".bin" "BIN File" ${unregisterExtension} ".bin" "BIN File"
@ -218,13 +220,13 @@ Section "Uninstall"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Companion 2.1.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\simulator.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Firmware Simulator 2.1.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall Companion 2.1.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder" RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKCU "Software\OpenTX" DeleteRegKey /ifempty HKCU "Software\OpenTX Companion 2.1"
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenTX Companion 2.1"
SectionEnd SectionEnd