PrintDialog / CompareDialog refactoring

This commit is contained in:
Bertrand Songis
2015-08-23 09:54:15 +02:00
parent 3075ad857e
commit ed05174fc8
36 changed files with 1391 additions and 2260 deletions
+6 -6
View File
@@ -143,7 +143,7 @@ void ModelsListWidget::setdefault()
{
if (currentRow()==0) return;
unsigned int currModel = currentRow() - 1;
if (!radioData->models[currModel].isempty() && radioData->generalSettings.currModel != currModel) {
if (!radioData->models[currModel].isEmpty() && radioData->generalSettings.currModel != currModel) {
radioData->generalSettings.currModel = currModel;
refreshList();
((MdiChild *)parent())->setModified();
@@ -295,7 +295,7 @@ void ModelsListWidget::refreshList()
{
QString item = QString().sprintf("%02d: ", i+1);
if (!radioData->models[i].isempty()) {
if (!radioData->models[i].isEmpty()) {
if (eepromInterface && IS_SKY9X(eepromInterface->getBoard())) {
if (radioData->models[i].name[0]==0) {
QString modelname="Model";
@@ -363,7 +363,7 @@ void ModelsListWidget::deleteSelected(bool ask=true)
QMessageBox::StandardButton ret = QMessageBox::Yes;
if(ask) {
foreach(QModelIndex index, this->selectionModel()->selectedIndexes()) {
if (index.row()>0 && !radioData->models[index.row()-1].isempty()) {
if (index.row()>0 && !radioData->models[index.row()-1].isEmpty()) {
isModel=true;
selModel=index.row()-1;
}
@@ -465,7 +465,7 @@ void ModelsListWidget::doPaste(QByteArray *gmData, int index)
i += sizeof(GeneralSettings);
}
else { //model data
if (!radioData->models[id-1].isempty()) {
if (!radioData->models[id-1].isEmpty()) {
ret = QMessageBox::question(this, "Companion", tr("You are pasting on an not empty model, are you sure?"),
QMessageBox::Yes | QMessageBox::No);
if (ret == QMessageBox::Yes) {
@@ -521,7 +521,7 @@ void ModelsListWidget::duplicate()
{
ModelData *model = &radioData->models[i-1];
while(i<GetEepromInterface()->getMaxModels()) {
if (radioData->models[i].isempty()) {
if (radioData->models[i].isEmpty()) {
radioData->models[i] = *model;
((MdiChild *)parent())->setModified();
break;
@@ -581,7 +581,7 @@ void ModelsListWidget::viableModelSelected(int idx)
else if (idx<1)
((MdiChild*)parent())->viableModelSelected(false);
else
((MdiChild*)parent())->viableModelSelected(!radioData->models[currentRow()-1].isempty());
((MdiChild*)parent())->viableModelSelected(!radioData->models[currentRow()-1].isEmpty());
}