piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next

Browse Source 
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/main.cpp
	companion/src/modeledit.cpp
	companion/src/xsimulatordialog.cpp
This commit is contained in:
Bertrand Songis
2014-01-15 16:09:17 +01:00
parent 02f75dedd9 9cc9e115a4
commit e7dc6644c7
76 changed files with 4784 additions and 4176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/CMakeLists.txt
+48 -43
View File
@@ -1,4 +1,4 @@
PROJECT( companion9x )
PROJECT( companion )
SET( C9X_VERSION_MAJOR "1" )
SET( C9X_VERSION_MINOR "51" )
@@ -111,7 +111,7 @@ add_custom_command(
add_subdirectory(modeledit)
SET( companion9x_SRCS
SET( companion_SRCS
eeprominterface.cpp
hexinterface.cpp
flashinterface.cpp
@@ -164,7 +164,7 @@ SET( companion9x_SRCS
qcustomplot.cpp
)
SET( companion9x_MOC_HDRS
SET( companion_MOC_HDRS
avroutputdialog.h
preferencesdialog.h
burnconfigdialog.h
@@ -194,7 +194,7 @@ SET( companion9x_MOC_HDRS
helpers.h
)
SET( companion9x_UIS
SET( companion_UIS
mdichild.ui
avroutputdialog.ui
comparedialog.ui
@@ -215,25 +215,25 @@ SET( companion9x_UIS
)
IF ( SDL_FOUND )
SET( companion9x_SRCS
${companion9x_SRCS}
SET( companion_SRCS
${companion_SRCS}
joystick.cpp
joystickdialog.cpp
)
SET( companion9x_MOC_HDRS
${companion9x_MOC_HDRS}
SET( companion_MOC_HDRS
${companion_MOC_HDRS}
joystick.h
joystickdialog.h
)
SET( companion9x_UIS
${companion9x_UIS}
SET( companion_UIS
${companion_UIS}
joystickdialog.ui
)
ENDIF( )
SET( companion9x_RCS
SET( companion_RCS
companion9x.qrc
${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
)
@@ -276,7 +276,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${
SET( PATCH_FLAGS "--binary" )
IF( WIN32 )
SET( companion9x_SRCS ${companion9x_SRCS} icon.rc )
SET( companion_SRCS ${companion_SRCS} icon.rc )
IF ( NOT MSVC )
SET(CMAKE_EXE_LINKER_FLAGS -mwindows)
ENDIF( )
@@ -288,28 +288,33 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
SET( LANGUAGES he pt ru de fr it sv cs )
FOREACH( language ${LANGUAGES} )
SET( companion9x_TS ${companion9x_TS} translations/companion9x_${language}.ts )
SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
ENDFOREACH( language )
QT4_WRAP_UI( companion9x_SRCS ${companion9x_UIS} )
QT4_WRAP_CPP( companion9x_SRCS ${companion9x_MOC_HDRS} )
QT4_ADD_TRANSLATION( companion9x_QM ${companion9x_TS} )
QT4_ADD_RESOURCES( companion9x_SRCS ${companion9x_RCS} )
QT4_WRAP_UI( companion_SRCS ${companion_UIS} )
QT4_WRAP_CPP( companion_SRCS ${companion_MOC_HDRS} )
QT4_ADD_TRANSLATION( companion_QM ${companion_TS} )
QT4_ADD_RESOURCES( companion_SRCS ${companion_RCS} )
ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" )
IF( APPLE )
ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion9x_SRCS} ${companion9x_QM} )
ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} )
ELSE( )
ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion9x_SRCS} ${companion9x_QM} )
ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
ENDIF( )
TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
INSTALL( FILES companion9x.desktop DESTINATION share/applications )
INSTALL( FILES companion9x.png DESTINATION share/icons )
INSTALL( FILES companion.desktop DESTINATION share/applications )
INSTALL( FILES images/linuxicons/32x32/companion.png DESTINATION /usr/share/icons/hicolor/32x32/apps )
INSTALL( FILES images/linuxicons/48x48/companion.png DESTINATION /usr/share/icons/hicolor/48x48/apps )
INSTALL( FILES images/linuxicons/128x128/companion.png DESTINATION /usr/share/icons/hicolor/128x128/apps )
INSTALL( FILES images/linuxicons/256x256/companion.png DESTINATION /usr/share/icons/hicolor/256x256/apps )
INSTALL( FILES images/linuxicons/512x512/companion.png DESTINATION /usr/share/icons/hicolor/512x512/apps )
INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps )
INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ )
# Linux specific code
SET(OperatingSystem "Linux")
@@ -319,13 +324,13 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
IF( WIN32 )
IF( MSVC )
SET( NSI_IN_FILE companion9x-vs.nsi.in )
SET( NSI_IN_FILE companion-vs.nsi.in )
ELSE( )
SET( NSI_IN_FILE companion9x-msys.nsi.in )
SET( NSI_IN_FILE companion-msys.nsi.in )
ENDIF( )
SET( SYSDIR "$ENV{windir}/system32" )
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion9x.nsi @ONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)
FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
"C:/Program Files/NSIS"
@@ -333,14 +338,14 @@ IF( WIN32 )
"C:/Programs/NSIS"
)
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion9xInstall.exe
COMMAND "${NSIS_EXE}" ARGS companion9x.nsi
DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion9x.nsi
ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
COMMAND "${NSIS_EXE}" ARGS companion.nsi
DEPENDS ${PROJECT_NAME} ${PROJECT_BINARY_DIR}/companion.nsi
COMMENT "Windows NSIS Installer")
ADD_CUSTOM_TARGET( installer
DEPENDS ${PROJECT_BINARY_DIR}/companion9xInstall.exe
SOURCES ${PROJECT_BINARY_DIR}/companion9x.nsi)
DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
SOURCES ${PROJECT_BINARY_DIR}/companion.nsi)
ENDIF( )
IF( APPLE )
@@ -352,36 +357,36 @@ IF( APPLE )
ENDIF()
ADD_CUSTOM_TARGET( addframeworks ALL
COMMAND mkdir -p companion9x.app/Contents/Frameworks
COMMAND mkdir -p companion9x.app/Contents/Resources
COMMAND mkdir -p companion9x.app/Contents/translations
COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion9x.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/lib* companion9x.app/Contents/Frameworks
#COMMAND rsync ${PROJECT_SOURCE_DIR}/../macbuild/libcrypto.1.0.0.dylib companion9x.app/Contents/Frameworks
COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../macbuild/qt_menu.nib companion9x.app/Contents/Resources/
COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion9x.app/Contents/translations
COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app
COMMAND mkdir -p companion.app/Contents/Frameworks
COMMAND mkdir -p companion.app/Contents/Resources
COMMAND mkdir -p companion.app/Contents/translations
COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks
#COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
WORKING_DIRECTORY ${WORK_DIR}
DEPENDS ${PROJECT_NAME} )
ADD_CUSTOM_TARGET( makedmg
COMMAND ${QT_BINARY_DIR}/macdeployqt companion9x.app -dmg -no-plugins
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
WORKING_DIRECTORY ${WORK_DIR}
DEPENDS addframeworks )
ENDIF( )
ADD_CUSTOM_TARGET( stamp
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion9x.stamp
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp
DEPENDS ${CMAKE_BINARY_DIR}/version.h )
ADD_CUSTOM_TARGET( translations
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion9x_TS} )
COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
SET(CPACK_PACKAGE_NAME "COMPANION9X")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "EEPROM Editor for the openTx open source firmware")
SET(CPACK_PACKAGE_NAME "COMPANION")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
if(DPKG_PROGRAM)
companion/src/avroutputdialog.cpp
+8 -8
View File
@@ -58,7 +58,7 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg,
QFile exec;
winTitle=wTitle;
if (!(exec.exists(prog))) {
QMessageBox::critical(this, "companion9x", getProgrammer() + " " + tr("executable not found"));
QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("executable not found"));
closeOpt = AVR_DIALOG_FORCE_CLOSE;
QTimer::singleShot(0, this, SLOT(forceClose()));
} else {
@@ -315,10 +315,10 @@ void avrOutputDialog::errorWizard()
}
}
if (fwexist==false) {
QMessageBox::warning(this, "companion9x - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr));
QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr));
} else {
FirmwareInfo *firmware = GetCurrentFirmware();
QMessageBox::warning(this, "companion9x - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name));
QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->name));
}
}
}
@@ -416,24 +416,24 @@ void avrOutputDialog::doFinished(int code=0)
if (hasErrors || code) {
if (!cmdLine.isEmpty()) {
if (getProgrammer()!="AVRDUDE") {
QMessageBox::critical(this, "companion9x", getProgrammer() + " " + tr("did not finish correctly"));
QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly"));
} else {
int res = QMessageBox::question(this, "companion9x",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No);
int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No);
if (res != QMessageBox::No) {
errorWizard();
}
}
} else {
QMessageBox::critical(this, "companion9x", tr("Copy did not finish correctly"));
QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly"));
}
// reject();
} else {
if (!cmdLine.isEmpty()) {
ui->progressBar->setValue(100);
QMessageBox::information(this, "companion9x", getProgrammer() + " " + tr("finished correctly"));
QMessageBox::information(this, "Companion", getProgrammer() + " " + tr("finished correctly"));
accept();
} else {
QMessageBox::information(this, "companion9x", tr("Copy finished correctly"));
QMessageBox::information(this, "Companion", tr("Copy finished correctly"));
accept();
}
}
companion/src/burnconfigdialog.cpp
+2 -2
View File
@@ -325,7 +325,7 @@ void burnConfigDialog::restFuses(bool eeProtect)
QMessageBox::StandardButton ret = QMessageBox::No;
ret = QMessageBox::warning(this, tr("companion9x"),
ret = QMessageBox::warning(this, tr("Companion"),
tr("<b><u>WARNING!</u></b><br>This will reset the fuses of %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue?").arg(avrMCU),
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes)
@@ -394,7 +394,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
} else {
ui->label_av3->show();
ui->avrdude_mcu->show();
QMessageBox::warning(this, tr("companion9x"),
QMessageBox::warning(this, tr("Companion"),
tr("<b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent."),
QMessageBox::Ok);
}
companion/src/burndialog.cpp
+3 -3
View File
@@ -292,7 +292,7 @@ bool burnDialog::checkeEprom(QString fileName)
uint8_t eeprom[EESIZE_RLC_MAX];
int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
if (!eeprom_size) {
int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
if (res == QMessageBox::No) {
return false;
}
@@ -302,7 +302,7 @@ bool burnDialog::checkeEprom(QString fileName)
}
file.close();
if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
if (res == QMessageBox::No) {
return false;
}
@@ -325,7 +325,7 @@ bool burnDialog::checkeEprom(QString fileName)
return false;
}
if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
int res = QMessageBox::question(this, "companion9x",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
if (res == QMessageBox::No) {
return false;
}
companion/src/burndialog.ui
+1 -1
View File
@@ -273,7 +273,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>Allows companion9x to write to older version of the firmware</string>
<string>Allows Companion to write to older version of the firmware</string>
</property>
<property name="text">
<string>Check Firmware compatibility</string>
companion/src/companion.desktop
+11
View File
@@ -0,0 +1,11 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=Companion
GenericName=Transmitter Companion App
Comment=The Ultimate Transmitter Companion
Icon=companion
Exec='companion'
Terminal=false
StartupNotify=false
Categories=Application
companion/src/companion9x.desktop
-11
View File
@@ -1,11 +0,0 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=companion9x
GenericName=COMPANION9X
Comment=9x EeProm Editor
Icon=/usr/share/icons/companion9x.png
Exec='companion9x'
Terminal=false
StartupNotify=false
Categories=Application
companion/src/companion9x.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

companion/src/companion9x.qrc
+1 -1
View File
@@ -48,7 +48,7 @@
<file>images/screenshot.png</file>
<file>images/splash.png</file>
<file>images/splasht.png</file>
<file>images/companion9x-title.png</file>
<file>images/companion-title.png</file>
<file>images/read_eeprom.png</file>
<file>images/write_eeprom.png</file>
<file>images/write_flash.png</file>
companion/src/contributorsdialog.cpp
+3 -2
View File
@@ -26,7 +26,8 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
ui->textBrowser->insertPlainText(file2.readAll());
}
ui->textBrowser->insertPlainText("\n\n\n");
ui->textBrowser->insertPlainText(tr("Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and it's fantastic eePe, from which\ncompanion9x was forked out."));
ui->textBrowser->insertPlainText(tr(
"Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x) \nof course. Also to Erez Raviv (er9x) and the fantastic eePe program \nwhich was the staring point for OpenTX Companion."));
ui->textBrowser->insertPlainText("\n\n");
ui->textBrowser->insertPlainText(tr("Thank you all !!!"));
ui->textBrowser->setReadOnly(true);
@@ -42,7 +43,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
}
ui->textBrowser->setReadOnly(true);
ui->textBrowser->verticalScrollBar()->setValue(0);
this->setWindowTitle(tr("Companion9x Release Notes"));
this->setWindowTitle(tr("Companion Release Notes"));
}
break;
case 2:{
companion/src/downloaddialog.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt) :
file = new QFile(tgt);
if (!file->open(QIODevice::WriteOnly)) {
QMessageBox::critical(this, "companion9x",
QMessageBox::critical(this, "Companion",
tr("Unable to save the file %1: %2.")
.arg(tgt).arg(file->errorString()));
QTimer::singleShot(0, this, SLOT(fileError()));
@@ -51,7 +51,7 @@ void downloadDialog::httpFinished()
if (reply->error())
{
file->remove();
QMessageBox::information(this, tr("companion9x"),
QMessageBox::information(this, tr("Companion"),
tr("Download failed: %1.")
.arg(reply->errorString()));
ok = false;
companion/src/generaledit.cpp
+3 -3
View File
@@ -1026,7 +1026,7 @@ void GeneralEdit::on_blinvert_cb_stateChanged(int )
void GeneralEdit::on_faimode_CB_stateChanged(int )
{
if (ui->faimode_CB->isChecked()) {
int ret = QMessageBox::question(this, "companion9x",
int ret = QMessageBox::question(this, "Companion",
tr("If you enable FAI, you loose the vario, the play functions, the telemetry screen.\nThis function cannot be disabled by the radio.\nAre you sure ?") ,
QMessageBox::Yes | QMessageBox::No);
if (ret==QMessageBox::Yes) {
@@ -1327,7 +1327,7 @@ void GeneralEdit::on_calstore_PB_clicked()
} else {
QString calib=settings.value("StickPotCalib","").toString();
if (!(calib.isEmpty())) {
int ret = QMessageBox::question(this, "companion9x",
int ret = QMessageBox::question(this, "Companion",
tr("Do you want to store calibration in %1 profile<br>overwriting existing calibration?").arg(name) ,
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::No) {
@@ -1360,7 +1360,7 @@ void GeneralEdit::on_calstore_PB_clicked()
settings.setValue("countryCode",QString("%1%2%3").arg((uint8_t)g_eeGeneral.countryCode, 2, 16, QChar('0')).arg((uint8_t)g_eeGeneral.imperial, 2, 16, QChar('0')).arg(g_eeGeneral.ttsLanguage));
settings.endGroup();
settings.endGroup();
QMessageBox::information(this, "companion9x", tr("Calibration and HW parameters saved."));
QMessageBox::information(this, "Companion", tr("Calibration and HW parameters saved."));
}
}
companion/src/icon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 274 KiB

companion/src/icon.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

companion/src/icon.svg
-157
View File
@@ -1,157 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48px"
height="48px"
id="svg3050"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 6">
<defs
id="defs3052" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7"
inkscape:cx="24"
inkscape:cy="24"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="479"
inkscape:window-height="590"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0" />
<metadata
id="metadata3055">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<image
y="6.811959e-08"
x="4.108463e-07"
id="image3120"
xlink:href="data:image/png;base64,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
"
height="48"
width="48" />
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

companion/src/images/9CX.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 111 KiB

companion/src/images/9xdb-bl.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

companion/src/images/9xdb-gr.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

companion/src/images/9xdb-or.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

companion/src/images/9xdb-rd.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

companion/src/images/9xdb-yl.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

companion/src/images/9xdb.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

companion/src/images/companion-title.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

companion/src/images/companion9x-title.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

companion/src/images/customize.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 381 B

companion/src/images/iconmac.icns
BIN
View File
Binary file not shown.
companion/src/images/linuxicons/128x128/companion.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

companion/src/images/linuxicons/256x256/companion.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

companion/src/images/linuxicons/32x32/companion.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

companion/src/images/linuxicons/48x48/companion.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

companion/src/images/linuxicons/512x512/companion.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 39 KiB

companion/src/images/linuxicons/scalable/companion.svg
+104
View File
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.2" width="190mm" height="190mm" viewBox="0 0 19000 19000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" clip-path="url(#presentation_clip_path)" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
<defs class="ClipPathGroup">
<clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
<rect x="0" y="0" width="19000" height="19000"/>
</clipPath>
</defs>
<defs class="TextShapeIndex">
<g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"/>
</defs>
<defs class="EmbeddedBulletChars">
<g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
</g>
<g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
</g>
<g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
</g>
<g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
</g>
<g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
</g>
<g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
</g>
<g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
</g>
<g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
</g>
<g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
</g>
</defs>
<defs class="TextEmbeddedBitmaps"/>
<g>
<g id="id2" class="Master_Slide">
<g id="bg-id2" class="Background"/>
<g id="bo-id2" class="BackgroundObjects"/>
</g>
</g>
<g class="SlideGroup">
<g>
<g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
<g class="Page">
<g class="Group">
<g class="com.sun.star.drawing.CustomShape">
<g id="id3">
<path fill="rgb(0,0,0)" stroke="none" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
<path fill="none" stroke="rgb(0,0,0)" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
</g>
</g>
<g class="com.sun.star.drawing.PolyPolygonShape">
<g id="id4">
<path fill="rgb(255,255,255)" stroke="none" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
<path fill="none" stroke="rgb(255,255,255)" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
<text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="3228" y="10021"><tspan fill="rgb(0,0,0)" stroke="none"> </tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.PolyPolygonShape">
<g id="id5">
<path fill="rgb(51,102,51)" stroke="none" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
<path fill="none" stroke="rgb(51,102,51)" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id6">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="2540px" font-weight="700"><tspan class="TextPosition" x="1201" y="17891"><tspan fill="rgb(255,255,255)" stroke="none">COMPANION</tspan></tspan></tspan></text>
</g>
</g>
<g class="Group">
<g class="com.sun.star.drawing.TextShape">
<g id="id7">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="1391" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">O</tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id8">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="6282" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">P</tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id9">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="10696" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">E</tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id10">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="14950" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">N</tspan></tspan></tspan></text>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

companion/src/images/originals/9CX.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/9xdb-bl.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/9xdb-gr.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/9xdb-or.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/9xdb-rd.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/9xdb-yl.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/9xdb.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/companion9x-title.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/customize.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/splash.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/splasht.xcf
BIN
View File
Binary file not shown.
companion/src/images/originals/vector-logo.odg
BIN
View File
Binary file not shown.
companion/src/images/originals/vector-logo.svg
+104
View File
@@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.2" width="190mm" height="190mm" viewBox="0 0 19000 19000" preserveAspectRatio="xMidYMid" fill-rule="evenodd" clip-path="url(#presentation_clip_path)" stroke-width="28.222" stroke-linejoin="round" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
<defs class="ClipPathGroup">
<clipPath id="presentation_clip_path" clipPathUnits="userSpaceOnUse">
<rect x="0" y="0" width="19000" height="19000"/>
</clipPath>
</defs>
<defs class="TextShapeIndex">
<g ooo:slide="id1" ooo:id-list="id3 id4 id5 id6 id7 id8 id9 id10"/>
</defs>
<defs class="EmbeddedBulletChars">
<g id="bullet-char-template(57356)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 580,1141 L 1163,571 580,0 -4,571 580,1141 Z"/>
</g>
<g id="bullet-char-template(57354)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 8,1128 L 1137,1128 1137,0 8,0 8,1128 Z"/>
</g>
<g id="bullet-char-template(10146)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 174,0 L 602,739 174,1481 1456,739 174,0 Z M 1358,739 L 309,1346 659,739 1358,739 Z"/>
</g>
<g id="bullet-char-template(10132)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 2015,739 L 1276,0 717,0 1260,543 174,543 174,936 1260,936 717,1481 1274,1481 2015,739 Z"/>
</g>
<g id="bullet-char-template(10007)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 0,-2 C -7,14 -16,27 -25,37 L 356,567 C 262,823 215,952 215,954 215,979 228,992 255,992 264,992 276,990 289,987 310,991 331,999 354,1012 L 381,999 492,748 772,1049 836,1024 860,1049 C 881,1039 901,1025 922,1006 886,937 835,863 770,784 769,783 710,716 594,584 L 774,223 C 774,196 753,168 711,139 L 727,119 C 717,90 699,76 672,76 641,76 570,178 457,381 L 164,-76 C 142,-110 111,-127 72,-127 30,-127 9,-110 8,-76 1,-67 -2,-52 -2,-32 -2,-23 -1,-13 0,-2 Z"/>
</g>
<g id="bullet-char-template(10004)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 285,-33 C 182,-33 111,30 74,156 52,228 41,333 41,471 41,549 55,616 82,672 116,743 169,778 240,778 293,778 328,747 346,684 L 369,508 C 377,444 397,411 428,410 L 1163,1116 C 1174,1127 1196,1133 1229,1133 1271,1133 1292,1118 1292,1087 L 1292,965 C 1292,929 1282,901 1262,881 L 442,47 C 390,-6 338,-33 285,-33 Z"/>
</g>
<g id="bullet-char-template(9679)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 813,0 C 632,0 489,54 383,161 276,268 223,411 223,592 223,773 276,916 383,1023 489,1130 632,1184 813,1184 992,1184 1136,1130 1245,1023 1353,916 1407,772 1407,592 1407,412 1353,268 1245,161 1136,54 992,0 813,0 Z"/>
</g>
<g id="bullet-char-template(8226)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M 346,457 C 273,457 209,483 155,535 101,586 74,649 74,723 74,796 101,859 155,911 209,963 273,989 346,989 419,989 480,963 531,910 582,859 608,796 608,723 608,648 583,586 532,535 482,483 420,457 346,457 Z"/>
</g>
<g id="bullet-char-template(8211)" transform="scale(0.00048828125,-0.00048828125)">
<path d="M -4,459 L 1135,459 1135,606 -4,606 -4,459 Z"/>
</g>
</defs>
<defs class="TextEmbeddedBitmaps"/>
<g>
<g id="id2" class="Master_Slide">
<g id="bg-id2" class="Background"/>
<g id="bo-id2" class="BackgroundObjects"/>
</g>
</g>
<g class="SlideGroup">
<g>
<g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
<g class="Page">
<g class="Group">
<g class="com.sun.star.drawing.CustomShape">
<g id="id3">
<path fill="rgb(0,0,0)" stroke="none" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
<path fill="none" stroke="rgb(0,0,0)" d="M 9500,19000 L 0,19000 0,0 19000,0 19000,19000 9500,19000 Z"/>
</g>
</g>
<g class="com.sun.star.drawing.PolyPolygonShape">
<g id="id4">
<path fill="rgb(255,255,255)" stroke="none" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
<path fill="none" stroke="rgb(255,255,255)" d="M 1500,4800 L 7800,4800 7800,6800 5800,6800 5800,14800 3500,14800 3500,6800 1500,6800 1500,6000 1500,4800 Z"/>
<text class="TextShape"><tspan class="TextParagraph" font-family="Liberation Sans, sans-serif" font-size="635px" font-weight="400"><tspan class="TextPosition" x="3228" y="10021"><tspan fill="rgb(0,0,0)" stroke="none"> </tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.PolyPolygonShape">
<g id="id5">
<path fill="rgb(51,102,51)" stroke="none" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
<path fill="none" stroke="rgb(51,102,51)" d="M 17400,4800 L 14800,4800 13000,7900 11100,4800 8500,4800 11500,9800 8400,14800 10900,14800 13000,11500 15000,14800 17600,14800 14400,9800 17400,4800 Z"/>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id6">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="2540px" font-weight="700"><tspan class="TextPosition" x="1201" y="17891"><tspan fill="rgb(255,255,255)" stroke="none">COMPANION</tspan></tspan></tspan></text>
</g>
</g>
<g class="Group">
<g class="com.sun.star.drawing.TextShape">
<g id="id7">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="1391" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">O</tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id8">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="6282" y="3521"><tspan fill="rgb(255,255,255)" stroke="none">P</tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id9">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="10696" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">E</tspan></tspan></tspan></text>
</g>
</g>
<g class="com.sun.star.drawing.TextShape">
<g id="id10">
<text class="TextShape"><tspan class="TextParagraph" font-family="Ubuntu Medium" font-size="3104px" font-weight="700"><tspan class="TextPosition" x="14950" y="3586"><tspan fill="rgb(255,255,255)" stroke="none">N</tspan></tspan></tspan></text>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

companion/src/images/originals/windows-icon.xcf
BIN
View File
Binary file not shown.
companion/src/images/splash-2012.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 394 KiB

companion/src/images/splash-2013.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 378 KiB

companion/src/images/splash-ambroise.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 39 KiB

companion/src/images/splash-hb.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 167 KiB

companion/src/images/splash-old.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 42 KiB

companion/src/images/splash.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 67 KiB

companion/src/images/splasht.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 102 KiB

companion/src/logsdialog.cpp
+1 -1
View File
@@ -687,7 +687,7 @@ bool logsDialog::cvsFileParse()
file.close();
if (errors>1) {
QMessageBox::warning(this, "companion9x", tr("The selected logfile contains %1 invalid lines out of %2 total lines").arg(errors).arg(lines));
QMessageBox::warning(this, "Companion", tr("The selected logfile contains %1 invalid lines out of %2 total lines").arg(errors).arg(lines));
}
plotLock=true;
int n=csvlog.count();
companion/src/logsdialog.ui
+1 -1
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Companion9x log viewer</string>
<string>Companion Log Viewer</string>
</property>
<property name="windowIcon">
<iconset resource="companion9x.qrc">
companion/src/main.cpp
+15 -15
View File
@@ -77,10 +77,10 @@ class MyProxyStyle : public QProxyStyle
int main(int argc, char *argv[])
{
Q_INIT_RESOURCE(companion9x);
QApplication * app = new QApplication(argc, argv);
app->setApplicationName("Companion9x");
QApplication app(argc, argv);
app.setApplicationName("OpenTX Companion");
#ifdef __APPLE__
app->setStyle(new MyProxyStyle);
app.setStyle(new MyProxyStyle);
#endif
QString dir;
if(argc) dir = QFileInfo(argv[0]).canonicalPath() + "/lang";
@@ -89,26 +89,26 @@ int main(int argc, char *argv[])
QString locale = settings.value("locale",QLocale::system().name()).toString();
bool showSplash = settings.value("show_splash", true).toBool();
QTranslator companion9xTranslator;
companion9xTranslator.load(":/companion9x_" + locale);
QTranslator companionTranslator;
companionTranslator.load(":/companion_" + locale);
QTranslator qtTranslator;
qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
// qDebug() << locale;
// qtTranslator.load("qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app->installTranslator(&companion9xTranslator);
app->installTranslator(&qtTranslator);
app.installTranslator(&companionTranslator);
app.installTranslator(&qtTranslator);
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
QString firmware_id = settings.value("firmware", default_firmware_variant.id).toString();
firmware_id.replace("open9x", "opentx");
firmware_id.replace("x9da", "taranis");
QPixmap * pixmap;
QPixmap pixmap;
if (firmware_id.contains("taranis"))
pixmap = new QPixmap(":/images/splasht.png");
pixmap = QPixmap(":/images/splasht.png");
else
pixmap = new QPixmap(":/images/splash.png");
QSplashScreen *splash = new QSplashScreen(*pixmap);
pixmap = QPixmap(":/images/splash.png");
QSplashScreen *splash = new QSplashScreen(pixmap);
RegisterFirmwares();
@@ -116,15 +116,15 @@ int main(int argc, char *argv[])
current_firmware_variant = GetFirmwareVariant(firmware_id);
// qDebug() << current_firmware_variant;
MainWindow * mainWin = new MainWindow();
MainWindow mainWin;
if (showSplash) {
splash->show();
QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close()));
QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show()));
QTimer::singleShot(1000*SPLASH_TIME, &mainWin, SLOT(show()));
}
else {
mainWin->show();
mainWin.show();
}
return app->exec();
return app.exec();
}
companion/src/mainwindow.cpp
+42 -40
View File
@@ -103,9 +103,9 @@ downloadDialog_forWait(NULL)
readSettings();
FirmwareInfo *firmware = GetCurrentFirmware();
if (ActiveProfile) {
setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
} else {
setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
}
setUnifiedTitleAndToolBarOnMac(true);
this->setWindowIcon(QIcon(":/icon.png"));
@@ -172,11 +172,11 @@ void MainWindow::displayWarnings()
if (warnId<WARNING_ID && warnId!=0) {
int res=0;
if (WARNING_LEVEL>0) {
QMessageBox::warning(this, "companion9x", WARNING);
res = QMessageBox::question(this, "companion9x",tr("Display previous warning again at startup ?"),QMessageBox::Yes | QMessageBox::No);
QMessageBox::warning(this, "Companion", WARNING);
res = QMessageBox::question(this, "Companion",tr("Display previous warning again at startup ?"),QMessageBox::Yes | QMessageBox::No);
} else {
QMessageBox::about(this, "companion9x", WARNING);
res = QMessageBox::question(this, "companion9x",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No);
QMessageBox::about(this, "Companion", WARNING);
res = QMessageBox::question(this, "Companion",tr("Display previous message again at startup ?"),QMessageBox::Yes | QMessageBox::No);
}
if (res == QMessageBox::No) {
settings.setValue("warningId", WARNING_ID);
@@ -249,7 +249,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
QString version = qba.mid(i+14, 4);
if (version.isNull()) {
QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
return;
}
double vnum=version.toDouble();
@@ -263,7 +263,7 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
if (c9xver< vnum) {
#if defined WIN32 || !defined __GNUC__ // || defined __APPLE__ // OSX should only notify of updates since no update packages are available.
showcheckForUpdatesResult = false; // update is available - do not show dialog
int ret = QMessageBox::question(this, "companion9x", tr("A new version of companion9x is available (version %1)<br>"
int ret = QMessageBox::question(this, "Companion", tr("A new version of Companion is available (version %1)<br>"
"Would you like to download it?").arg(version) ,
QMessageBox::Yes | QMessageBox::No);
@@ -284,21 +284,21 @@ void MainWindow::checkForUpdateFinished(QNetworkReply * reply)
}
}
#else
QMessageBox::warning(this, tr("New release available"), tr("A new release of companion is available please check the repository"));
QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available please check the repository"));
#endif
} else {
if (showcheckForUpdatesResult && check1done && check2done)
QMessageBox::information(this, "companion9x", tr("No updates available at this time."));
QMessageBox::information(this, "Companion", tr("No updates available at this time."));
}
} else {
if(check1done && check2done)
QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
}
}
void MainWindow::updateDownloaded()
{
int ret = QMessageBox::question(this, "companion9x", tr("Would you like to launch the installer?") ,
int ret = QMessageBox::question(this, "Companion", tr("Would you like to launch the installer?") ,
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
if(QDesktopServices::openUrl(QUrl::fromLocalFile(installer_fileName)))
@@ -362,7 +362,7 @@ void MainWindow::reply1Accepted()
errormsg=tr("Compilation server too busy, try later");
break;
case 4:
errormsg=tr("Compilation server requires registration, please check opentx web site");
errormsg=tr("Compilation server requires registration, please check OpenTX web site");
break;
default:
errormsg=tr("Unknown server failure, try later");
@@ -402,7 +402,7 @@ void MainWindow::reply1Accepted()
errormsg=tr("Compilation server too busy, try later");
break;
case 4:
errormsg=tr("Compilation server requires registration, please check opentx web site");
errormsg=tr("Compilation server requires registration, please check OpenTX web site");
break;
default:
errormsg=tr("Unknown server failure, try later");
@@ -433,7 +433,7 @@ void MainWindow::reply1Accepted()
}
settings.setValue(downloadedFW, currentFWrev);
if (autoflash) {
int ret = QMessageBox::question(this, "companion9x", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No);
int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the transmitter now ?"), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
burnToFlash(downloadedFWFilename);
}
@@ -470,7 +470,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
QString newrev=qba.mid(k).replace('"', "").trimmed();
if(!cres) {
QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
int server = settings.value("fwserver",0).toInt();
server++;
settings.setValue("fwserver",server);
@@ -490,6 +490,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
showcheckForUpdatesResult = false; // update is available - do not show dialog
QString rn = GetFirmware(fwToUpdate)->rnurl;
QAbstractButton *rnButton;
msgBox.setWindowTitle("Companion");
msgBox.setInformativeText(tr("Firmware %1 does not seem to have ever been downloaded.\nVersion %2 is available.\nDo you want to download it now ?").arg(fwToUpdate).arg(NewFwRev));
QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
@@ -502,7 +503,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
if( msgBox.clickedButton() == rnButton ) {
contributorsDialog *cd = new contributorsDialog(this,2,rn);
cd->exec();
int ret2 = QMessageBox::question(this, "companion9x", tr("Do you want to download release %1 now ?").arg(NewFwRev),
int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(NewFwRev),
QMessageBox::Yes | QMessageBox::No);
if (ret2 == QMessageBox::Yes) {
download = true;
@@ -518,7 +519,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
showcheckForUpdatesResult = false; // update is available - do not show dialog
QString rn = GetFirmware(fwToUpdate)->rnurl;
QAbstractButton *rnButton;
msgBox.setText("companion9x");
msgBox.setText("Companion");
msgBox.setInformativeText(tr("A new version of %1 firmware is available (current %2 - newer %3).\nDo you want to download it now ?").arg(fwToUpdate).arg(OldFwRev).arg(NewFwRev));
QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
@@ -532,7 +533,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
warning=0;
contributorsDialog *cd = new contributorsDialog(this,2,rn);
cd->exec();
int ret2 = QMessageBox::question(this, "companion9x", tr("Do you want to download release %1 now ?").arg(NewFwRev),
int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(NewFwRev),
QMessageBox::Yes | QMessageBox::No);
if (ret2 == QMessageBox::Yes) {
download = true;
@@ -546,10 +547,10 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
}
} else {
if(showcheckForUpdatesResult && check1done && check2done)
QMessageBox::information(this, "companion9x", tr("No updates available at this time."));
QMessageBox::information(this, "Companion", tr("No updates available at this time."));
}
if (ignore) {
int res = QMessageBox::question(this, "companion9x",tr("Ignore this version (r%1)?").arg(rev), QMessageBox::Yes | QMessageBox::No);
int res = QMessageBox::question(this, "Companion",tr("Ignore this version (r%1)?").arg(rev), QMessageBox::Yes | QMessageBox::No);
if (res==QMessageBox::Yes) {
settings.beginGroup("FwRevisions");
settings.setValue(fwToUpdate, NewFwRev);
@@ -559,7 +560,7 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
if (warning>0) {
QString rn = GetFirmware(fwToUpdate)->rnurl;
if (!rn.isEmpty()) {
int ret2 = QMessageBox::warning(this, "companion9x", tr("Release notes contain very important informations. Do you want to see them now ?"), QMessageBox::Yes | QMessageBox::No);
int ret2 = QMessageBox::warning(this, "Companion", tr("Release notes contain very important informations. Do you want to see them now ?"), QMessageBox::Yes | QMessageBox::No);
if (ret2 == QMessageBox::Yes) {
contributorsDialog *cd = new contributorsDialog(this,2,rn);
cd->exec();
@@ -592,11 +593,11 @@ void MainWindow::reply1Finished(QNetworkReply * reply)
}
}
} else {
QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
}
} else {
if(check1done && check2done) {
QMessageBox::warning(this, "companion9x", tr("Unable to check for updates."));
QMessageBox::warning(this, "Companion", tr("Unable to check for updates."));
int server = settings.value("fwserver",0).toInt();
server++;
settings.setValue("fwserver",server);
@@ -718,13 +719,13 @@ void MainWindow::loadProfile()
settings.setValue("profileId", profnum);
current_firmware_variant = GetFirmwareVariant(firmware_id);
FirmwareInfo *firmware = GetCurrentFirmware();
setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
// settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath());
foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget());
mdiChild->eepromInterfaceChanged();
}
setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
}
}
@@ -735,7 +736,7 @@ void MainWindow::unloadProfile()
QSettings settings("companion9x", "companion9x");
settings.setValue("ActiveProfile",0);
FirmwareInfo *firmware = GetCurrentFirmware();
setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
}
void MainWindow::preferences()
@@ -744,9 +745,9 @@ void MainWindow::preferences()
pd->exec();
FirmwareInfo *firmware = GetCurrentFirmware();
if (ActiveProfile) {
setWindowTitle(tr("companion9x - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
setWindowTitle(tr("Companion - Models and Settings Editor - %1 - profile %2").arg(firmware->name).arg(ActiveProfileName));
} else {
setWindowTitle(tr("companion9x - Models and Settings Editor - %1").arg(firmware->name));
setWindowTitle(tr("Companion - Models and Settings Editor - %1").arg(firmware->name));
}
foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
@@ -1082,10 +1083,10 @@ void MainWindow::burnExtenalToEEPROM()
cd->exec();
if (!fileName.isEmpty()) {
settings.setValue("lastDir", QFileInfo(fileName).dir().absolutePath());
int ret = QMessageBox::question(this, "companion9x", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
int ret = QMessageBox::question(this, "Companion", tr("Write Models and settings from %1 to the Tx?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
if (ret != QMessageBox::Yes) return;
if (!isValidEEPROM(fileName))
ret = QMessageBox::question(this, "companion9x", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
ret = QMessageBox::question(this, "Companion", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
if (ret != QMessageBox::Yes) return;
bool backupEnable = settings.value("backupEnable", true).toBool();
QString backupPath = settings.value("backupPath", "").toString();
@@ -1489,15 +1490,16 @@ void MainWindow::logFile()
void MainWindow::about()
{
QString aboutStr = "<center><img src=\":/images/companion9x-title.png\"><br>";
aboutStr.append(tr("Copyright") +" Bertrand Songis & Romolo Manfredini &copy; 2011- 2013<br>");
aboutStr.append(QString("<a href='http://code.google.com/p/companion9x/'>http://code.google.com/p/companion9x/</a><br>")+tr("Version %1 (revision %2), %3").arg(C9X_VERSION).arg(C9X_REVISION).arg(__DATE__)+QString("<br/><br/>"));
aboutStr.append(tr("The companion9x project was originally forked from eePe")+QString(" <a href='http://code.google.com/p/eepe'>http://code.google.com/p/eepe</a><br/><br/>"));
QString aboutStr = "<center><img src=\":/images/companion-title.png\"></center><br>";
aboutStr.append("OpenTX Home Page: <a href='http://opentx.github.io'>http://open-tx.org</a><br><br>");
aboutStr.append(tr("The Companion project was originally forked from eePe")+QString(" <a href='http://code.google.com/p/eepe'>http://code.google.com/p/eepe</a><br/><br/>"));
aboutStr.append(tr("If you've found this program useful, please support by"));
aboutStr.append(" <a href='" DONATE_STR "'>");
aboutStr.append(tr("donating") + "</a></center>");
aboutStr.append(tr("donating") + "</a><br><br>");
aboutStr.append(tr("Version %1 (revision %2), %3").arg(C9X_VERSION).arg(C9X_REVISION).arg(__DATE__)+QString("<br/><br/>"));
aboutStr.append(tr("Copyright") +" Bertrand Songis & Romolo Manfredini &copy; 2011- 2014<br>");
QMessageBox::about(this, tr("About companion9x"),aboutStr);
QMessageBox::about(this, tr("About Companion"),aboutStr);
}
void MainWindow::updateMenus()
@@ -1624,15 +1626,15 @@ void MainWindow::createActions()
connect(preferencesAct, SIGNAL(triggered()), this, SLOT(preferences()));
checkForUpdatesAct = new QAction(QIcon(":/images/update.png"), tr("&Check for updates..."), this);
checkForUpdatesAct->setStatusTip(tr("Check for new version of companion9x/er9x"));
checkForUpdatesAct->setStatusTip(tr("Check for new version of Companion"));
connect(checkForUpdatesAct, SIGNAL(triggered()), this, SLOT(doUpdates()));
contributorsAct = new QAction(QIcon(":/images/contributors.png"), tr("Contributors &List..."), this);
contributorsAct->setStatusTip(tr("Show companion9x contributors list"));
contributorsAct->setStatusTip(tr("Show Companion contributors list"));
connect(contributorsAct, SIGNAL(triggered()), this, SLOT(contributors()));
changelogAct = new QAction(QIcon(":/images/changelog.png"), tr("ChangeLog..."), this);
changelogAct->setStatusTip(tr("Show companion9x changelog"));
changelogAct->setStatusTip(tr("Show Companion changelog"));
connect(changelogAct, SIGNAL(triggered()), this, SLOT(changelog()));
fwchangelogAct = new QAction(QIcon(":/images/changelog.png"), tr("Firmware ChangeLog..."), this);
companion/src/mdichild.cpp
+3 -3
View File
@@ -182,12 +182,12 @@ void MdiChild::OpenEditWindow(bool wizard=false)
QSettings settings("companion9x", "companion9x");
bool wizardEnable=settings.value("wizardEnable", true).toBool();
if (wizardEnable) {
ret = QMessageBox::question(this, tr("companion9x"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No);
ret = QMessageBox::question(this, tr("Companion"), tr("Do you want to use model wizard? "), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
wizard=true;
} else {
qSleep(500);
ret = QMessageBox::question(this, tr("companion9x"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No);
ret = QMessageBox::question(this, tr("Companion"), tr("Ask this question again ? "), QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::No) {
settings.setValue("wizardEnable", false);
}
@@ -470,7 +470,7 @@ bool MdiChild::maybeSave()
{
if (fileChanged) {
QMessageBox::StandardButton ret;
ret = QMessageBox::warning(this, tr("companion9x"),
ret = QMessageBox::warning(this, tr("Companion"),
tr("%1 has been modified.\n"
"Do you want to save your changes?").arg(userFriendlyCurrentFile()),
QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
companion/src/modelslist.cpp
+8 -8
View File
@@ -226,7 +226,7 @@ void ModelsListWidget::dropEvent(QDropEvent *event)
if (row < 0)
return;
// QMessageBox::warning(this, tr("companion9x"),tr("Index :%1").arg(row));
// QMessageBox::warning(this, tr("Companion"),tr("Index :%1").arg(row));
const QMimeData *mimeData = event->mimeData();
if(mimeData->hasFormat("application/x-companion9x"))
{
@@ -360,9 +360,9 @@ void ModelsListWidget::deleteSelected(bool ask=true)
}
if (isModel==true) {
if (radioData->generalSettings.currModel != selModel) {
ret = QMessageBox::warning(this, "companion9x", tr("Delete Selected Models?"), QMessageBox::Yes | QMessageBox::No);
ret = QMessageBox::warning(this, "Companion", tr("Delete Selected Models?"), QMessageBox::Yes | QMessageBox::No);
} else {
ret = QMessageBox::warning(this, "companion9x", tr("Cannot delete default model."), QMessageBox::Ok);
ret = QMessageBox::warning(this, "Companion", tr("Cannot delete default model."), QMessageBox::Ok);
}
}
}
@@ -373,9 +373,9 @@ void ModelsListWidget::deleteSelected(bool ask=true)
((MdiChild *)parent())->setModified();
} else if (index.row()>0) {
if (ask) {
ret = QMessageBox::warning(this, "companion9x", tr("Cannot delete default model."), QMessageBox::Ok);
ret = QMessageBox::warning(this, "Companion", tr("Cannot delete default model."), QMessageBox::Ok);
} else {
ret = QMessageBox::warning(this, "companion9x", tr("Cannot cut default model."), QMessageBox::Ok);
ret = QMessageBox::warning(this, "Companion", tr("Cannot cut default model."), QMessageBox::Ok);
}
}
}
@@ -445,7 +445,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index)
i++;
gData++;
if(c=='G') { //General settings
ret = QMessageBox::question(this, "companion9x", tr("Do you want to overwrite TX general settings?"),
ret = QMessageBox::question(this, "Companion", tr("Do you want to overwrite TX general settings?"),
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
radioData->generalSettings = *((GeneralSettings *)gData);
@@ -456,7 +456,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index)
}
else { //model data
if (!radioData->models[id-1].isempty()) {
ret = QMessageBox::question(this, "companion9x", tr("You are pasting on an not empty model, are you sure?"),
ret = QMessageBox::question(this, "Companion", tr("You are pasting on an not empty model, are you sure?"),
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
radioData->models[id-1] = *((ModelData *)gData);
@@ -519,7 +519,7 @@ void ModelsListWidget::duplicate()
i++;
}
if (i==GetEepromInterface()->getMaxModels()) {
QMessageBox::warning(this, "companion9x", tr("No free slot available, cannot duplicate"), QMessageBox::Ok);
QMessageBox::warning(this, "Companion", tr("No free slot available, cannot duplicate"), QMessageBox::Ok);
}
}
}
companion/src/preferencesdialog.cpp
+6 -6
View File
@@ -239,11 +239,11 @@ void preferencesDialog::firmwareChanged()
}
else {
if (ui->fw_dnld->isEnabled()) {
ui->FwInfo->setText(tr("The selected firmware has never been downloaded by companion9x."));
ui->FwInfo->setText(tr("The selected firmware has never been downloaded by Companion."));
ui->checkFWUpdates->hide();
}
else {
ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by companion9x."));
ui->FwInfo->setText(tr("The selected firmware cannot be downloaded by Companion."));
ui->checkFWUpdates->hide();
}
}
@@ -506,10 +506,10 @@ void preferencesDialog::populateLocale()
if (!strl.count()) return;
QDir directory = QDir(":/");
QStringList files = directory.entryList(QStringList("companion9x_*.qm"), QDir::Files | QDir::NoSymLinks);
QStringList files = directory.entryList(QStringList("companion_*.qm"), QDir::Files | QDir::NoSymLinks);
foreach(QString file, files) {
QLocale loc(file.mid(12, 2));
QLocale loc(file.mid(10, 2));
ui->locale_QB->addItem(QLocale::languageToString(loc.language()), loc.name());
}
}
@@ -660,7 +660,7 @@ void preferencesDialog::on_ProfSave_PB_clicked()
QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
QString name=ui->ProfName_LE->text();
if (name.isEmpty()) {
int ret = QMessageBox::question(this, "companion9x",
int ret = QMessageBox::question(this, "Companion",
tr("Profile name is empty, profile slot %1 will be deleted.<br>Are you sure ?").arg(ui->ProfSlot_SB->value()) ,
QMessageBox::Yes | QMessageBox::No);
if (ret==QMessageBox::Yes) {
@@ -719,7 +719,7 @@ void preferencesDialog::on_import_PB_clicked()
QString profile=QString("profile%1").arg(ui->ProfSlot_SB->value());
QString name=ui->ProfName_LE->text();
if (!name.isEmpty()) {
int ret = QMessageBox::question(this, "companion9x",
int ret = QMessageBox::question(this, "Companion",
tr("Profile slot is not empty, profile slot %1 will we overwritten.<br>Are you sure ?").arg(ui->ProfSlot_SB->value()) ,
QMessageBox::Yes | QMessageBox::No);
if (ret==QMessageBox::No) {
companion/src/simulatordialog.cpp
+1 -1
View File
@@ -227,7 +227,7 @@ void simulatorDialog::onTimerEvent()
{
static unsigned int lcd_counter = 0;
if (!simulator->timer10ms()) {
QMessageBox::critical(this, "companion9x", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
QMessageBox::critical(this, "Companion", QString(tr("Firmware %1 error: %2")).arg(txInterface->getName()).arg(simulator->getError()));
timer->stop();
return;
}
companion/src/simulatordialog.ui
+4 -1
View File
@@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>Companion9x Simulator</string>
<string>Companion Simulator</string>
</property>
<property name="windowIcon">
<iconset resource="companion9x.qrc">
@@ -1092,6 +1092,7 @@ QPushButton:checked {
</property>
</widget>
</item>
<item row="0" column="4" rowspan="3">
<widget class="menuWidget" name="menu" native="true">
<property name="sizePolicy">
@@ -1810,6 +1811,7 @@ QPushButton:checked {
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="lineWidth">
<number>2</number>
</property>
@@ -2294,6 +2296,7 @@ border-radius: 4px;
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_ch01">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
companion/src/translations.qrc.in
+8 -8
View File
@@ -1,12 +1,12 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource prefix="/">
<file>companion9x_fr.qm</file>
<file>companion9x_de.qm</file>
<file>companion9x_he.qm</file>
<file>companion9x_it.qm</file>
<file>companion9x_pt.qm</file>
<file>companion9x_ru.qm</file>
<file>companion9x_sv.qm</file>
<file>companion9x_cs.qm</file>
<file>companion_fr.qm</file>
<file>companion_de.qm</file>
<file>companion_he.qm</file>
<file>companion_it.qm</file>
<file>companion_pt.qm</file>
<file>companion_ru.qm</file>
<file>companion_sv.qm</file>
<file>companion_cs.qm</file>
</qresource>
</RCC>
companion/src/translations/companion9x_cs.ts → companion/src/translations/companion_cs.ts
+551 -442
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_de.ts → companion/src/translations/companion_de.ts
+537 -456
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_fr.ts → companion/src/translations/companion_fr.ts
+559 -442
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_he.ts → companion/src/translations/companion_he.ts
+519 -497
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_it.ts → companion/src/translations/companion_it.ts
+552 -439
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_pt.ts → companion/src/translations/companion_pt.ts
+528 -478
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_ru.ts → companion/src/translations/companion_ru.ts
+519 -484
View File
File diff suppressed because it is too large Load Diff
companion/src/translations/companion9x_sv.ts → companion/src/translations/companion_sv.ts
+236 -218
View File
@@ -1211,53 +1211,38 @@ FAI-funktionen kan inte slås av i sändaren.
<name>MainWindow</name>
<message>
<location filename="../mainwindow.cpp" line="+147"/>
<location line="+488"/>
<location line="+489"/>
<location line="+34"/>
<location line="+1492"/>
<source>File loaded</source>
<translation>Filen har laddats</translation>
</message>
<message>
<location line="-1893"/>
<location line="-1894"/>
<location line="+2"/>
<location line="+40"/>
<location line="+260"/>
<location line="+261"/>
<location line="+2"/>
<source>Save As</source>
<translation>Spara Som</translation>
</message>
<message>
<location line="-287"/>
<location line="+258"/>
<location line="-288"/>
<location line="+259"/>
<source>No updates available at this time.</source>
<translation>Inga updateringar finns tillgängliga.</translation>
</message>
<message>
<location line="-297"/>
<location line="-298"/>
<location line="+43"/>
<location line="+178"/>
<location line="+122"/>
<location line="+123"/>
<location line="+4"/>
<source>Unable to check for updates.</source>
<translation>Det gick inte att söka efter uppdateringar.</translation>
</message>
<message>
<location line="-487"/>
<location line="+615"/>
<location line="+20"/>
<source>companion9x - Models and Settings Editor - %1 - profile %2</source>
<translation>companion9x - Editor för Modeller och Inställningar - %1 - profile %2</translation>
</message>
<message>
<location line="-633"/>
<location line="+607"/>
<location line="+17"/>
<location line="+11"/>
<source>companion9x - Models and Settings Editor - %1</source>
<translation>companion9x - Editor för Modeller och Inställningar - %1</translation>
</message>
<message>
<location line="-473"/>
<location line="-324"/>
<source>Executable (*.exe)</source>
<translation>Program (*.exe)</translation>
</message>
@@ -1272,7 +1257,7 @@ FAI-funktionen kan inte slås av i sändaren.
<translation>Vill du skriva firmware till sändaren nu?</translation>
</message>
<message>
<location line="+86"/>
<location line="+87"/>
<source>A new version of %1 firmware is available (current %2 - newer %3).
Do you want to download it now ?</source>
<translation>En ny version finns tillgänglig av %1 fimware (Din version %2 - Ny version %3).
@@ -1367,12 +1352,7 @@ Vill du ladda ned den nya versionen nu ?</translation>
<translation>&amp;Sök efter uppdateringar...</translation>
</message>
<message>
<location line="-1365"/>
<source>A new version of companion9x is available (version %1)&lt;br&gt;Would you like to download it?</source>
<translation>An ny version av companion9x finns tillgänglig (version %1)&lt;br&gt;Vill du ladda ned den?</translation>
</message>
<message>
<location line="-87"/>
<location line="-1453"/>
<source>Display previous message again at startup ?</source>
<translation>Skall föregående varning visas igen vid uppstart ?</translation>
</message>
@@ -1387,18 +1367,12 @@ Vill du ladda ned den nya versionen nu ?</translation>
<translation>Tillfälligt fel i byggservern. Försök igen senare</translation>
</message>
<message>
<location line="+6"/>
<location line="+40"/>
<source>Compilation server requires registration, please check opentx web site</source>
<translation>Byggservern kräver registrering. Var god kontrollera openTX webbsida</translation>
</message>
<message>
<location line="-9"/>
<location line="+37"/>
<source>Firmware does not fit in the Tx, due to selected firmware options</source>
<translation>Firmware får inte rum i minnet på grund av att för många funktioner aktiverats</translation>
</message>
<message>
<location line="+97"/>
<location line="+98"/>
<source>Firmware %1 does not seem to have ever been downloaded.
Version %2 is available.
Do you want to download it now ?</source>
@@ -1432,32 +1406,12 @@ Vill du ladda ned den nu ?</translation>
<translation>Version %1 (revision %2), %3</translation>
</message>
<message>
<location line="+1"/>
<source>The companion9x project was originally forked from eePe</source>
<translation>Ursprungligen grenades companion9x av från eePe</translation>
</message>
<message>
<location line="+1"/>
<location line="+2"/>
<source>If you&apos;ve found this program useful, please support by</source>
<translation>Om du tycker att programet är användbart så kan du stödja utvecklingen genom att</translation>
</message>
<message>
<location line="+4"/>
<source>About companion9x</source>
<translation>Om companion9x</translation>
</message>
<message>
<location line="+127"/>
<source>Check for new version of companion9x/er9x</source>
<translation>Sök efter ny version av companion9x/er9x</translation>
</message>
<message>
<location line="+4"/>
<source>Show companion9x contributors list</source>
<translation>Visa vilka som bidragit till companion9x</translation>
</message>
<message>
<location line="+16"/>
<location line="+151"/>
<source>Customize your &amp;TX...</source>
<translation>Sändari&amp;nställningar...</translation>
</message>
@@ -1668,17 +1622,37 @@ Vill du ladda ned den nu ?</translation>
<translation>Byt layout-riktning</translation>
</message>
<message>
<location line="-1542"/>
<location line="-1661"/>
<location line="+616"/>
<location line="+20"/>
<source>Companion - Models and Settings Editor - %1 - profile %2</source>
<translation>Companion - Editor för Modeller och Inställningar - %1 - profile %2</translation>
</message>
<message>
<location line="-634"/>
<location line="+608"/>
<location line="+17"/>
<location line="+11"/>
<source>Companion - Models and Settings Editor - %1</source>
<translation>Companion - Editor för Modeller och Inställningar - %1</translation>
</message>
<message>
<location line="-520"/>
<source>Checking for updates</source>
<translation>Letar efter uppdateringar</translation>
</message>
<message>
<location line="+322"/>
<location line="+323"/>
<source>Ignore this version (r%1)?</source>
<translation>Ladda inte ned versionen (r%1)?</translation>
</message>
<message>
<location line="+1131"/>
<location line="+1088"/>
<source>Show Companion changelog</source>
<translation>Visa en lista med förändringar av Companion</translation>
</message>
<message>
<location line="+43"/>
<source>&amp;Write Models and Settings To Tx</source>
<translation>&amp;Skriv Modeller och Inställningar till sändaren</translation>
</message>
@@ -1737,14 +1711,6 @@ Vill du ladda ned den nu ?</translation>
<source>Read firmware from transmitter</source>
<translation>Läs firmware från sändaren</translation>
</message>
<message>
<source>&amp;Configure Communication...</source>
<translation type="obsolete">&amp;Kommunikationsinställningar...</translation>
</message>
<message>
<source>Configure software for communication with the transmitter</source>
<translation type="obsolete">Inställningar för mjukvaran som kommunicerar med sändaren</translation>
</message>
<message>
<location line="+115"/>
<source>&amp;Edit</source>
@@ -1786,7 +1752,7 @@ Vill du ladda ned den nu ?</translation>
<translation>&amp;Bidragsgivare...</translation>
</message>
<message>
<location line="-1459"/>
<location line="-1460"/>
<source>Display previous warning again at startup ?</source>
<translation>SKall föregående varning visas igen vid uppstart ?</translation>
</message>
@@ -1795,7 +1761,7 @@ Vill du ladda ned den nu ?</translation>
<location line="+29"/>
<location line="+11"/>
<location line="+29"/>
<location line="+495"/>
<location line="+496"/>
<location line="+1165"/>
<location line="+6"/>
<location line="+8"/>
@@ -1815,19 +1781,14 @@ Vill du ladda ned den nu ?</translation>
%2.</translation>
</message>
<message>
<location line="-621"/>
<location line="-622"/>
<source>New release available</source>
<translation>En ny version finns tillgänglig</translation>
</message>
<message>
<location line="+0"/>
<source>A new release of companion is available please check the repository</source>
<translation>En ny version av companion finns tillgänglig. Kontrollera källkods-repository</translation>
</message>
<message>
<location line="+57"/>
<location line="+40"/>
<location line="+1694"/>
<location line="+1695"/>
<location line="+8"/>
<location line="+36"/>
<source>Error opening file %1:
@@ -1836,7 +1797,7 @@ Vill du ladda ned den nu ?</translation>
%2.</translation>
</message>
<message>
<location line="-1723"/>
<location line="-1724"/>
<source>Compilation server termporary failure, try later</source>
<translation>Tillfälligt fel i byggservern. Försök igen senare</translation>
</message>
@@ -1853,7 +1814,7 @@ Vill du ladda ned den nu ?</translation>
<translation>Okänt server-fel. Försök igen senare</translation>
</message>
<message>
<location line="+1239"/>
<location line="+1240"/>
<source>Compare...</source>
<translation>Jämför...</translation>
</message>
@@ -1959,7 +1920,23 @@ Vill du ladda ned den nu ?</translation>
<translation>Ja</translation>
</message>
<message>
<location line="-28"/>
<location line="-258"/>
<source>A new version of Companion is available (version %1)&lt;br&gt;Would you like to download it?</source>
<translation>An ny version av Companion finns tillgänglig (version %1)&lt;br&gt;Vill du ladda ned den?</translation>
</message>
<message>
<location line="+21"/>
<source>A new release of Companion is available please check the repository</source>
<translation>En ny version av Companion finns tillgänglig. Kontrollera källkods-repository</translation>
</message>
<message>
<location line="+78"/>
<location line="+40"/>
<source>Compilation server requires registration, please check OpenTX web site</source>
<translation>Byggservern kräver registrering. Var god kontrollera OpenTX webbsida</translation>
</message>
<message>
<location line="+91"/>
<location line="+29"/>
<source>No</source>
<translation>Nej</translation>
@@ -2090,17 +2067,32 @@ Starta skrivningen i alla fall ?</translation>
<translation>Läs Sändarens Firmware till Fil</translation>
</message>
<message>
<location line="+189"/>
<location line="+50"/>
<source>The Companion project was originally forked from eePe</source>
<translation>Ursprungligen grenades Companion av från eePe</translation>
</message>
<message>
<location line="+5"/>
<source>About Companion</source>
<translation>Om Companion</translation>
</message>
<message>
<location line="+127"/>
<source>Check for new version of Companion</source>
<translation>Sök efter ny version av Companion</translation>
</message>
<message>
<location line="+4"/>
<source>Show Companion contributors list</source>
<translation>Visa vilka som bidragit till Companion</translation>
</message>
<message>
<location line="+3"/>
<source>ChangeLog...</source>
<translation>Förändringar...</translation>
</message>
<message>
<location line="+1"/>
<source>Show companion9x changelog</source>
<translation>Visa en lista med förändringar av companion9x</translation>
</message>
<message>
<location line="+3"/>
<location line="+4"/>
<source>Firmware ChangeLog...</source>
<translation>Firmware-förändringar...</translation>
</message>
@@ -2218,14 +2210,7 @@ Starta skrivningen i alla fall ?</translation>
<translation>Ogiltig binär modelldatafil %1</translation>
</message>
<message>
<location line="-137"/>
<location line="+5"/>
<location line="+283"/>
<source>companion9x</source>
<translation>companion9x</translation>
</message>
<message>
<location line="+1"/>
<location line="+152"/>
<source>%1 has been modified.
Do you want to save your changes?</source>
<translation>%1 har förändrats.
@@ -2242,7 +2227,14 @@ Vill du spara förändringarna?</translation>
<translation>Säkerhetskopierin kan ej utföras</translation>
</message>
<message>
<location line="+0"/>
<location line="-332"/>
<location line="+5"/>
<location line="+283"/>
<source>Companion</source>
<translation>Companion</translation>
</message>
<message>
<location line="+44"/>
<source>The backup dir set in preferences does not exist</source>
<translation>Katalog för säkerhetskopiering saknas i inställningarna</translation>
</message>
@@ -7167,16 +7159,16 @@ eeprom-storleken är 4096, men enbart den första hälften används</translation
</message>
<message>
<location filename="../warnings.h" line="+5"/>
<source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.
<source>Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.
We are really sensible to that!
We are really appreciative for that!
The openTX/C9X Team.</source>
<translation>Tack för alla donationer, vänliga meddelanden, goda idéer och konstruktiva förslag för att bekosta fortsatt utveckling av openTX/companion9x
The OpenTX/Companion Team.</source>
<translation>Tack för alla donationer, vänliga meddelanden, goda idéer och konstruktiva förslag för att bekosta fortsatt utveckling av OpenTX/Companion
Vi uppkskattar ert stöd!
Vi uppskattar ert stöd!
Gruppen bakum openTX/companion9X.</translation>
Gruppen bakom OpenTX/Companion.</translation>
</message>
</context>
<context>
@@ -7450,12 +7442,6 @@ OBS. Fyll enbart i detta fällt om du är säker på vad du gör. Ingen kontroll
<source>Select Location</source>
<translation>Välj sökväg</translation>
</message>
<message>
<location line="+71"/>
<location line="+69"/>
<source>companion9x</source>
<translation>companion9x</translation>
</message>
<message>
<location filename="../burnconfigdialog.ui" line="+20"/>
<location line="+30"/>
@@ -7473,7 +7459,7 @@ m2560 for v4.1 boards</source>
m2560 för v4.1-kort</translation>
</message>
<message>
<location filename="../burnconfigdialog.cpp" line="-68"/>
<location filename="../burnconfigdialog.cpp" line="+72"/>
<source>&lt;b&gt;&lt;u&gt;WARNING!&lt;/u&gt;&lt;/b&gt;&lt;br&gt;This will reset the fuses of %1 to the factory settings.&lt;br&gt;Writing fuses can mess up your radio.&lt;br&gt;Do this only if you are sure they are wrong!&lt;br&gt;Are you sure you want to continue?</source>
<translation>&lt;b&gt;&lt;u&gt;VARNING!&lt;/u&gt;&lt;/b&gt;&lt;br&gt;Detta åerställer säkringarna för %1 till deras ursprungliga värden.&lt;br&gt;Att ändra dessa värden kan skapa allvarliga problem med din sändare.&lt;br&gt;Ändra säkringarna bara om du är helt säker på att de har fel värde!&lt;br&gt;Är du säker på att du vill fortsätta?</translation>
</message>
@@ -7550,6 +7536,12 @@ m2560 för v4.1-kort</translation>
<source>AVRDUDE Configuration</source>
<translation>Inställningar för AVRDUDE</translation>
</message>
<message>
<location line="+272"/>
<location line="+69"/>
<source>Companion</source>
<translation>Companion</translation>
</message>
</context>
<context>
<name>burnDialog</name>
@@ -7569,7 +7561,12 @@ m2560 för v4.1-kort</translation>
<translation>Subversion</translation>
</message>
<message>
<location line="+233"/>
<location line="+63"/>
<source>Allows Companion to write to older version of the firmware</source>
<translation>Tillåter Companon att skriva till äldre firmware-versioner</translation>
</message>
<message>
<location line="+170"/>
<source>Load Image</source>
<translation>Ladda Bild</translation>
</message>
@@ -7748,12 +7745,7 @@ m2560 för v4.1-kort</translation>
<translation>Välj fil</translation>
</message>
<message>
<location line="+15"/>
<source>Allows companion9x to write to older version of the firmware</source>
<translation>Tillåter companon9x att skriva till äldre firmware-versioner</translation>
</message>
<message>
<location line="+13"/>
<location line="+28"/>
<source>Backup and restore Models and Settings</source>
<translation>Säkerhetskopiera Modeller och Inställningar</translation>
</message>
@@ -8375,14 +8367,19 @@ m2560 för v4.1-kort</translation>
<message>
<location line="+7"/>
<source>Honors go to Rafal Tomczak (RadioClone) and Thomas Husterer (th9x)
of course. Also to Erez Raviv (er9x) and it&apos;s fantastic eePe, from which
companion9x was forked out.</source>
<translation>All heder åt Rafal Tomczak (RadioClone) och Thomas Husterer (th9x) naturligtvis.
Dessutom till Erez Raviv (er9x) och dess fantastiska eePe, från vilken
companion9x grenades av.</translation>
of course. Also to Erez Raviv (er9x) and the fantastic eePe program
which was the staring point for OpenTX Companion.</source>
<translation>All heder åt Rafal Tomczak (RadioClone) och Thomas Husterer (th9x) naturligtvis.
Dessutom till Erez Raviv (er9x) och hans fantastiska eePe, från vilken
OpenTX Companion grenades av.</translation>
</message>
<message>
<location line="+2"/>
<location line="+17"/>
<source>Companion Release Notes</source>
<translation>Companion Release Notes</translation>
</message>
<message>
<location line="-14"/>
<source>Thank you all !!!</source>
<translation>Tack till er alla !!!</translation>
</message>
@@ -8392,12 +8389,7 @@ companion9x grenades av.</translation>
<translation>Bidragande</translation>
</message>
<message>
<location line="+11"/>
<source>Companion9x Release Notes</source>
<translation>Companion9x Release Notes</translation>
</message>
<message>
<location line="+5"/>
<location line="+16"/>
<source>OpenTX Release Notes</source>
<translation>OpenTX Release Notes</translation>
</message>
@@ -8550,8 +8542,8 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+29"/>
<source>companion9x</source>
<translation>companion9x</translation>
<source>Companion</source>
<translation>Companion</translation>
</message>
<message>
<location line="+1"/>
@@ -8931,8 +8923,8 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<name>logsDialog</name>
<message>
<location filename="../logsdialog.ui" line="+14"/>
<source>Companion9x log viewer</source>
<translation>Companion9x loggläsare</translation>
<source>Companion Log Viewer</source>
<translation>Companion Logg-läsare</translation>
</message>
<message>
<location line="+15"/>
@@ -8945,7 +8937,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<translation>Öppna Loggfil</translation>
</message>
<message>
<location line="+88"/>
<location line="+51"/>
<source>Zoom</source>
<translation>Zoom</translation>
</message>
@@ -8960,7 +8952,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<translation>Y</translation>
</message>
<message>
<location filename="../logsdialog.cpp" line="+22"/>
<location filename="../logsdialog.cpp" line="+27"/>
<source>Telemetry logs</source>
<translation>Telemetriloggar</translation>
</message>
@@ -8970,7 +8962,19 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<translation>Tid</translation>
</message>
<message>
<location line="+372"/>
<location line="+224"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot write file %1:
%2.</source>
<translation>Filen %1 kunde inte skrivas:
%2.</translation>
</message>
<message>
<location line="+329"/>
<source>Select your log file</source>
<translation>Välj loggfil</translation>
</message>
@@ -8980,7 +8984,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<translation>Tillgängliga fält</translation>
</message>
<message>
<location line="+95"/>
<location line="+97"/>
<source>The selected logfile contains %1 invalid lines out of %2 total lines</source>
<translation>Denn aktuella filen innehåller %1 felaktiga rader. Totalt innehåller filen %2 rader</translation>
</message>
@@ -9443,22 +9447,22 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<translation>Inställningar</translation>
</message>
<message>
<location line="+480"/>
<location line="+624"/>
<source>Language (requires restart)</source>
<translation>Språk (kräver omstart)</translation>
</message>
<message>
<location line="-233"/>
<location line="-599"/>
<source>Show Splash Screen</source>
<translation>Visa Startbild</translation>
</message>
<message>
<location line="+767"/>
<location line="+989"/>
<source>Recent History Size</source>
<translation>Loggstorlek</translation>
</message>
<message>
<location line="-157"/>
<location line="-126"/>
<location line="+41"/>
<source>Download</source>
<translation>Nedladdning</translation>
@@ -9469,7 +9473,7 @@ Tryck på Avbryt för att avburyta kalibreringen</translation>
<translation>Kanalordning</translation>
</message>
<message>
<location line="-151"/>
<location line="-415"/>
<source>Channel order
This is used by the templated to determine which channel goes to what number output.</source>
@@ -9478,7 +9482,7 @@ This is used by the templated to determine which channel goes to what number out
Detta används av mallen för att koppla kanal till output-nummer.</translation>
</message>
<message>
<location line="+138"/>
<location line="+402"/>
<source>Default Stick Mode</source>
<translation>Spaktilldelning</translation>
</message>
@@ -9554,7 +9558,17 @@ Mode 4:
<translation>Firmware</translation>
</message>
<message>
<location line="-894"/>
<location line="+621"/>
<source>Find Executable</source>
<translation>Sök Program</translation>
</message>
<message>
<location line="+9"/>
<source>Google Earth Executable</source>
<translation>Sökväg till Google Earth</translation>
</message>
<message>
<location line="-1542"/>
<source>Check for updates on startup</source>
<translation>Sök efter uppdateringar vid start</translation>
</message>
@@ -9565,30 +9579,30 @@ Mode 4:
<translation>...</translation>
</message>
<message>
<location line="+558"/>
<location line="+576"/>
<source>Splash library behaviour</source>
<translation>Beteende för bildbibliotek</translation>
</message>
<message>
<location line="-398"/>
<location line="-285"/>
<source>Personal splash library</source>
<translation>Personligt bildbibliotek</translation>
</message>
<message>
<location line="+365"/>
<location line="+252"/>
<source>Joystick</source>
<translation>Joystick</translation>
</message>
<message>
<location line="-414"/>
<location line="+480"/>
<location line="-301"/>
<location line="+192"/>
<location line="+175"/>
<location line="+135"/>
<location line="+67"/>
<source>Open Folder</source>
<translation>Öppna katalog</translation>
</message>
<message>
<location line="+57"/>
<location line="+93"/>
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
@@ -9634,12 +9648,12 @@ Mode 4:
<translation>Kryssruta</translation>
</message>
<message>
<location line="-1238"/>
<location line="-1094"/>
<source>Check for updates</source>
<translation>Sök efter uppdateringar</translation>
</message>
<message>
<location line="-188"/>
<location line="-319"/>
<source>Blue</source>
<oldsource>Blu</oldsource>
<translation>Blå</translation>
@@ -9665,7 +9679,7 @@ Mode 4:
<translation>Gul</translation>
</message>
<message>
<location line="+103"/>
<location line="+234"/>
<source>Enable</source>
<translation>Slå på</translation>
</message>
@@ -9675,7 +9689,7 @@ Mode 4:
<translation>Kalibrera</translation>
</message>
<message>
<location line="-80"/>
<location line="-211"/>
<source>Open Image</source>
<translation>Öppna bild</translation>
</message>
@@ -9685,38 +9699,33 @@ Mode 4:
<translation>Invertera bild</translation>
</message>
<message>
<location line="+212"/>
<location line="+343"/>
<source>FwInfo</source>
<translation>Firmware-info</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="+227"/>
<location filename="../preferencesdialog.cpp" line="+233"/>
<source>Last downloaded release: %1</source>
<translation>Senast nedladdade release: %1</translation>
</message>
<message>
<location line="+9"/>
<source>The selected firmware has never been downloaded by companion9x.</source>
<translation>Firmware-filen har aldrig laddats ned av companion9x.</translation>
</message>
<message>
<location line="+4"/>
<source>The selected firmware cannot be downloaded by companion9x.</source>
<translation>Firmware-filen kan inte laddas ned av companion9x.</translation>
</message>
<message>
<location line="+218"/>
<location line="+322"/>
<location line="+239"/>
<location line="+332"/>
<source>No joysticks found</source>
<translation>Ingen joystick hittades</translation>
</message>
<message>
<location line="-211"/>
<location line="-221"/>
<source>Select your Models and Settings backup folder</source>
<translation>Välj folder för automatisk säkerhetskopiering</translation>
</message>
<message>
<location line="+160"/>
<location line="+11"/>
<source>Select Google Earth executable</source>
<translation>Sökväg till Google Earth</translation>
</message>
<message>
<location line="+159"/>
<source>Open Image to load</source>
<translation>Öppna bild för laddning</translation>
</message>
@@ -9726,24 +9735,34 @@ Mode 4:
<translation>Bilder (%1)</translation>
</message>
<message>
<location line="-144"/>
<location line="+150"/>
<location line="-145"/>
<location line="+151"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
<location line="-150"/>
<location line="+150"/>
<location line="-517"/>
<source>The selected firmware has never been downloaded by Companion.</source>
<translation>Firmware-filen har aldrig laddats ned av Companion.</translation>
</message>
<message>
<location line="+4"/>
<source>The selected firmware cannot be downloaded by Companion.</source>
<translation>Firmware-filen kan inte laddas ned av Companion.</translation>
</message>
<message>
<location line="+362"/>
<location line="+151"/>
<source>Cannot load %1.</source>
<translation>%1 kunde inte laddas.</translation>
</message>
<message>
<location line="-288"/>
<location line="-298"/>
<source>Image stored in settings</source>
<translation>Bilden lagras i inställningar</translation>
</message>
<message>
<location filename="../preferencesdialog.ui" line="+401"/>
<location filename="../preferencesdialog.ui" line="+288"/>
<source>Include companion splashes</source>
<translation>Användarens bilder och companion-bilder</translation>
</message>
@@ -9753,7 +9772,7 @@ Mode 4:
<translation>Enbart användarens bilder</translation>
</message>
<message>
<location line="-473"/>
<location line="-360"/>
<source>Custom TX splash screen</source>
<translation>Egen uppstartsbild</translation>
</message>
@@ -9763,12 +9782,12 @@ Mode 4:
<translation>Fråga om skrivning efter Nedladdning</translation>
</message>
<message>
<location line="+475"/>
<location line="+362"/>
<source>Language</source>
<translation>Språk</translation>
</message>
<message>
<location line="-420"/>
<location line="-307"/>
<source>Profile Name</source>
<translation>Profilnamn</translation>
</message>
@@ -9778,7 +9797,7 @@ Mode 4:
<translation>Spara Profil</translation>
</message>
<message>
<location line="+322"/>
<location line="+209"/>
<source>Profile slot</source>
<translation>Profilplats</translation>
</message>
@@ -9793,7 +9812,7 @@ Mode 4:
<translation>Välj bibliotekskatalog</translation>
</message>
<message>
<location filename="../preferencesdialog.ui" line="-359"/>
<location filename="../preferencesdialog.ui" line="-246"/>
<source>Export Profile</source>
<translation>Exportera Profil</translation>
</message>
@@ -9803,7 +9822,7 @@ Mode 4:
<translation>Importera Profil</translation>
</message>
<message>
<location line="+368"/>
<location line="+255"/>
<source>Automatically add version number to the filename after download</source>
<translation>Lägg automatiskt till ett versionsnummer till filnamnet</translation>
</message>
@@ -9820,7 +9839,7 @@ May be different from firmware language</source>
Får skilja från språket för mjukvaran</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="+145"/>
<location filename="../preferencesdialog.cpp" line="+155"/>
<source>Export profile As</source>
<translation>Exportera profil som</translation>
</message>
@@ -9835,12 +9854,12 @@ Får skilja från språket för mjukvaran</translation>
<translation>Öppna profil för import</translation>
</message>
<message>
<location filename="../preferencesdialog.ui" line="-832"/>
<location filename="../preferencesdialog.ui" line="-850"/>
<source>Simu BackLight</source>
<translation>Simulatorbelysning</translation>
</message>
<message>
<location line="+929"/>
<location line="+947"/>
<source>Processor ID</source>
<translation>Processortyp</translation>
</message>
@@ -9850,22 +9869,22 @@ Får skilja från språket för mjukvaran</translation>
<translation>Katalog för simulator-data</translation>
</message>
<message>
<location line="+29"/>
<location line="-348"/>
<source>Use clipboard only</source>
<translation>Använd bara clipboard</translation>
</message>
<message>
<location filename="../preferencesdialog.cpp" line="-163"/>
<location filename="../preferencesdialog.cpp" line="-173"/>
<source>Select your snapshot folder</source>
<translation>Välj katalog för snapshots</translation>
</message>
<message>
<location line="+99"/>
<location line="+108"/>
<source>Profile name is empty, profile slot %1 will be deleted.&lt;br&gt;Are you sure ?</source>
<translation>Profilnamn saknas, profilplats %1 kommer att raderas.&lt;br&gt; Är du säker?</translation>
</message>
<message>
<location filename="../preferencesdialog.ui" line="-945"/>
<location filename="../preferencesdialog.ui" line="-586"/>
<source>Check for selected Fw updates</source>
<translation>Sök efter updatering av vald FW</translation>
</message>
@@ -9880,7 +9899,7 @@ Får skilja från språket för mjukvaran</translation>
<translation>Minns brytare i simulator</translation>
</message>
<message>
<location line="+813"/>
<location line="+831"/>
<source>SD Structure path</source>
<translation>Sökväg till SD-struktur</translation>
</message>
@@ -10387,13 +10406,7 @@ Får skilja från språket för mjukvaran</translation>
<context>
<name>simulatorDialog</name>
<message>
<location filename="../simulatordialog.ui" line="+26"/>
<source>Companion9x Simulator</source>
<oldsource>ER9x Simulator</oldsource>
<translation>Companion 9x Simulator</translation>
</message>
<message>
<location line="+818"/>
<location filename="../simulatordialog.ui" line="+844"/>
<source>P1</source>
<translation>P1</translation>
</message>
@@ -10498,17 +10511,22 @@ Får skilja från språket för mjukvaran</translation>
<translation>Höger dubbelklick nollställer</translation>
</message>
<message>
<location line="+278"/>
<location line="-742"/>
<source>Companion Simulator</source>
<translation>Companion Simulator</translation>
</message>
<message>
<location line="+1020"/>
<source>9x Simulator</source>
<translation>Simulator för 9x</translation>
</message>
<message>
<location line="+193"/>
<location line="+194"/>
<source>Outputs</source>
<translation>Utgångar</translation>
</message>
<message>
<location line="+1068"/>
<location line="+1070"/>
<source>CH1</source>
<translation>KN1</translation>
</message>
@@ -10639,7 +10657,7 @@ Får skilja från språket för mjukvaran</translation>
<translation>Simulerar </translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="-2681"/>
<location filename="../simulatordialog.ui" line="-2684"/>
<location line="+60"/>
<location line="+57"/>
<source>0 %</source>
@@ -10651,7 +10669,7 @@ Får skilja från språket för mjukvaran</translation>
<translation> - Fligmod: %1(%2)</translation>
</message>
<message>
<location filename="../simulatordialog.ui" line="+282"/>
<location filename="../simulatordialog.ui" line="+283"/>
<source>CS1</source>
<translation>LB1</translation>
</message>
@@ -10741,7 +10759,7 @@ Får skilja från språket för mjukvaran</translation>
<translation>LBI</translation>
</message>
<message>
<location line="+31"/>
<location line="+32"/>
<source>CSJ</source>
<translation>LBJ</translation>
</message>
@@ -10848,12 +10866,7 @@ Får skilja från språket för mjukvaran</translation>
<context>
<name>xsimulatorDialog</name>
<message>
<location filename="../xsimulatordialog.ui" line="+26"/>
<source>Companion9x Simulator</source>
<translation>Companion 9x-Simulator</translation>
</message>
<message>
<location line="+1035"/>
<location filename="../xsimulatordialog.ui" line="+1061"/>
<location line="+138"/>
<source>SE</source>
<translation>SE</translation>
@@ -10923,7 +10936,12 @@ Får skilja från språket för mjukvaran</translation>
<translation>SG</translation>
</message>
<message>
<location line="-301"/>
<location line="-539"/>
<source>Companion Simulator</source>
<translation>Companion Simulator</translation>
</message>
<message>
<location line="+238"/>
<location line="+291"/>
<source>SD</source>
<translation>SD</translation>
@@ -10951,7 +10969,7 @@ Får skilja från språket för mjukvaran</translation>
<location line="+22"/>
<location line="+158"/>
<location line="+22"/>
<location line="+158"/>
<location line="+159"/>
<location line="+22"/>
<location line="+152"/>
<location line="+22"/>
@@ -10965,7 +10983,7 @@ Får skilja från språket för mjukvaran</translation>
<translation>-100.1</translation>
</message>
<message>
<location line="-1128"/>
<location line="-1129"/>
<source>CH9</source>
<translation>KN9</translation>
</message>
@@ -10995,7 +11013,7 @@ Får skilja från språket för mjukvaran</translation>
<translation>KN4</translation>
</message>
<message>
<location line="+167"/>
<location line="+168"/>
<source>CH12</source>
<translation>KN12</translation>
</message>
@@ -11071,7 +11089,7 @@ Får skilja från språket för mjukvaran</translation>
<translation>Simulerar </translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="-1773"/>
<location filename="../xsimulatordialog.ui" line="-1774"/>
<location line="+22"/>
<location line="+3"/>
<source>SF</source>
@@ -11112,7 +11130,7 @@ Får skilja från språket för mjukvaran</translation>
<translation> - Fligmod: %1(%2)</translation>
</message>
<message>
<location filename="../xsimulatordialog.ui" line="+1627"/>
<location filename="../xsimulatordialog.ui" line="+1628"/>
<source>CSK</source>
<translation>LBK</translation>
</message>
companion/src/warnings.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define WARNINGS_H
#define WARNING_LEVEL 0
#define WARNING_ID 6
#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next openTX/C9x funding model.\n\nWe are really sensible to that!\n\nThe openTX/C9X Team.")
#define WARNING QObject::tr("Thanks all for the donations, kind messages, nice ideas, constructive proposals etc. for the next OpenTX/Companion funding model.\n\nWe are really appreciative for that!\n\nThe OpenTX/Companion Team.")
#endif /* WARNINGS_H */
companion/src/xsimulatordialog.cpp
+1 -1
View File
@@ -196,7 +196,7 @@ void xsimulatorDialog::onTimerEvent()
static unsigned int lcd_counter = 0;
if (!simulator->timer10ms()) {
QMessageBox::critical(this, "companion9x", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
QMessageBox::critical(this, "companion", tr("Firmware %1 error: %2").arg(txInterface->getName()).arg(simulator->getError()));
timer->stop();
return;
}
companion/src/xsimulatordialog.ui
+2 -1
View File
@@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>Companion9x Simulator</string>
<string>Companion Simulator</string>
</property>
<property name="windowIcon">
<iconset resource="companion9x.qrc">
@@ -2053,6 +2053,7 @@ border-radius: 4px;
<width>16777215</width>
<height>18</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QSlider::sub-page:horizontal:disabled {
companion/targets/windows/companion9x-msys.nsi.in → companion/targets/windows/companion-msys.nsi.in
+186 -186
View File
@@ -1,186 +1,186 @@
;NSIS Modern User Interface
;Start Menu Folder Selection Example Script
;Written by Joost Verburg
;--------------------------------
;Include Modern UI
!include "MUI2.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
;--------------------------------
;General
;Name and file
Name "companion9x"
OutFile "companion9xInstall_v@C9X_VERSION@.exe"
;Default installation folder
InstallDir "$PROGRAMFILES\companion9x"
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\companion9x" ""
;Compressor options
SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
;Request application privileges for Windows Vista
RequestExecutionLevel admin
;--------------------------------
;Variables
Var StartMenuFolder
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;Pages
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_INSTFILES
# These indented statements modify settings for MUI_PAGE_FINISH
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "French"
;--------------------------------
;Installer Sections
Section "companion9x" SecDummy
SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "companion9x.exe"
File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll"
File "C:\MinGW\bin\libgcc_s_dw2-1.dll"
File "C:\MinGW\bin\mingwm10.dll"
File "C:\MinGW\bin\libstdc++-6.dll"
File "@QT_BINARY_DIR@\QtCore4.dll"
File "@QT_BINARY_DIR@\QtGui4.dll"
File "@QT_BINARY_DIR@\QtXml4.dll"
File "@QT_BINARY_DIR@\QtNetwork4.dll"
File "@QT_BINARY_DIR@\Phonon4.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
CreateDirectory "$INSTDIR\lang"
SetOutPath "$INSTDIR\lang"
File "*.qm"
SetOutPath "$INSTDIR"
;Store installation folder
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File"
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
;--------------------------------
;Descriptions
;Language strings
LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor."
LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM"
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
Section "Uninstall"
;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\companion9x.exe"
Delete "$INSTDIR\libxerces-c-3-1.dll"
Delete "$INSTDIR\libgcc_s_dw2-1.dll"
Delete "$INSTDIR\mingwm10.dll"
Delete "$INSTDIR\libstdc++-6.dll"
Delete "$INSTDIR\QtCore4.dll"
Delete "$INSTDIR\QtGui4.dll"
Delete "$INSTDIR\QtNetwork4.dll"
Delete "$INSTDIR\Phonon4.dll"
Delete "$INSTDIR\QtXml4.dll"
Delete "$INSTDIR\avrdude.exe"
Delete "$INSTDIR\avrdude.conf"
Delete "$INSTDIR\libusb0.dll"
Delete "$INSTDIR\dfu-util.exe"
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\lang\*.*"
RMDir "$INSTDIR\lang"
RMDir "$INSTDIR"
${unregisterExtension} ".bin" "BIN File"
${unregisterExtension} ".hex" "HEX File"
${unregisterExtension} ".eepm" "EEPE File"
${unregisterExtension} ".companion9x" "EEPM File"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKCU "Software\companion9x"
SectionEnd
Function LaunchLink
ExecShell "" "$INSTDIR\companion9x.exe"
FunctionEnd
;NSIS Modern User Interface
;Start Menu Folder Selection Example Script
;Written by Joost Verburg
;--------------------------------
;Include Modern UI
!include "MUI2.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
;--------------------------------
;General
;Name and file
Name "openTx companion"
OutFile "companionInstall_v@C9X_VERSION@.exe"
;Default installation folder
InstallDir "$PROGRAMFILES\openTx companion"
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\companion9x" ""
;Compressor options
SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
;Request application privileges for Windows Vista
RequestExecutionLevel admin
;--------------------------------
;Variables
Var StartMenuFolder
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;Pages
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_INSTFILES
# These indented statements modify settings for MUI_PAGE_FINISH
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "French"
;--------------------------------
;Installer Sections
Section "openTx companion" SecDummy
SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "companion.exe"
File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll"
File "C:\MinGW\bin\libgcc_s_dw2-1.dll"
File "C:\MinGW\bin\mingwm10.dll"
File "C:\MinGW\bin\libstdc++-6.dll"
File "@QT_BINARY_DIR@\QtCore4.dll"
File "@QT_BINARY_DIR@\QtGui4.dll"
File "@QT_BINARY_DIR@\QtXml4.dll"
File "@QT_BINARY_DIR@\QtNetwork4.dll"
File "@QT_BINARY_DIR@\Phonon4.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
CreateDirectory "$INSTDIR\lang"
SetOutPath "$INSTDIR\lang"
File "*.qm"
SetOutPath "$INSTDIR"
;Store installation folder
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
;--------------------------------
;Descriptions
;Language strings
LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx"
LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de réglages et modèles pour openTx"
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
Section "Uninstall"
;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\companion.exe"
Delete "$INSTDIR\libxerces-c-3-1.dll"
Delete "$INSTDIR\libgcc_s_dw2-1.dll"
Delete "$INSTDIR\mingwm10.dll"
Delete "$INSTDIR\libstdc++-6.dll"
Delete "$INSTDIR\QtCore4.dll"
Delete "$INSTDIR\QtGui4.dll"
Delete "$INSTDIR\QtNetwork4.dll"
Delete "$INSTDIR\Phonon4.dll"
Delete "$INSTDIR\QtXml4.dll"
Delete "$INSTDIR\avrdude.exe"
Delete "$INSTDIR\avrdude.conf"
Delete "$INSTDIR\libusb0.dll"
Delete "$INSTDIR\dfu-util.exe"
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\lang\*.*"
RMDir "$INSTDIR\lang"
RMDir "$INSTDIR"
${unregisterExtension} ".bin" "BIN File"
${unregisterExtension} ".hex" "HEX File"
${unregisterExtension} ".eepm" "EEPE File"
${unregisterExtension} ".companion" "EEPM File"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKCU "Software\companion9x"
SectionEnd
Function LaunchLink
ExecShell "" "$INSTDIR\companion.exe"
FunctionEnd
companion/targets/windows/companion9x-vs.nsi.in → companion/targets/windows/companion-vs.nsi.in
+214 -214
View File
@@ -1,214 +1,214 @@
;NSIS Modern User Interface
;Start Menu Folder Selection Example Script
;Written by Joost Verburg
;--------------------------------
;Include Modern UI
!include "MUI2.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
;--------------------------------
;General
;Name and file
Name "companion9x"
OutFile "companion9xInstall_v@C9X_VERSION@.exe"
;Default installation folder
InstallDir "$PROGRAMFILES\companion9x"
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\companion9x" ""
;Compressor options
SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
;Request application privileges for Windows Vista
RequestExecutionLevel admin
;--------------------------------
;Variables
Var StartMenuFolder
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;File Exists Macro
; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
!macro !defineifexist _VAR_NAME _FILE_NAME
!tempfile _TEMPFILE
!ifdef NSIS_WIN32_MAKENSIS
; Windows - cmd.exe
!system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
!else
; Posix - sh
!system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
!endif
!include '${_TEMPFILE}'
!delfile '${_TEMPFILE}'
!undef _TEMPFILE
!macroend
!define !defineifexist "!insertmacro !defineifexist"
;--------------------------------
;Pages
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_INSTFILES
# These indented statements modify settings for MUI_PAGE_FINISH
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion9x"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "French"
;--------------------------------
;Installer Sections
Section "companion9x" SecDummy
SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "Release\companion9x.exe"
${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
!ifdef PTHREAD_WINDIR
File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
!else
File "@SYSDIR@\system32\pthreadVC2.dll"
!endif
File "C:\Programs\xerces-vc\bin\xerces-c_3_1.dll"
File "C:\Programs\SDL\lib\SDL.dll"
File "@SYSDIR@\msvcp100.dll"
File "@SYSDIR@\msvcr100.dll"
File "@QT_BINARY_DIR@\QtCore4.dll"
File "@QT_BINARY_DIR@\QtGui4.dll"
File "@QT_BINARY_DIR@\QtNetwork4.dll"
File "@QT_BINARY_DIR@\Phonon4.dll"
File "@QT_BINARY_DIR@\QtXml4.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll"
CreateDirectory "$INSTDIR\lang"
SetOutPath "$INSTDIR\lang"
File "*.qm"
SetOutPath "$INSTDIR"
;Store installation folder
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion9x.exe" ".bin" "BIN_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".companion9x" "EEPE_File"
${registerExtension} "$INSTDIR\companion9x.exe" ".eepm" "EEPM_File"
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk" "$INSTDIR\companion9x.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
;--------------------------------
;Descriptions
;Language strings
LangString DESC_SecDummy ${LANG_ENGLISH} "companion9x EEPROM editor."
LangString DESC_SecDummy ${LANG_FRENCH} "companion9x editeur d'EEPROM"
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
Section "Uninstall"
;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\companion9x.exe"
Delete "$INSTDIR\pthreadVC2.dll"
Delete "$INSTDIR\xerces-c_3_1.dll"
Delete "$INSTDIR\SDL.dll"
Delete "$INSTDIR\msvcp100.dll"
Delete "$INSTDIR\msvcr100.dll"
Delete "$INSTDIR\QtCore4.dll"
Delete "$INSTDIR\QtGui4.dll"
Delete "$INSTDIR\QtXml4.dll"
Delete "$INSTDIR\QtNetwork4.dll"
Delete "$INSTDIR\Phonon4.dll"
Delete "$INSTDIR\avrdude.exe"
Delete "$INSTDIR\avrdude.conf"
Delete "$INSTDIR\libusb0.dll"
Delete "$INSTDIR\dfu-util.exe"
Delete "$INSTDIR\libusb-1.0.dll"
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\lang\*.*"
RMDir "$INSTDIR\lang"
RMDir "$INSTDIR"
${unregisterExtension} ".bin" "BIN File"
${unregisterExtension} ".hex" "HEX File"
${unregisterExtension} ".eepm" "EEPE File"
${unregisterExtension} ".companion9x" "EEPM File"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion9x.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKCU "Software\companion9x"
SectionEnd
Function LaunchLink
ExecShell "" "$INSTDIR\companion9x.exe"
FunctionEnd
;NSIS Modern User Interface
;Start Menu Folder Selection Example Script
;Written by Joost Verburg
;--------------------------------
;Include Modern UI
!include "MUI2.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
;--------------------------------
;General
;Name and file
Name "openTx companion"
OutFile "companionInstall_v@C9X_VERSION@.exe"
;Default installation folder
InstallDir "$PROGRAMFILES\openTx companion"
;Get installation folder from registry if available
InstallDirRegKey HKCU "Software\companion9x" ""
;Compressor options
SetCompressor /FINAL /SOLID lzma
SetCompressorDictSize 64
;Request application privileges for Windows Vista
RequestExecutionLevel admin
;--------------------------------
;Variables
Var StartMenuFolder
;--------------------------------
;Interface Settings
!define MUI_ABORTWARNING
;--------------------------------
;File Exists Macro
; See http://nsis.sourceforge.net/Check_if_a_file_exists_at_compile_time for documentation
!macro !defineifexist _VAR_NAME _FILE_NAME
!tempfile _TEMPFILE
!ifdef NSIS_WIN32_MAKENSIS
; Windows - cmd.exe
!system 'if exist "${_FILE_NAME}" echo !define ${_VAR_NAME} > "${_TEMPFILE}"'
!else
; Posix - sh
!system 'if [ -e "${_FILE_NAME}" ]; then echo "!define ${_VAR_NAME}" > "${_TEMPFILE}"; fi'
!endif
!include '${_TEMPFILE}'
!delfile '${_TEMPFILE}'
!undef _TEMPFILE
!macroend
!define !defineifexist "!insertmacro !defineifexist"
;--------------------------------
;Pages
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\companion9x"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
!insertmacro MUI_PAGE_INSTFILES
# These indented statements modify settings for MUI_PAGE_FINISH
!define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_CHECKED
!define MUI_FINISHPAGE_RUN_TEXT "Launch companion"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
# !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
# !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\readme.txt
!insertmacro MUI_PAGE_FINISH
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "French"
;--------------------------------
;Installer Sections
Section "openTx companion" SecDummy
SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "Release\companion.exe"
${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
!ifdef PTHREAD_WINDIR
File "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
!else
File "@SYSDIR@\system32\pthreadVC2.dll"
!endif
File "C:\Programs\xerces-vc\bin\xerces-c_3_1.dll"
File "C:\Programs\SDL\lib\SDL.dll"
File "@SYSDIR@\msvcp100.dll"
File "@SYSDIR@\msvcr100.dll"
File "@QT_BINARY_DIR@\QtCore4.dll"
File "@QT_BINARY_DIR@\QtGui4.dll"
File "@QT_BINARY_DIR@\QtNetwork4.dll"
File "@QT_BINARY_DIR@\Phonon4.dll"
File "@QT_BINARY_DIR@\QtXml4.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll"
CreateDirectory "$INSTDIR\lang"
SetOutPath "$INSTDIR\lang"
File "*.qm"
SetOutPath "$INSTDIR"
;Store installation folder
WriteRegStr HKCU "Software\companion9x" "" $INSTDIR
;Associate with extentions ,bin and .hex
${registerExtension} "$INSTDIR\companion.exe" ".bin" "BIN_File"
${registerExtension} "$INSTDIR\companion.exe" ".hex" "HEX_File"
${registerExtension} "$INSTDIR\companion.exe" ".companion" "EEPE_File"
${registerExtension} "$INSTDIR\companion.exe" ".eepm" "EEPM_File"
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\companion.lnk" "$INSTDIR\companion.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
!insertmacro MUI_STARTMENU_WRITE_END
SectionEnd
;--------------------------------
;Descriptions
;Language strings
LangString DESC_SecDummy ${LANG_ENGLISH} "Models and settings editor for openTx"
LangString DESC_SecDummy ${LANG_FRENCH} "Editeur de réglages et modèles pour openTx"
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SecDummy} $(DESC_SecDummy)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
;--------------------------------
;Uninstaller Section
Section "Uninstall"
;ADD YOUR OWN FILES HERE...
Delete "$INSTDIR\license.txt"
Delete "$INSTDIR\companion.exe"
Delete "$INSTDIR\pthreadVC2.dll"
Delete "$INSTDIR\xerces-c_3_1.dll"
Delete "$INSTDIR\SDL.dll"
Delete "$INSTDIR\msvcp100.dll"
Delete "$INSTDIR\msvcr100.dll"
Delete "$INSTDIR\QtCore4.dll"
Delete "$INSTDIR\QtGui4.dll"
Delete "$INSTDIR\QtXml4.dll"
Delete "$INSTDIR\QtNetwork4.dll"
Delete "$INSTDIR\Phonon4.dll"
Delete "$INSTDIR\avrdude.exe"
Delete "$INSTDIR\avrdude.conf"
Delete "$INSTDIR\libusb0.dll"
Delete "$INSTDIR\dfu-util.exe"
Delete "$INSTDIR\libusb-1.0.dll"
Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\lang\*.*"
RMDir "$INSTDIR\lang"
RMDir "$INSTDIR"
${unregisterExtension} ".bin" "BIN File"
${unregisterExtension} ".hex" "HEX File"
${unregisterExtension} ".eepm" "EEPE File"
${unregisterExtension} ".companion" "EEPM File"
!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
Delete "$SMPROGRAMS\$StartMenuFolder\companion.lnk"
Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKCU "Software\companion9x"
SectionEnd
Function LaunchLink
ExecShell "" "$INSTDIR\companion.exe"
FunctionEnd