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

Cosmetics

Browse Source
This commit is contained in:
Bertrand Songis
2015-08-11 06:56:02 +02:00
parent 2d9c130839
commit a5bb41a31b
21 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/CMakeLists.txt
+3 -3
View File
@@ -176,7 +176,7 @@ set(companion_SRCS
fusesdialog.cpp
logsdialog.cpp
downloaddialog.cpp
splashlibrary.cpp
splashlibrarydialog.cpp
mainwindow.cpp
companion.cpp
radionotfound.cpp
@@ -196,7 +196,7 @@ set(companion_MOC_HDRS
releasenotesdialog.h
releasenotesfirmwaredialog.h
customizesplashdialog.h
splashlibrary.h
splashlibrarydialog.h
splashlabel.h
progresswidget.h
progressdialog.h
@@ -226,7 +226,7 @@ set(companion_UIS
printdialog.ui
htmldialog.ui
customizesplashdialog.ui
splashlibrary.ui
splashlibrarydialog.ui
progresswidget.ui
progressdialog.ui
flashfirmwaredialog.ui
companion/src/customizesplashdialog.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
#include "flashfirmwaredialog.h"
#include "appdata.h"
#include "helpers.h"
#include "splashlibrary.h"
#include "firmwareinterface.h"
#include "splashlibrarydialog.h"
//*** Side Class ***
@@ -233,7 +233,7 @@ void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicke
void customizeSplashDialog::libraryButton_clicked( Side side )
{
QString fileName;
splashLibrary *ld = new splashLibrary(this,&fileName);
SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName);
ld->exec();
if (!fileName.isEmpty()) {
if (!side.displayImage( fileName, UNDEFINED ))
companion/src/flasheepromdialog.cpp
+1 -1
View File
@@ -2,13 +2,13 @@
#include "ui_flasheepromdialog.h"
#include "eeprominterface.h"
#include "helpers.h"
#include "splashlibrary.h"
#include "firmwareinterface.h"
#include "hexinterface.h"
#include "appdata.h"
#include "progressdialog.h"
#include "radiointerface.h"
#include "converteeprom.h"
#include "splashlibrarydialog.h"
FlashEEpromDialog::FlashEEpromDialog(QWidget *parent, const QString &filename):
QDialog(parent),
companion/src/flashfirmwaredialog.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
#include "hexinterface.h"
#include "progressdialog.h"
#include "radiointerface.h"
#include "splashlibrary.h"
#include "progresswidget.h"
#include "splashlibrarydialog.h"
#if defined WIN32 || !defined __GNUC__
#include <windows.h>
@@ -185,7 +185,7 @@ void FlashFirmwareDialog::on_useExternalSplash_clicked()
void FlashFirmwareDialog::on_useLibrarySplash_clicked()
{
QString fileName;
splashLibrary *ld = new splashLibrary(this, &fileName);
SplashLibraryDialog *ld = new SplashLibraryDialog(this, &fileName);
ld->exec();
if (!fileName.isEmpty()) {
QImage image(fileName);
companion/src/images/library/00021.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

companion/src/imgpreferences.ui
+2 -2
View File
@@ -344,7 +344,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QToolButton" name="splashLibraryButton">
<widget class="QToolButton" name="SplashLibraryDialogButton">
<property name="text">
<string>...</string>
</property>
@@ -455,7 +455,7 @@
<tabstop>splashincludeCB</tabstop>
<tabstop>SplashFileName</tabstop>
<tabstop>SplashSelect</tabstop>
<tabstop>splashLibraryButton</tabstop>
<tabstop>SplashLibraryDialogButton</tabstop>
<tabstop>clearImageButton</tabstop>
<tabstop>InvertPixels</tabstop>
<tabstop>buttonBox</tabstop>
companion/src/splashlibrary.cpp → companion/src/splashlibrarydialog.cpp
+20 -12
View File
@@ -1,15 +1,18 @@
#include "splashlibrary.h"
#include "ui_splashlibrary.h"
#include "splashlibrarydialog.h"
#include "ui_splashlibrarydialog.h"
#include "appdata.h"
#include <QtGui>
#include "helpers.h"
#include "firmwareinterface.h"
#include "helpers.h"
splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(parent), ui(new Ui::splashLibrary) {
splashFileName = fileName;
SplashLibraryDialog::SplashLibraryDialog(QWidget *parent, QString * filename):
QDialog(parent),
ui(new Ui::SplashLibraryDialog),
splashFileName(filename)
{
ui->setupUi(this);
this->setWindowIcon(CompanionIcon("library.png"));
setWindowIcon(CompanionIcon("library.png"));
ui->nextPage->setIcon(CompanionIcon("arrow-right.png"));
ui->prevPage->setIcon(CompanionIcon("arrow-left.png"));
page = 0;
@@ -24,11 +27,13 @@ splashLibrary::splashLibrary(QWidget *parent, QString * fileName) : QDialog(pare
}
}
splashLibrary::~splashLibrary() {
SplashLibraryDialog::~SplashLibraryDialog()
{
delete ui;
}
void splashLibrary::setupPage(int page) {
void SplashLibraryDialog::setupPage(int page)
{
splashLabel * sl[] = { ui->FwImage_01, ui->FwImage_02, ui->FwImage_03, ui->FwImage_04 ,
ui->FwImage_05, ui->FwImage_06, ui->FwImage_07, ui->FwImage_08 ,
ui->FwImage_09, ui->FwImage_10, ui->FwImage_11, ui->FwImage_12 ,
@@ -60,7 +65,8 @@ void splashLibrary::setupPage(int page) {
setWindowTitle(tr("Splash Library - page %1 of %2").arg(page + 1).arg(ceil((float) imageList.size() / 20.0)));
}
void splashLibrary::getFileList() {
void SplashLibraryDialog::getFileList()
{
imageList.clear();
if (g.embedSplashes()) {
QDir myRes(":/images/library");
@@ -102,11 +108,13 @@ void splashLibrary::getFileList() {
}
}
void splashLibrary::dclose() {
void SplashLibraryDialog::dclose()
{
close();
}
void splashLibrary::onButtonPressed(int button) {
void SplashLibraryDialog::onButtonPressed(int button)
{
splashLabel * myLabel = qobject_cast<splashLabel *>(sender());
foreach(splashLabel *sl, findChildren<splashLabel *>()) {
@@ -123,7 +131,7 @@ void splashLibrary::onButtonPressed(int button) {
myLabel->setStyleSheet("border:1px solid; border-color:#00ffff");
}
void splashLibrary::on_nextPage_clicked() {
void SplashLibraryDialog::on_nextPage_clicked() {
page++;
if (page >= (imageList.size() / 20)) {
ui->nextPage->setDisabled(true);
@@ -132,7 +140,7 @@ void splashLibrary::on_nextPage_clicked() {
setupPage(page);
}
void splashLibrary::on_prevPage_clicked() {
void SplashLibraryDialog::on_prevPage_clicked() {
page--;
if (page == 0) {
ui->prevPage->setDisabled(true);
companion/src/splashlibrary.h → companion/src/splashlibrarydialog.h
+5 -5
View File
@@ -5,16 +5,16 @@
#include <QDialog>
namespace Ui {
class splashLibrary;
class SplashLibraryDialog;
}
class splashLibrary : public QDialog
class SplashLibraryDialog : public QDialog
{
Q_OBJECT
public:
explicit splashLibrary(QWidget *parent = 0, QString * fileName=NULL);
~splashLibrary();
explicit SplashLibraryDialog(QWidget *parent = 0, QString * fileName=NULL);
~SplashLibraryDialog();
private slots:
void dclose();
@@ -25,7 +25,7 @@ private slots:
private:
void getFileList();
void setupPage(int page);
Ui::splashLibrary *ui;
Ui::SplashLibraryDialog *ui;
QString * splashFileName;
QString libraryPath;
QStringList imageList;
companion/src/splashlibrary.ui → companion/src/splashlibrarydialog.ui
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>splashLibrary</class>
<widget class="QDialog" name="splashLibrary">
<class>SplashLibraryDialog</class>
<widget class="QDialog" name="SplashLibraryDialog">
<property name="geometry">
<rect>
<x>0</x>
companion/src/translations/companion_cs.ts
+1 -1
View File
@@ -14766,7 +14766,7 @@ Mode 4:
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_de.ts
+1 -1
View File
@@ -15537,7 +15537,7 @@ Die kann auch unterschiedlch zur Firmwaresprache sein</translation>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_es.ts
+1 -1
View File
@@ -13214,7 +13214,7 @@ Puede ser diferente del lenguaje del firmware</translation>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_fi.ts
+1 -1
View File
@@ -17161,7 +17161,7 @@ Voi olla eri kun firmwaren kieli</translation>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_fr.ts
+1 -1
View File
@@ -14015,7 +14015,7 @@ Indique l&apos;affectation voie / numéro de voie par défaut utilisée lors de
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_he.ts
+1 -1
View File
@@ -11554,7 +11554,7 @@ Press cancel to abort joystick calibration</source>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_it.ts
+1 -1
View File
@@ -12155,7 +12155,7 @@ Premere annulla per cancellare l&apos;operazione</translation>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_nl.ts
+1 -1
View File
@@ -11546,7 +11546,7 @@ Press cancel to abort joystick calibration</source>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_pl.ts
+1 -1
View File
@@ -11952,7 +11952,7 @@ Anuluj w celu przerwania kalibracji joysticka</translation>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_pt.ts
+1 -1
View File
@@ -12159,7 +12159,7 @@ Press cancel to abort joystick calibration</source>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_ru.ts
+1 -1
View File
@@ -12164,7 +12164,7 @@ This is used by the templated to determine which channel goes to what number out
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<location filename="../splashlibrary.ui" line="47"/>
<location filename="../splashlibrary.ui" line="879"/>
companion/src/translations/companion_sv.ts
+1 -1
View File
@@ -10325,7 +10325,7 @@ Får skilja från språket för mjukvaran</translation>
</message>
</context>
<context>
<name>splashLibrary</name>
<name>SplashLibraryDialog</name>
<message>
<source>...</source>
<translation>...</translation>