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

Merge pull request #668 from opentx/dvogonen/simplify_companion_preferences_dialog_632

Browse Source 
Dvogonen/simplify companion preferences dialog 632
This commit is contained in:
Bertrand Songis
2014-02-08 17:17:14 +01:00
parent 2aca8a1338 417ab94993
commit 1ef2e89972
6 changed files with 468 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/customizesplashdialog.cpp
+12 -6
View File
@@ -55,9 +55,9 @@ right.copyImage(left);
}
void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFwButton_clicked(left);}
void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFwButton_clicked(right);}
void customizeSplashDialog::loadFwButton_clicked(Side side)
void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
void customizeSplashDialog::loadFirmware(Side side)
{
QSettings settings;
QString fileName = QFileDialog::getOpenFileName(this, tr("Open"), settings.value("lastFlashDir").toString(), FLASH_FILES_FILTER);
@@ -84,9 +84,9 @@ void customizeSplashDialog::loadFwButton_clicked(Side side)
}
}
void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPictButton_clicked(left);}
void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPictButton_clicked(right);}
void customizeSplashDialog::loadPictButton_clicked(Side side)
void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
void customizeSplashDialog::loadPicture(Side side)
{
QString supportedImageFormats;
for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
@@ -132,6 +132,12 @@ void customizeSplashDialog::loadPictButton_clicked(Side side)
side.invertButton->setEnabled(true);
}
void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
void customizeSplashDialog::loadProfile(Side side)
{
}
void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
void customizeSplashDialog::libraryButton_clicked( Side side )
companion/src/customizesplashdialog.h
+6 -3
View File
@@ -10,7 +10,7 @@ namespace Ui
class customizeSplashDialog;
}
enum Source {FW, PICT, UNDEFINED};
enum Source {FW, PICT, PROFILE, UNDEFINED};
class Side
{
@@ -40,12 +40,14 @@ public:
private slots:
void on_leftLoadFwButton_clicked();
void on_leftLoadPictButton_clicked();
void on_leftLoadProfileButton_clicked();
void on_leftLibraryButton_clicked();
void on_leftSaveButton_clicked();
void on_leftInvertButton_clicked();
void on_rightLoadFwButton_clicked();
void on_rightLoadPictButton_clicked();
void on_rightLoadProfileButton_clicked();
void on_rightLibraryButton_clicked();
void on_rightSaveButton_clicked();
void on_rightInvertButton_clicked();
@@ -54,8 +56,9 @@ private slots:
void on_copyLeftToRightButton_clicked();
private:
void loadFwButton_clicked( Side );
void loadPictButton_clicked( Side );
void loadFirmware( Side );
void loadPicture( Side );
void loadProfile( Side );
void libraryButton_clicked( Side );
void saveButton_clicked( Side );
void invertButton_clicked( Side );
companion/src/customizesplashdialog.ui
+20 -1
View File
@@ -268,6 +268,16 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="leftLoadProfileButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Load Profile</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -557,6 +567,16 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="rightLoadProfileButton">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Load Profile</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
@@ -605,7 +625,6 @@
<tabstops>
<tabstop>leftFileNameEdit</tabstop>
<tabstop>leftInvertButton</tabstop>
<tabstop>leftLoadFwButton</tabstop>
<tabstop>leftLoadPictButton</tabstop>
<tabstop>leftSaveButton</tabstop>
<tabstop>copyLeftToRightButton</tabstop>
companion/src/fwpreferencesdialog.ui
+355 -357
View File
File diff suppressed because it is too large Load Diff
companion/src/mainwindow.cpp
+2 -2
View File
@@ -1703,8 +1703,8 @@ void MainWindow::createActions()
appPreferencesAct->setStatusTip(tr("Edit application preferences"));
connect(appPreferencesAct, SIGNAL(triggered()), this, SLOT(appPreferences()));
fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Download Firmware and Voice..."), this);
fwPreferencesAct->setStatusTip(tr("Download firmware and voice files"));
fwPreferencesAct = new QAction(CompanionIcon("fwpreferences.png"), tr("&Downloads and Profiles..."), this);
fwPreferencesAct->setStatusTip(tr("Firmware and voice file downloads as well as profile definition."));
connect(fwPreferencesAct, SIGNAL(triggered()), this, SLOT(fwPreferences()));
checkForUpdatesAct = new QAction(CompanionIcon("update.png"), tr("&Check for updates..."), this);
companion/src/translations/companion_sv.ts
+73 -52
View File
@@ -2312,17 +2312,15 @@ Vill du ladda ned den nu ?</translation>
<translation>Redigera programmets inställningar</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Download Firmware and Voice...</source>
<translation>&amp;Ladda ned Firmware och Ljud...</translation>
<translation type="obsolete">&amp;Ladda ned Firmware och Ljud...</translation>
</message>
<message>
<location line="+1"/>
<source>Download firmware and voice files</source>
<translation>Ladda ned Firmware- och Ljud-filer</translation>
<translation type="obsolete">Ladda ned Firmware- och Ljud-filer</translation>
</message>
<message>
<location line="+12"/>
<location line="+16"/>
<source>Show Companion changelog</source>
<translation>Visa en lista med förändringar av Companion</translation>
</message>
@@ -2764,7 +2762,17 @@ Starta skrivningen i alla fall ?</translation>
<translation>Om Companion</translation>
</message>
<message>
<location line="+98"/>
<location line="+93"/>
<source>&amp;Downloads and Profiles...</source>
<translation>&amp;Nedladdningar och Profiler...</translation>
</message>
<message>
<location line="+1"/>
<source>Firmware and voice file downloads as well as profile definition.</source>
<translation>Ladda ned firmware och röstfiler. Definera profildata.</translation>
</message>
<message>
<location line="+4"/>
<source>Check for new version of Companion</source>
<translation>Sök efter ny version av Companion</translation>
</message>
@@ -7648,25 +7656,31 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+187"/>
<location line="+286"/>
<location line="+293"/>
<source>Invert</source>
<translation>Invertera</translation>
</message>
<message>
<location line="-236"/>
<location line="+289"/>
<location line="-243"/>
<location line="+296"/>
<source>Load FW</source>
<translation>Ladda FW</translation>
</message>
<message>
<location line="-282"/>
<location line="+289"/>
<location line="-289"/>
<location line="+296"/>
<source>Load Pict</source>
<translation>Ladda Bild</translation>
</message>
<message>
<location line="-266"/>
<location line="+289"/>
<location line="-289"/>
<location line="+296"/>
<source>Load Profile</source>
<translation>Ladda Profil</translation>
</message>
<message>
<location line="-273"/>
<location line="+296"/>
<source>Save</source>
<translation>Spara</translation>
</message>
@@ -7683,8 +7697,8 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Ladda bild</translation>
</message>
<message>
<location line="-346"/>
<location line="+286"/>
<location line="-360"/>
<location line="+293"/>
<source>Open Splash Library</source>
<translation>Öppna bildbibliotek</translation>
</message>
@@ -7704,7 +7718,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="+8"/>
<location line="+33"/>
<location line="+42"/>
<location line="+48"/>
<location line="+36"/>
<location line="+7"/>
<location line="+9"/>
@@ -7712,7 +7726,7 @@ p, li { white-space: pre-wrap; }
<translation>Fel</translation>
</message>
<message>
<location line="-127"/>
<location line="-133"/>
<source>Could not find bitmap to replace in file</source>
<translation>Det finns ingen bild att byta i firmware-filen</translation>
</message>
@@ -7728,7 +7742,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+7"/>
<location line="+42"/>
<location line="+48"/>
<source>Cannot load %1.</source>
<translation>Kunde inte ladda %1.</translation>
</message>
@@ -7768,8 +7782,8 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">PNG bilder (*.png);;</translation>
</message>
<message>
<location filename="../customizesplashdialog.ui" line="-283"/>
<location line="+81"/>
<location filename="../customizesplashdialog.ui" line="-290"/>
<location line="+88"/>
<location line="+10"/>
<location line="+195"/>
<source>...</source>
@@ -7947,19 +7961,20 @@ p, li { white-space: pre-wrap; }
<context>
<name>fwPreferencesDialog</name>
<message>
<location filename="../fwpreferencesdialog.ui" line="+26"/>
<source>Download Firmware and Voice</source>
<translation>Ladda ned Firmware och Ljud</translation>
<translation type="obsolete">Ladda ned Firmware och Ljud</translation>
</message>
<message>
<location line="+32"/>
<location filename="../fwpreferencesdialog.ui" line="+84"/>
<location line="+13"/>
<location line="+34"/>
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
<location line="+96"/>
<location line="+75"/>
<location line="+13"/>
<location line="+77"/>
<location line="+67"/>
<location line="+13"/>
<location line="+198"/>
<location line="+13"/>
@@ -7974,8 +7989,6 @@ p, li { white-space: pre-wrap; }
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
<location line="+23"/>
<location line="+13"/>
<location line="+13"/>
@@ -7992,8 +8005,8 @@ p, li { white-space: pre-wrap; }
<location line="+13"/>
<location line="+13"/>
<location line="+13"/>
<location line="+102"/>
<location line="+20"/>
<location line="+58"/>
<location line="+26"/>
<source>CheckBox</source>
<translation>Kryssruta</translation>
</message>
@@ -8002,14 +8015,14 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Hårdvaruprofil-namn</translation>
</message>
<message>
<location line="-909"/>
<location line="+50"/>
<source>Set language of voice.
May be different from firmware language</source>
<translation>Välj språk för röstfunktioner.
Får skilja från språket för firmware</translation>
</message>
<message>
<location line="+14"/>
<location line="-864"/>
<source>SD Structure path</source>
<translation>Sökväg till SD-struktur</translation>
</message>
@@ -8032,7 +8045,7 @@ Får skilja från språket för firmware</translation>
<translation type="obsolete">Röst</translation>
</message>
<message>
<location line="+20"/>
<location line="+13"/>
<source>Channel Order</source>
<translation>Kanalordning</translation>
</message>
@@ -8102,7 +8115,7 @@ Mode 4:
<translation type="obsolete">Profilposition</translation>
</message>
<message>
<location line="-234"/>
<location line="-213"/>
<source>Options</source>
<translation>Val</translation>
</message>
@@ -8111,7 +8124,7 @@ Mode 4:
<translation type="obsolete">Firmware-typer</translation>
</message>
<message>
<location line="+328"/>
<location line="+297"/>
<source>Channel order
This is used by the templated to determine which channel goes to what number output.</source>
@@ -8120,27 +8133,26 @@ This is used by the templated to determine which channel goes to what number out
Används av mallarna för att koppla ihop kanaler med numrerade utgångar.</translation>
</message>
<message>
<location line="+567"/>
<location line="+525"/>
<source>Open Folder</source>
<translation>Öppna Katalog</translation>
</message>
<message>
<location line="+7"/>
<location line="-872"/>
<source>Offer to write FW to Tx after download</source>
<translation>Skriv FW till Tx efter nedladdning</translation>
</message>
<message>
<location line="+131"/>
<location line="+1020"/>
<source>Profile Splash Screen</source>
<translation>Profilens startbild</translation>
</message>
<message>
<location line="+7"/>
<source>Profile Name</source>
<translation>Profilnamn</translation>
<translation type="obsolete">Profilnamn</translation>
</message>
<message>
<location line="+30"/>
<location line="-44"/>
<source>Import</source>
<translation>Import</translation>
</message>
@@ -8150,47 +8162,56 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.</tran
<translation>Export</translation>
</message>
<message>
<location line="-1056"/>
<location line="-1004"/>
<source>Downloads and Profiles</source>
<translation>Nedladdning och Profiler</translation>
</message>
<message>
<location line="+92"/>
<source>Save Profile</source>
<translation>Spara Profil</translation>
</message>
<message>
<location line="+109"/>
<location line="+95"/>
<source>Menu Language</source>
<translation>Menyspråk</translation>
</message>
<message>
<location line="+23"/>
<location line="+831"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
<message>
<location line="+24"/>
<source>Voice Language</source>
<translation>Röstspråk</translation>
</message>
<message>
<location line="+103"/>
<source>Profile Number</source>
<translation>Profilnummer</translation>
<translation type="obsolete">Profilnummer</translation>
</message>
<message>
<location line="+58"/>
<location line="-688"/>
<source>Firmware Type</source>
<translation>Firmware-typ</translation>
</message>
<message>
<location line="+609"/>
<location line="+560"/>
<source>Append version number to FW file name</source>
<translation>Addera versionsnumret till FW-filnamnet</translation>
</message>
<message>
<location line="+7"/>
<location line="-869"/>
<source>Download Voice</source>
<translation>Ladda Röstfiler</translation>
</message>
<message>
<location line="+91"/>
<location line="+926"/>
<source>FwInfo</source>
<translation>---</translation>
</message>
<message>
<location line="+70"/>
<location line="+101"/>
<source>Open Image</source>
<translation>Öppna bild</translation>
</message>
@@ -8200,12 +8221,12 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.</tran
<translation>Ta bort Bild</translation>
</message>
<message>
<location line="-103"/>
<location line="-1001"/>
<source>Download FW</source>
<translation>Ladda ned Firmware</translation>
</message>
<message>
<location line="+39"/>
<location line="+919"/>
<source>Check for updates</source>
<translation>Sök efter uppdateringar</translation>
</message>