diff --git a/companion/src/customizesplashdialog.cpp b/companion/src/customizesplashdialog.cpp index 11954bc9c..070fe3dc0 100644 --- a/companion/src/customizesplashdialog.cpp +++ b/companion/src/customizesplashdialog.cpp @@ -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 ) diff --git a/companion/src/customizesplashdialog.h b/companion/src/customizesplashdialog.h index 16141e1ae..8ae954d1c 100644 --- a/companion/src/customizesplashdialog.h +++ b/companion/src/customizesplashdialog.h @@ -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 ); diff --git a/companion/src/customizesplashdialog.ui b/companion/src/customizesplashdialog.ui index 4931052d1..b98d87907 100644 --- a/companion/src/customizesplashdialog.ui +++ b/companion/src/customizesplashdialog.ui @@ -268,6 +268,16 @@ + + + + false + + + Load Profile + + + @@ -557,6 +567,16 @@ + + + + false + + + Load Profile + + + @@ -605,7 +625,6 @@ leftFileNameEdit leftInvertButton - leftLoadFwButton leftLoadPictButton leftSaveButton copyLeftToRightButton diff --git a/companion/src/fwpreferencesdialog.ui b/companion/src/fwpreferencesdialog.ui index 88d876e63..798862ded 100644 --- a/companion/src/fwpreferencesdialog.ui +++ b/companion/src/fwpreferencesdialog.ui @@ -6,8 +6,8 @@ 0 0 - 632 - 695 + 620 + 658 @@ -23,7 +23,7 @@ - Download Firmware and Voice + Downloads and Profiles @@ -32,22 +32,22 @@ 6 - - + + - Options + Download Voice - - + + - Save Profile + Offer to write FW to Tx after download - - + + 0 @@ -59,7 +59,7 @@ - + @@ -72,21 +72,29 @@ - - - - - 0 - 0 - - + + - CheckBox + Download FW - - + + + + Options + + + + + + + Save Profile + + + + + 0 @@ -99,6 +107,58 @@ + + + + 0 + 0 + + + + CheckBox + + + + + + + + 0 + 0 + + + + CheckBox + + + + + + + + 0 + 0 + + + + CheckBox + + + + + + + + 0 + 0 + + + + CheckBox + + + + @@ -111,44 +171,79 @@ - - - - - 50 - 16777215 - - - - Set language of voice. -May be different from firmware language - - - - - - - - 0 - 0 - - - - SD Structure path - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - + Processor ID - + + + + + 0 + 0 + + + + CheckBox + + + + + + + + 0 + 0 + + + + FwInfo + + + + + + + + 0 + 0 + + + + CheckBox + + + + + + + + 0 + 0 + + + + CheckBox + + + + + + + + 0 + 0 + + + + CheckBox + + + + Menu Language @@ -158,7 +253,7 @@ May be different from firmware language - + @@ -171,14 +266,7 @@ May be different from firmware language - - - - Voice Language - - - - + @@ -194,7 +282,7 @@ May be different from firmware language - + @@ -207,7 +295,7 @@ May be different from firmware language - + @@ -220,7 +308,7 @@ May be different from firmware language - + @@ -274,17 +362,7 @@ Mode 4: - - - - Profile Number - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - + @@ -297,7 +375,7 @@ Mode 4: - + @@ -310,7 +388,20 @@ Mode 4: - + + + + + 0 + 0 + + + + CheckBox + + + + @@ -326,7 +417,10 @@ Mode 4: - + + + + @@ -334,6 +428,13 @@ Mode 4: 0 + + + Sans Serif + 75 + true + + Firmware Type @@ -342,7 +443,10 @@ Mode 4: - + + + + @@ -492,10 +596,7 @@ This is used by the templated to determine which channel goes to what number out - - - - + @@ -508,7 +609,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -521,10 +622,7 @@ This is used by the templated to determine which channel goes to what number out - - - - + @@ -537,7 +635,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -550,20 +648,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - CheckBox - - - - + @@ -576,20 +661,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - CheckBox - - - - + @@ -602,33 +674,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - + @@ -641,7 +687,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -654,7 +700,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -667,7 +713,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -680,7 +726,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -693,17 +739,7 @@ This is used by the templated to determine which channel goes to what number out - - - - true - - - true - - - - + @@ -716,7 +752,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -729,7 +765,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -742,10 +778,10 @@ This is used by the templated to determine which channel goes to what number out - + - + 0 0 @@ -755,7 +791,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -768,7 +804,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -781,7 +817,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -794,7 +830,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -807,7 +843,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -820,7 +856,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -833,7 +869,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -846,7 +882,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -859,7 +895,7 @@ This is used by the templated to determine which channel goes to what number out - + @@ -872,33 +908,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - CheckBox - - - - + @@ -911,51 +921,14 @@ This is used by the templated to determine which channel goes to what number out - - - - - 50 - 16777215 - - - - 1 - - - 10 - - - - - - - Open Folder - - - - - - - Offer to write FW to Tx after download - - - - + Append version number to FW file name - - - - Download Voice - - - - + Qt::Horizontal @@ -965,88 +938,38 @@ This is used by the templated to determine which channel goes to what number out - - - - Qt::Horizontal + + + + Export - - - - Qt::Horizontal + + + + Import - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - - - - - 0 - 0 - + + + + + Sans Serif + 75 + true + - CheckBox + Profile + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - Download FW - - - - - - - - 0 - 0 - - - - CheckBox - - - - - - - - 0 - 0 - - - - FwInfo - - - - + @@ -1059,30 +982,7 @@ This is used by the templated to determine which channel goes to what number out - - - - - 0 - 0 - - - - Profile Splash Screen - - - - - - - Profile Name - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - + true @@ -1092,45 +992,146 @@ This is used by the templated to determine which channel goes to what number out - - - - - - - Export + + + + + 50 + 16777215 + + + + Set language of voice. +May be different from firmware language - - - - Import - - - - + Open Image - + + + + + Sans Serif + 75 + true + + + + Voice Language + + + + + + + + 0 + 0 + + + + Splash Screen + + + + Clear Image + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 1 + + + 10 + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + Open Folder + + + + + + + true + + + true + + + + + + + + 0 + 0 + + + + SD Structure path + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + buttonBox downloadVerCB CPU_ID_LE - sdPath - sdPathButton langCombo optionCheckBox_2 optionCheckBox_1 @@ -1178,9 +1179,6 @@ This is used by the templated to determine which channel goes to what number out channelorderCB renameFirmware burnFirmware - voiceCombo - voice_dnld - ProfSlot_SB diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index cba6c98be..fd9cfc9f9 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -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); diff --git a/companion/src/translations/companion_sv.ts b/companion/src/translations/companion_sv.ts index 55546a84e..f01bdcaba 100644 --- a/companion/src/translations/companion_sv.ts +++ b/companion/src/translations/companion_sv.ts @@ -2312,17 +2312,15 @@ Vill du ladda ned den nu ? Redigera programmets inställningar - &Download Firmware and Voice... - &Ladda ned Firmware och Ljud... + &Ladda ned Firmware och Ljud... - Download firmware and voice files - Ladda ned Firmware- och Ljud-filer + Ladda ned Firmware- och Ljud-filer - + Show Companion changelog Visa en lista med förändringar av Companion @@ -2764,7 +2762,17 @@ Starta skrivningen i alla fall ? Om Companion - + + &Downloads and Profiles... + &Nedladdningar och Profiler... + + + + Firmware and voice file downloads as well as profile definition. + Ladda ned firmware och röstfiler. Definera profildata. + + + Check for new version of Companion Sök efter ny version av Companion @@ -7648,25 +7656,31 @@ p, li { white-space: pre-wrap; } - + Invert Invertera - - + + Load FW Ladda FW - - + + Load Pict Ladda Bild - - + + + Load Profile + Ladda Profil + + + + Save Spara @@ -7683,8 +7697,8 @@ p, li { white-space: pre-wrap; } Ladda bild - - + + Open Splash Library Öppna bildbibliotek @@ -7704,7 +7718,7 @@ p, li { white-space: pre-wrap; } - + @@ -7712,7 +7726,7 @@ p, li { white-space: pre-wrap; } Fel - + Could not find bitmap to replace in file Det finns ingen bild att byta i firmware-filen @@ -7728,7 +7742,7 @@ p, li { white-space: pre-wrap; } - + Cannot load %1. Kunde inte ladda %1. @@ -7768,8 +7782,8 @@ p, li { white-space: pre-wrap; } PNG bilder (*.png);; - - + + ... @@ -7947,19 +7961,20 @@ p, li { white-space: pre-wrap; } fwPreferencesDialog - Download Firmware and Voice - Ladda ned Firmware och Ljud + Ladda ned Firmware och Ljud - + + + - + - + @@ -7974,8 +7989,6 @@ p, li { white-space: pre-wrap; } - - @@ -7992,8 +8005,8 @@ p, li { white-space: pre-wrap; } - - + + CheckBox Kryssruta @@ -8002,14 +8015,14 @@ p, li { white-space: pre-wrap; } Hårdvaruprofil-namn - + Set language of voice. May be different from firmware language Välj språk för röstfunktioner. Får skilja från språket för firmware - + SD Structure path Sökväg till SD-struktur @@ -8032,7 +8045,7 @@ Får skilja från språket för firmware Röst - + Channel Order Kanalordning @@ -8102,7 +8115,7 @@ Mode 4: Profilposition - + Options Val @@ -8111,7 +8124,7 @@ Mode 4: Firmware-typer - + Channel order This is used by the templated to determine which channel goes to what number output. @@ -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. - + Open Folder Öppna Katalog - + Offer to write FW to Tx after download Skriv FW till Tx efter nedladdning - + Profile Splash Screen Profilens startbild - Profile Name - Profilnamn + Profilnamn - + Import Import @@ -8150,47 +8162,56 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.Export - + + Downloads and Profiles + Nedladdning och Profiler + + + Save Profile Spara Profil - + Menu Language Menyspråk - + + Profile + Profil + + + Voice Language Röstspråk - Profile Number - Profilnummer + Profilnummer - + Firmware Type Firmware-typ - + Append version number to FW file name Addera versionsnumret till FW-filnamnet - + Download Voice Ladda Röstfiler - + FwInfo --- - + Open Image Öppna bild @@ -8200,12 +8221,12 @@ Används av mallarna för att koppla ihop kanaler med numrerade utgångar.Ta bort Bild - + Download FW Ladda ned Firmware - + Check for updates Sök efter uppdateringar