mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-01 01:43:23 +00:00
Update the dive location when showing the dialog
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
0c33d585ea
commit
10a0a252c8
2 changed files with 21 additions and 9 deletions
|
@ -7,7 +7,7 @@
|
|||
#include <QDebug>
|
||||
#include <QShowEvent>
|
||||
|
||||
LocationInformationModel::LocationInformationModel(QObject *obj)
|
||||
LocationInformationModel::LocationInformationModel(QObject *obj) : QAbstractListModel(obj), internalRowCount(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -37,13 +37,13 @@ void LocationInformationModel::update()
|
|||
for_each_dive_site (i, ds);
|
||||
|
||||
if (rowCount()) {
|
||||
beginRemoveRows(QModelIndex(), 0, rowCount());
|
||||
beginRemoveRows(QModelIndex(), 0, rowCount()-1);
|
||||
endRemoveRows();
|
||||
}
|
||||
if (i) {
|
||||
beginInsertRows(QModelIndex(), 0, i);
|
||||
internalRowCount = i;
|
||||
endRemoveRows();
|
||||
endInsertRows();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -66,6 +66,14 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo
|
|||
ui.diveSiteMessage->setText(tr("Dive site management"));
|
||||
ui.diveSiteMessage->addAction(closeAction);
|
||||
|
||||
ui.currentLocation->setModel(new LocationInformationModel());
|
||||
connect(ui.currentLocation, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentDiveSite(int)));
|
||||
}
|
||||
|
||||
void LocationInformationWidget::setCurrentDiveSite(int dive_nr)
|
||||
{
|
||||
currentDs = get_dive_site(dive_nr);
|
||||
setLocationId(currentDs->uuid);
|
||||
}
|
||||
|
||||
void LocationInformationWidget::setLocationId(uint32_t uuid)
|
||||
|
@ -151,8 +159,13 @@ void LocationInformationWidget::rejectChanges()
|
|||
emit informationManagementEnded();
|
||||
}
|
||||
|
||||
void LocationInformationWidget::showEvent(QShowEvent *ev) {
|
||||
void LocationInformationWidget::showEvent(QShowEvent *ev)
|
||||
{
|
||||
LocationInformationModel *m = (LocationInformationModel*) ui.currentLocation->model();
|
||||
ui.diveSiteMessage->setCloseButtonVisible(false);
|
||||
m->update();
|
||||
QGroupBox::showEvent(ev);
|
||||
|
||||
}
|
||||
|
||||
void LocationInformationWidget::markChangedWidget(QWidget *w)
|
||||
|
|
|
@ -20,20 +20,19 @@ class LocationInformationWidget : public QGroupBox {
|
|||
Q_OBJECT
|
||||
public:
|
||||
LocationInformationWidget(QWidget *parent = 0);
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent *);
|
||||
\
|
||||
public slots:
|
||||
void acceptChanges();
|
||||
void rejectChanges();
|
||||
|
||||
void showEvent(QShowEvent *);
|
||||
|
||||
void setLocationId(uint32_t uuid);
|
||||
void updateGpsCoordinates(void);
|
||||
void markChangedWidget(QWidget *w);
|
||||
void enableEdition();
|
||||
void resetState();
|
||||
void resetPallete();
|
||||
|
||||
void setCurrentDiveSite(int dive_nr);
|
||||
void on_diveSiteCoordinates_textChanged(const QString& text);
|
||||
void on_diveSiteDescription_textChanged(const QString& text);
|
||||
void on_diveSiteName_textChanged(const QString& text);
|
||||
|
|
Loading…
Add table
Reference in a new issue