mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Update Qt4 patch"

Browse source 
This reverts commit 762315e7ee.

Oops, this was supposed to update the patch, not update and apply it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-02-22 08:30:34 -08:00
parent df73f328f8
commit 2866a604b4
6 changed files with 14 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/divelogexportdialog.cpp
View file

@ -1,9 +1,8 @@
#include <QFileDialog>
#include <QShortcut>
#include <QSettings>
#if QT_VERSION >= 0x050000
#include <QtConcurrent>
#endif
#include "divelogexportdialog.h"
#include "diveshareexportdialog.h"
#include "ui_divelogexportdialog.h"
@ -314,11 +313,7 @@ void DiveLogExportDialog::on_buttonBox_accepted()
settings.endGroup();
// the non XSLT exports are called directly above, the XSLT based ons are called here
if (!stylesheet.isEmpty())
#if QT_VERSION >= 0x050000
future = QtConcurrent::run(export_dives_xslt, filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8());
#else
export_dives_xslt(filename.toUtf8(), ui->exportSelected->isChecked(), ui->CSVUnits_2->currentIndex(), stylesheet.toUtf8());
#endif
}
}

4
qt-ui/divelogexportdialog.h
View file

@ -3,9 +3,7 @@
#include <QDialog>
#include <QTextStream>
#if QT_VERSION >= 0x050000
#include <QFuture>
#endif
#include "helpers.h"
#include "statistics.h"
@ -30,9 +28,7 @@ slots:
void on_exportGroup_buttonClicked(QAbstractButton *);
private:
#if QT_VERSION >= 0x050000
QFuture<int> future;
#endif
Ui::DiveLogExportDialog *ui;
void showExplanation();
void exportHtmlInit(const QString &filename);

34
qt-ui/divelogimportdialog.cpp
View file

@ -377,22 +377,14 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
seabear = true;
firstLine = "Sample time;Sample depth;Sample NDL;Sample TTS;Sample stopdepth;Sample temperature;Sample pressure";
blockSignals(true);
#if QT_VERSION >= 0x050000
ui->knownImports->setCurrentText("Seabear CSV");
#else
ui->knownImports->setCurrentIndex(4);
#endif
blockSignals(false);
} else if (firstLine.contains("Tauchgangs-Nr.:")) {
xp5 = true;
//"Abgelaufene Tauchzeit (Std:Min.)\tTiefe\tStickstoff Balkenanzeige\tSauerstoff Balkenanzeige\tAufstiegsgeschwindigkeit\tRestluftzeit\tRestliche Tauchzeit\tDekompressionszeit (Std:Min)\tDekostopp-Tiefe\tTemperatur\tPO2\tPressluftflasche\tLesen des Druckes\tStatus der Verbindung\tTauchstatus";
firstLine = "Sample time\tSample depth\t\t\t\t\t\t\t\tSample temperature\t";
blockSignals(true);
#if QT_VERSION >= 0x050000
ui->knownImports->setCurrentText("XP5");
#else
ui->knownImports->setCurrentIndex(2);
#endif
blockSignals(false);
}
@ -401,17 +393,9 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
apd=true;
firstLine = "Sample time\tSample depth\t\t\t\t\tSample pO₂\t\t\t\t\t\t\t\t\tSample temperature\t\tSample CNS\tSample stopdepth";
blockSignals(true);
#if QT_VERSION >= 0x050000
ui->CSVSeparator->setCurrentText(tr("Tab"));
#else
ui->CSVSeparator->setCurrentIndex(0);
#endif
if (triggeredBy == INITIAL && fileNames.first().contains(".apd", Qt::CaseInsensitive))
#if QT_VERSION >= 0x050000
ui->knownImports->setCurrentText("APD Log Viewer");
#else
ui->knownImports->setCurrentIndex(1);
#endif
blockSignals(false);
}
@ -430,16 +414,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
separator = ";";
if (ui->CSVSeparator->currentText() != separator) {
blockSignals(true);
#if QT_VERSION >= 0x050000
ui->CSVSeparator->setCurrentText(separator);
#else
if (separator == "Tab")
ui->CSVSeparator->setCurrentIndex(0);
else if (separator == ",")
ui->CSVSeparator->setCurrentIndex(1);
else
ui->CSVSeparator->setCurrentIndex(2);
#endif
blockSignals(false);
currColumns = firstLine.split(separator);
}
@ -490,16 +465,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
if (ui->CSVSeparator->currentText() != separator || separator == "Tab") {
ui->CSVSeparator->blockSignals(true);
#if QT_VERSION >= 0x050000
ui->CSVSeparator->setCurrentText(separator);
#else
if (separator == "Tab")
ui->CSVSeparator->setCurrentIndex(0);
else if (separator == ",")
ui->CSVSeparator->setCurrentIndex(1);
else
ui->CSVSeparator->setCurrentIndex(2);
#endif
ui->CSVSeparator->blockSignals(false);
if (separator == "Tab")
separator = "\t";

12
qt-ui/downloadfromdivecomputer.cpp
View file

@ -602,31 +602,19 @@ QVariant DiveImportedModel::data(const QModelIndex &index, int role) const
void DiveImportedModel::changeSelected(QModelIndex clickedIndex)
{
checkStates[clickedIndex.row()] = !checkStates[clickedIndex.row()];
#if QT_VERSION >= 0x050000
dataChanged(index(0, clickedIndex.row()), index(0, clickedIndex.row()), QVector<int>() << Qt::CheckStateRole);
#else
dataChanged(index(0, clickedIndex.row()), index(0, clickedIndex.row()));
#endif
}
void DiveImportedModel::selectAll()
{
memset(checkStates, true, lastIndex - firstIndex + 1);
#if QT_VERSION >= 0x050000
dataChanged(index(0, 0), index(0, lastIndex - firstIndex), QVector<int>() << Qt::CheckStateRole);
#else
dataChanged(index(0, 0), index(0, lastIndex - firstIndex));
#endif
}
void DiveImportedModel::selectNone()
{
memset(checkStates, false, lastIndex - firstIndex + 1);
#if QT_VERSION >= 0x050000
dataChanged(index(0, 0), index(0, lastIndex - firstIndex), QVector<int>() << Qt::CheckStateRole);
#else
dataChanged(index(0, 0), index(0, lastIndex - firstIndex ));
#endif
}
Qt::ItemFlags DiveImportedModel::flags(const QModelIndex &index) const

4
qt-ui/plannerSettings.ui
View file

@ -338,8 +338,8 @@
</item>
<item row="5" column="1">
<widget class="QComboBox" name="rebreathermode">
<property name="currentIndex">
<number>0</number>
<property name="currentText">
<string/>
</property>
<property name="maxVisibleItems">
<number>6</number>