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

Moved fields around in the fwPref dialog to make it clear what affects the current settings (profile) and what configures the download.

Browse Source
This commit is contained in:
Kjell Kernen
2014-02-08 16:41:06 +01:00
parent db1a459a47
commit 5c70c2f415
6 changed files with 327 additions and 298 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
+214 -234
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>632</width>
<height>695</height>
<width>620</width>
<height>663</height>
</rect>
</property>
<property name="sizePolicy">
@@ -23,7 +23,7 @@
</size>
</property>
<property name="windowTitle">
<string>Download Firmware and Voice</string>
<string>Downloads and Profiles</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="verticalSpacing">
@@ -32,22 +32,48 @@
<property name="margin">
<number>6</number>
</property>
<item row="9" column="0" colspan="3">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Options</string>
<item row="24" column="4">
<widget class="QSpinBox" name="ProfSlot_SB">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
</widget>
</item>
<item row="40" column="6">
<widget class="QPushButton" name="ProfSave_PB">
<property name="text">
<string>Save Profile</string>
<item row="21" column="2" colspan="4">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="13" column="5">
<widget class="QCheckBox" name="optionCheckBox_19">
<item row="35" column="2" colspan="3">
<widget class="QCheckBox" name="burnFirmware">
<property name="text">
<string>Offer to write FW to Tx after download</string>
</property>
</widget>
</item>
<item row="24" column="2" colspan="2">
<widget class="QLineEdit" name="ProfName_LE"/>
</item>
<item row="22" column="5">
<widget class="QPushButton" name="voice_dnld">
<property name="text">
<string>Download Voice</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QCheckBox" name="optionCheckBox_9">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -59,7 +85,7 @@
</property>
</widget>
</item>
<item row="11" column="4">
<item row="11" column="3">
<widget class="QCheckBox" name="optionCheckBox_10">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -72,7 +98,54 @@
</property>
</widget>
</item>
<item row="19" column="5">
<widget class="QPushButton" name="fw_dnld">
<property name="text">
<string>Download FW</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Options</string>
</property>
</widget>
</item>
<item row="42" column="5">
<widget class="QPushButton" name="ProfSave_PB">
<property name="text">
<string>Save Profile</string>
</property>
</widget>
</item>
<item row="13" column="4">
<widget class="QCheckBox" name="optionCheckBox_19">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="10" column="5">
<widget class="QCheckBox" name="optionCheckBox_8">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="10" column="4">
<widget class="QCheckBox" name="optionCheckBox_7">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -85,7 +158,7 @@
</property>
</widget>
</item>
<item row="12" column="5">
<item row="12" column="4">
<widget class="QCheckBox" name="optionCheckBox_15">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -98,7 +171,7 @@
</property>
</widget>
</item>
<item row="9" column="5">
<item row="9" column="4">
<widget class="QCheckBox" name="optionCheckBox_3">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -111,21 +184,7 @@
</property>
</widget>
</item>
<item row="35" column="3" colspan="2">
<widget class="QComboBox" name="voiceCombo">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Set language of voice.
May be different from firmware language</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<item row="6" column="0" colspan="2">
<widget class="QLabel" name="sdPathLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -141,14 +200,14 @@ May be different from firmware language</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="CPU_ID_LABEL">
<property name="text">
<string>Processor ID</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="3">
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="langLabel">
<property name="text">
<string>Menu Language</string>
@@ -158,7 +217,7 @@ May be different from firmware language</string>
</property>
</widget>
</item>
<item row="29" column="0" colspan="3">
<item row="32" column="0" colspan="2">
<widget class="QLabel" name="label_14">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -171,14 +230,7 @@ May be different from firmware language</string>
</property>
</widget>
</item>
<item row="35" column="0" colspan="3">
<widget class="QLabel" name="voiceLabel">
<property name="text">
<string>Voice Language</string>
</property>
</widget>
</item>
<item row="30" column="0" colspan="3">
<item row="33" column="0" colspan="2">
<widget class="QLabel" name="label_13">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
@@ -194,7 +246,7 @@ May be different from firmware language</string>
</property>
</widget>
</item>
<item row="9" column="3">
<item row="9" column="2">
<widget class="QCheckBox" name="optionCheckBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -207,7 +259,7 @@ May be different from firmware language</string>
</property>
</widget>
</item>
<item row="18" column="3">
<item row="18" column="2">
<widget class="QCheckBox" name="optionCheckBox_37">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -220,7 +272,7 @@ May be different from firmware language</string>
</property>
</widget>
</item>
<item row="29" column="3" colspan="2">
<item row="32" column="2" colspan="2">
<widget class="QComboBox" name="stickmodeCB">
<property name="maximumSize">
<size>
@@ -274,17 +326,7 @@ Mode 4:
</item>
</widget>
</item>
<item row="39" column="0" colspan="3">
<widget class="QLabel" name="label">
<property name="text">
<string>Profile Number</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="16" column="3">
<item row="16" column="2">
<widget class="QCheckBox" name="optionCheckBox_29">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -297,7 +339,7 @@ Mode 4:
</property>
</widget>
</item>
<item row="9" column="4">
<item row="9" column="3">
<widget class="QCheckBox" name="optionCheckBox_1">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -310,7 +352,7 @@ Mode 4:
</property>
</widget>
</item>
<item row="7" column="3">
<item row="7" column="2">
<widget class="QComboBox" name="langCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -326,7 +368,7 @@ Mode 4:
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -342,7 +384,7 @@ Mode 4:
</property>
</widget>
</item>
<item row="30" column="3" colspan="2">
<item row="33" column="2" colspan="2">
<widget class="QComboBox" name="channelorderCB">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -492,10 +534,10 @@ This is used by the templated to determine which channel goes to what number out
</item>
</widget>
</item>
<item row="3" column="3" colspan="3">
<item row="3" column="2" colspan="3">
<widget class="QComboBox" name="downloadVerCB"/>
</item>
<item row="9" column="6">
<item row="9" column="5">
<widget class="QCheckBox" name="optionCheckBox_4">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -508,7 +550,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="15" column="6">
<item row="15" column="5">
<widget class="QCheckBox" name="optionCheckBox_28">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -521,10 +563,10 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="5" column="3" colspan="3">
<item row="5" column="2" colspan="3">
<widget class="QLineEdit" name="CPU_ID_LE"/>
</item>
<item row="19" column="4">
<item row="19" column="3">
<widget class="QCheckBox" name="optionCheckBox_42">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -537,7 +579,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="10" column="3">
<item row="10" column="2">
<widget class="QCheckBox" name="optionCheckBox_5">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -550,7 +592,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="12" column="4">
<item row="12" column="3">
<widget class="QCheckBox" name="optionCheckBox_14">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -563,7 +605,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="16" column="6">
<item row="16" column="5">
<widget class="QCheckBox" name="optionCheckBox_32">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -576,7 +618,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="12" column="6">
<item row="12" column="5">
<widget class="QCheckBox" name="optionCheckBox_16">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -589,7 +631,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="13" column="3">
<item row="13" column="2">
<widget class="QCheckBox" name="optionCheckBox_17">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -602,33 +644,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="11" column="3">
<widget class="QCheckBox" name="optionCheckBox_9">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="10" column="6">
<widget class="QCheckBox" name="optionCheckBox_8">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="17" column="5">
<item row="17" column="4">
<widget class="QCheckBox" name="optionCheckBox_35">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -641,7 +657,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="17" column="6">
<item row="17" column="5">
<widget class="QCheckBox" name="optionCheckBox_36">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -654,7 +670,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="12" column="3">
<item row="12" column="2">
<widget class="QCheckBox" name="optionCheckBox_13">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -667,7 +683,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="15" column="4">
<item row="15" column="3">
<widget class="QCheckBox" name="optionCheckBox_26">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -680,7 +696,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="19" column="3">
<item row="19" column="2">
<widget class="QCheckBox" name="optionCheckBox_41">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -693,7 +709,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="6" column="3" colspan="3">
<item row="6" column="2" colspan="3">
<widget class="QLineEdit" name="sdPath">
<property name="enabled">
<bool>true</bool>
@@ -703,7 +719,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="13" column="4">
<item row="13" column="3">
<widget class="QCheckBox" name="optionCheckBox_18">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -716,7 +732,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="11" column="5">
<item row="11" column="4">
<widget class="QCheckBox" name="optionCheckBox_11">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -729,7 +745,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="14" column="3">
<item row="14" column="2">
<widget class="QCheckBox" name="optionCheckBox_21">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -742,7 +758,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="13" column="6">
<item row="13" column="5">
<widget class="QCheckBox" name="optionCheckBox_20">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -755,7 +771,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="17" column="3">
<item row="17" column="2">
<widget class="QCheckBox" name="optionCheckBox_33">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -768,7 +784,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="14" column="6">
<item row="14" column="5">
<widget class="QCheckBox" name="optionCheckBox_24">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -781,7 +797,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="14" column="5">
<item row="14" column="4">
<widget class="QCheckBox" name="optionCheckBox_23">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -794,7 +810,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="14" column="4">
<item row="14" column="3">
<widget class="QCheckBox" name="optionCheckBox_22">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -807,7 +823,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="10" column="4">
<item row="10" column="3">
<widget class="QCheckBox" name="optionCheckBox_6">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -820,7 +836,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="18" column="4">
<item row="18" column="3">
<widget class="QCheckBox" name="optionCheckBox_38">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -833,7 +849,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="17" column="4">
<item row="17" column="3">
<widget class="QCheckBox" name="optionCheckBox_34">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -846,7 +862,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="16" column="5">
<item row="16" column="4">
<widget class="QCheckBox" name="optionCheckBox_31">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -859,7 +875,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="16" column="4">
<item row="16" column="3">
<widget class="QCheckBox" name="optionCheckBox_30">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -872,7 +888,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="11" column="6">
<item row="11" column="5">
<widget class="QCheckBox" name="optionCheckBox_12">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -885,7 +901,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="15" column="3">
<item row="15" column="2">
<widget class="QCheckBox" name="optionCheckBox_25">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -898,7 +914,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="15" column="5">
<item row="15" column="4">
<widget class="QCheckBox" name="optionCheckBox_27">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -911,51 +927,35 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="39" column="3">
<widget class="QSpinBox" name="ProfSlot_SB">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
</widget>
</item>
<item row="6" column="6">
<item row="6" column="5">
<widget class="QPushButton" name="sdPathButton">
<property name="text">
<string>Open Folder</string>
</property>
</widget>
</item>
<item row="32" column="3" colspan="3">
<widget class="QCheckBox" name="burnFirmware">
<property name="text">
<string>Offer to write FW to Tx after download</string>
</property>
</widget>
</item>
<item row="31" column="3" colspan="3">
<item row="34" column="2" colspan="3">
<widget class="QCheckBox" name="renameFirmware">
<property name="text">
<string>Append version number to FW file name</string>
</property>
</widget>
</item>
<item row="35" column="6">
<widget class="QPushButton" name="voice_dnld">
<property name="text">
<string>Download Voice</string>
<item row="8" column="2" colspan="4">
<widget class="Line" name="line_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="44" column="6">
<item row="45" column="2" colspan="4">
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="46" column="5">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -965,42 +965,14 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="8" column="3" colspan="4">
<widget class="Line" name="line_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="43" column="3" colspan="4">
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="34" column="3" colspan="4">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="36" column="3" colspan="4">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="20" column="3" colspan="4">
<item row="23" column="2" colspan="4">
<widget class="Line" name="line_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="18" column="5">
<item row="18" column="4">
<widget class="QCheckBox" name="optionCheckBox_39">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -1013,27 +985,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="32" column="6">
<widget class="QPushButton" name="fw_dnld">
<property name="text">
<string>Download FW</string>
</property>
</widget>
</item>
<item row="18" column="6">
<widget class="QCheckBox" name="optionCheckBox_40">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="4" column="3" colspan="4">
<item row="4" column="2" colspan="4">
<widget class="QLabel" name="FwInfo">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -1046,7 +998,20 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="3" column="6">
<item row="18" column="5">
<widget class="QCheckBox" name="optionCheckBox_40">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="3" column="5">
<widget class="QPushButton" name="checkFWUpdates">
<property name="minimumSize">
<size>
@@ -1059,7 +1024,52 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="38" column="0">
<item row="42" column="4">
<widget class="QPushButton" name="export_PB">
<property name="text">
<string>Export</string>
</property>
</widget>
</item>
<item row="42" column="3">
<widget class="QPushButton" name="import_PB">
<property name="text">
<string>Import</string>
</property>
</widget>
</item>
<item row="24" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Profile</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="22" column="2">
<widget class="QComboBox" name="voiceCombo">
<property name="maximumSize">
<size>
<width>50</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Set language of voice.
May be different from firmware language</string>
</property>
</widget>
</item>
<item row="22" column="0">
<widget class="QLabel" name="voiceLabel">
<property name="text">
<string>Voice Language</string>
</property>
</widget>
</item>
<item row="25" column="0">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -1072,17 +1082,7 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="37" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Profile Name</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="38" column="3" colspan="3">
<item row="25" column="2" colspan="3">
<widget class="QLineEdit" name="SplashFileName">
<property name="enabled">
<bool>true</bool>
@@ -1092,31 +1092,14 @@ This is used by the templated to determine which channel goes to what number out
</property>
</widget>
</item>
<item row="37" column="3" colspan="3">
<widget class="QLineEdit" name="ProfName_LE"/>
</item>
<item row="40" column="5">
<widget class="QPushButton" name="export_PB">
<property name="text">
<string>Export</string>
</property>
</widget>
</item>
<item row="40" column="4">
<widget class="QPushButton" name="import_PB">
<property name="text">
<string>Import</string>
</property>
</widget>
</item>
<item row="38" column="6" colspan="2">
<item row="25" column="5">
<widget class="QPushButton" name="SplashSelect">
<property name="text">
<string>Open Image</string>
</property>
</widget>
</item>
<item row="39" column="6">
<item row="32" column="5">
<widget class="QPushButton" name="clearImageButton">
<property name="text">
<string>Clear Image</string>
@@ -1178,9 +1161,6 @@ This is used by the templated to determine which channel goes to what number out
<tabstop>channelorderCB</tabstop>
<tabstop>renameFirmware</tabstop>
<tabstop>burnFirmware</tabstop>
<tabstop>voiceCombo</tabstop>
<tabstop>voice_dnld</tabstop>
<tabstop>ProfSlot_SB</tabstop>
</tabstops>
<resources>
<include location="companion.qrc"/>
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>