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

Fixes #4806

Browse Source
This commit is contained in:
Bertrand Songis
2017-04-24 19:33:06 +02:00
parent faacf7f9c5
commit b790a844f1
18 changed files with 46 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/customizesplashdialog.cpp
+23 -25
View File
@@ -150,11 +150,9 @@ bool Side::saveImage()
return true;
}
//*** customizeSplashDialog Class ***
customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) :
QDialog(parent),
ui(new Ui::customizeSplashDialog)
ui(new Ui::CustomizeSplashDialog)
{
ui->setupUi(this);
setWindowIcon(CompanionIcon("paintbrush.png"));
@@ -185,22 +183,22 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
resize(0,0);
}
customizeSplashDialog::~customizeSplashDialog()
CustomizeSplashDialog::~CustomizeSplashDialog()
{
delete ui;
}
void customizeSplashDialog::on_copyRightToLeftButton_clicked() {
void CustomizeSplashDialog::on_copyRightToLeftButton_clicked() {
left.copyImage(right);
}
void customizeSplashDialog::on_copyLeftToRightButton_clicked() {
void CustomizeSplashDialog::on_copyLeftToRightButton_clicked() {
right.copyImage(left);
}
void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
void customizeSplashDialog::loadFirmware(Side side)
void CustomizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
void CustomizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
void CustomizeSplashDialog::loadFirmware(Side side)
{
QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
if (!fileName.isEmpty()) {
@@ -212,9 +210,9 @@ void customizeSplashDialog::loadFirmware(Side side)
side.markSourceButton();
}
void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
void customizeSplashDialog::loadPicture(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++) {
@@ -232,9 +230,9 @@ void customizeSplashDialog::loadPicture(Side side)
side.markSourceButton();
}
void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
void customizeSplashDialog::loadProfile(Side side)
void CustomizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
void CustomizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
void CustomizeSplashDialog::loadProfile(Side side)
{
QString fileName=g.profile[g.id()].splashFile();
@@ -245,9 +243,9 @@ void customizeSplashDialog::loadProfile(Side side)
side.markSourceButton();
}
void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
void customizeSplashDialog::libraryButton_clicked( Side side )
void CustomizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
void CustomizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
void CustomizeSplashDialog::libraryButton_clicked( Side side )
{
QString fileName;
SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName);
@@ -258,9 +256,9 @@ void customizeSplashDialog::libraryButton_clicked( Side side )
}
}
void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
void customizeSplashDialog::saveButton_clicked( Side side )
void CustomizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
void CustomizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
void CustomizeSplashDialog::saveButton_clicked( Side side )
{
if (side.saveImage()){
QMessageBox::information(this, tr("File Saved"), tr("The image was saved to the file %1").arg(*side.saveToFileName));
@@ -272,9 +270,9 @@ void customizeSplashDialog::saveButton_clicked( Side side )
QMessageBox::critical(this, tr("File Save Error"), tr("Failed to write image to %1").arg(*side.saveToFileName));
}
void customizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);}
void customizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);}
void customizeSplashDialog::invertButton_clicked(Side side)
void CustomizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);}
void CustomizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);}
void CustomizeSplashDialog::invertButton_clicked(Side side)
{
QImage image = side.imageLabel->pixmap()->toImage();
image.invertPixels();
companion/src/customizesplashdialog.h
+5 -5
View File
@@ -26,7 +26,7 @@
namespace Ui
{
class customizeSplashDialog;
class CustomizeSplashDialog;
}
const int WIDTH_TARANIS = 212;
@@ -63,15 +63,15 @@ private:
LCDFormat *format;
};
class customizeSplashDialog : public QDialog
class CustomizeSplashDialog : public QDialog
{
Q_OBJECT
Side left;
Side right;
public:
explicit customizeSplashDialog(QWidget *parent = 0);
~customizeSplashDialog();
explicit CustomizeSplashDialog(QWidget *parent = 0);
~CustomizeSplashDialog();
private slots:
void on_leftLoadFwButton_clicked();
@@ -99,7 +99,7 @@ private:
void saveButton_clicked( Side );
void invertButton_clicked( Side );
Ui::customizeSplashDialog *ui;
Ui::CustomizeSplashDialog *ui;
enum sideEnum { LEFT, RIGHT };
};
companion/src/customizesplashdialog.ui
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>customizeSplashDialog</class>
<widget class="QDialog" name="customizeSplashDialog">
<class>CustomizeSplashDialog</class>
<widget class="QDialog" name="CustomizeSplashDialog">
<property name="enabled">
<bool>true</bool>
</property>
companion/src/mainwindow.cpp
+2 -1
View File
@@ -780,7 +780,7 @@ void MainWindow::fwchangelog()
void MainWindow::customizeSplash()
{
customizeSplashDialog * dialog = new customizeSplashDialog(this);
CustomizeSplashDialog * dialog = new CustomizeSplashDialog(this);
dialog->exec();
dialog->deleteLater();
}
@@ -944,6 +944,7 @@ void MainWindow::updateMenus()
readEepromAct->setEnabled(true);
writeBUToRadioAct->setEnabled(true);
readBUToFileAct->setEnabled(true);
editSplashAct->setDisabled(IS_HORUS(getCurrentBoard()));
foreach (QAction * act, fileWindowActions) {
if (!act)
companion/src/translations/companion_cs.ts
+1 -1
View File
@@ -12337,7 +12337,7 @@ m2560 pro V4 desky</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_de.ts
+1 -1
View File
@@ -12264,7 +12264,7 @@ Please only use this if you know what you are doing. There are no error checks
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_en.ts
+1 -1
View File
@@ -12119,7 +12119,7 @@ m2560 for v4.1 boards</source>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_es.ts
+1 -1
View File
@@ -12284,7 +12284,7 @@ m2560 para las placas v4.1</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_fi.ts
+1 -1
View File
@@ -12332,7 +12332,7 @@ m2560 joka on v4.1 lähettimessä</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_fr.ts
+1 -1
View File
@@ -12248,7 +12248,7 @@ m2560 for v4.1 boards</source>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_he.ts
+1 -1
View File
@@ -10505,7 +10505,7 @@ m2560 for v4.1 boards</source>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_it.ts
+1 -1
View File
@@ -12354,7 +12354,7 @@ m2560 per le schede v4.1</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_nl.ts
+1 -1
View File
@@ -10499,7 +10499,7 @@ m2560 for v4.1 boards</source>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_pl.ts
+1 -1
View File
@@ -12564,7 +12564,7 @@ m2560 dla platformy V4</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_pt.ts
+1 -1
View File
@@ -10505,7 +10505,7 @@ m2560 for v4.1 boards</source>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_ru.ts
+1 -1
View File
@@ -10549,7 +10549,7 @@ m2560 for v4.1 boards</source>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>
companion/src/translations/companion_sv.ts
+1 -1
View File
@@ -9622,7 +9622,7 @@ m2560 för v4.1-kort</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<source>Transmitter Splash Screen Editor</source>
<translation>Startbildsredigerare</translation>
companion/src/translations/companion_zh_CN.ts
+1 -1
View File
@@ -12595,7 +12595,7 @@ v4.1版电路板应为m2560</translation>
</message>
</context>
<context>
<name>customizeSplashDialog</name>
<name>CustomizeSplashDialog</name>
<message>
<location filename="../customizesplashdialog.ui" line="23"/>
<source>Transmitter Splash Screen Editor</source>