mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile cleanup: unduplicate code and do not loop over dives (2)

Browse source 
See e6e1473e6. Exact same commit but here for the
list of buddies.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2018-01-28 10:26:45 +01:00
parent fed2c5b6a1
commit 572fc47071
7 changed files with 9 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -429,28 +429,6 @@ QStringList DiveObjectHelper::locationList() const
return locations;
}
QStringList DiveObjectHelper::buddyList() const
{
QStringList buddies;
struct dive *d;
int i = 0;
for_each_dive (i, d) {
QString temp = d->buddy;
if (!temp.isEmpty() && !temp.contains(",")){
buddies << d->buddy;
}
else if (!temp.isEmpty()){
QRegExp sep("(,\\s)");
QStringList tempList = temp.split(sep);
buddies << tempList;
buddies << tr("Multiple Buddies");
}
}
buddies.removeDuplicates();
buddies.sort();
return buddies;
}
QStringList DiveObjectHelper::divemasterList() const
{
QStringList divemasters;

2
core/subsurface-qt/DiveObjectHelper.h
View file

@ -47,7 +47,6 @@ class DiveObjectHelper : public QObject {
Q_PROPERTY(QString startPressure READ startPressure CONSTANT)
Q_PROPERTY(QString endPressure READ endPressure CONSTANT)
Q_PROPERTY(QString firstGas READ firstGas CONSTANT)
Q_PROPERTY(QStringList buddyList READ buddyList CONSTANT)
Q_PROPERTY(QStringList divemasterList READ divemasterList CONSTANT)
Q_PROPERTY(QStringList locationList READ locationList CONSTANT)
public:
@ -93,7 +92,6 @@ public:
QString endPressure() const;
QString firstGas() const;
QStringList locationList() const;
QStringList buddyList() const;
QStringList divemasterList() const;
private:

3
mobile-widgets/qml/DiveDetails.qml
View file

@ -18,7 +18,6 @@ Kirigami.Page {
property alias watertemp: detailsEdit.watertempText
property alias buddyIndex: detailsEdit.buddyIndex
property alias buddyText: detailsEdit.buddyText
property alias buddyModel: detailsEdit.buddyModel
property alias divemasterIndex: detailsEdit.divemasterIndex
property alias divemasterText: detailsEdit.divemasterText
property alias divemasterModel: detailsEdit.divemasterModel
@ -240,7 +239,7 @@ Kirigami.Page {
if (currentItem.modelData.dive.buddy.indexOf(",") > 0) {
buddyText = currentItem.modelData.dive.buddy;
} else {
buddyIndex = currentItem.modelData.dive.buddyList.indexOf(currentItem.modelData.dive.buddy)
buddyIndex = manager.buddyList.indexOf(currentItem.modelData.dive.buddy)
}
divemasterIndex = currentItem.modelData.dive.divemasterList.indexOf(currentItem.modelData.dive.divemaster)
notes = currentItem.modelData.dive.notes

3
mobile-widgets/qml/DiveDetailsEdit.qml
View file

@ -236,8 +236,7 @@ Item {
}
HintsTextEdit {
id: buddyBox
model: diveDetailsListView.currentItem && diveDetailsListView.currentItem.modelData !== null ?
diveDetailsListView.currentItem.modelData.dive.buddyList : null
model: manager.buddyList
inputMethodHints: Qt.ImhNoPredictiveText
Layout.fillWidth: true
}

2
mobile-widgets/qml/main.qml
View file

@ -81,7 +81,7 @@ Kirigami.ApplicationWindow {
detailsWindow.date = manager.getDate(detailsWindow.dive_id)
detailsWindow.airtemp = ""
detailsWindow.watertemp = ""
detailsWindow.buddyModel = manager.buddyInit
detailsWindow.buddyModel = manager.buddyList
detailsWindow.buddyIndex = -1
detailsWindow.buddyText = ""
detailsWindow.depth = ""

22
mobile-widgets/qmlmanager.cpp
View file

@ -273,7 +273,7 @@ void QMLManager::openLocalThenRemote(QString url)
appendTextToLog(QStringLiteral("have cloud credentials, trying to connect"));
tryRetrieveDataFromBackend();
}
buddyModel.updateModel();
buddyModel.updateModel(); emit buddyListChanged();
suitModel.updateModel(); emit suitListChanged();
}
@ -1556,25 +1556,9 @@ QStringList QMLManager::suitList() const
return suitModel.stringList();
}
QStringList QMLManager::buddyInit() const
QStringList QMLManager::buddyList() const
{
QStringList buddies;
struct dive *d;
int i = 0;
for_each_dive (i, d) {
QString temp = d->buddy;
if (!temp.isEmpty() && !temp.contains(",")){
buddies << d->buddy;
}
else if (!temp.isEmpty()){
QRegExp sep("(,\\s)");
QStringList tempList = temp.split(sep);
buddies << tempList;
}
}
buddies.removeDuplicates();
buddies.sort();
return buddies;
return buddyModel.stringList();
}
QStringList QMLManager::divemasterInit() const

5
mobile-widgets/qmlmanager.h
View file

@ -37,7 +37,7 @@ class QMLManager : public QObject {
Q_PROPERTY(int updateSelectedDive MEMBER m_updateSelectedDive WRITE setUpdateSelectedDive NOTIFY updateSelectedDiveChanged)
Q_PROPERTY(int selectedDiveTimestamp MEMBER m_selectedDiveTimestamp WRITE setSelectedDiveTimestamp NOTIFY selectedDiveTimestampChanged)
Q_PROPERTY(QStringList suitList READ suitList NOTIFY suitListChanged)
Q_PROPERTY(QStringList buddyInit READ buddyInit CONSTANT)
Q_PROPERTY(QStringList buddyList READ buddyList NOTIFY buddyListChanged)
Q_PROPERTY(QStringList divemasterInit READ divemasterInit CONSTANT)
Q_PROPERTY(QStringList cylinderInit READ cylinderInit CONSTANT)
Q_PROPERTY(bool showPin MEMBER m_showPin WRITE setShowPin NOTIFY showPinChanged)
@ -132,7 +132,7 @@ public:
DiveListSortModel *dlSortModel;
QStringList suitList() const;
QStringList buddyInit() const;
QStringList buddyList() const;
QStringList divemasterInit() const;
QStringList cylinderInit() const;
bool showPin() const;
@ -271,6 +271,7 @@ signals:
void developerChanged();
void btEnabledChanged();
void suitListChanged();
void buddyListChanged();
};
#endif