mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Untangle Profile from MainWindow: refresh display

Browse source 
Instead of directly calling into the MainWindow, redirect this via a
signal so Subsurface mobile can hook it up as needed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-11-05 12:51:05 -08:00
parent 281a0a945a
commit e28f171731
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
profile-widget/profilewidget2.cpp
View file

@ -1351,7 +1351,8 @@ void ProfileWidget2::deleteCurrentDC()
mark_divelist_changed(true); mark_divelist_changed(true);
// we need to force it since it's likely the same dive and same dc_number - but that's a different dive computer now // we need to force it since it's likely the same dive and same dc_number - but that's a different dive computer now
MainWindow::instance()->graphics()->plotDive(0, true); MainWindow::instance()->graphics()->plotDive(0, true);
MainWindow::instance()->refreshDisplay();
emit refreshDisplay(true);
} }
void ProfileWidget2::makeFirstDC() void ProfileWidget2::makeFirstDC()
@ -1363,7 +1364,7 @@ void ProfileWidget2::makeFirstDC()
// dive list may change). // dive list may change).
// As a side benefit, this returns focus to the dive list. // As a side benefit, this returns focus to the dive list.
dc_number = 0; dc_number = 0;
MainWindow::instance()->refreshDisplay(); emit refreshDisplay(true);
} }
void ProfileWidget2::hideEvents() void ProfileWidget2::hideEvents()

1
profile-widget/profilewidget2.h
View file

@ -92,6 +92,7 @@ signals:
void showError(); void showError();
void enableShortcuts(); void enableShortcuts();
void disableShortcuts(bool paste); void disableShortcuts(bool paste);
void refreshDisplay(bool recreateDivelist);
public public
slots: // Necessary to call from QAction's signals. slots: // Necessary to call from QAction's signals.

1
subsurface-desktop-main.cpp
View file

@ -90,6 +90,7 @@ int main(int argc, char **argv)
QObject::connect(m->graphics(), &ProfileWidget2::showError, m, &MainWindow::showError, Qt::AutoConnection); QObject::connect(m->graphics(), &ProfileWidget2::showError, m, &MainWindow::showError, Qt::AutoConnection);
QObject::connect(m->graphics(), &ProfileWidget2::disableShortcuts, m, &MainWindow::disableShortcuts, Qt::AutoConnection); QObject::connect(m->graphics(), &ProfileWidget2::disableShortcuts, m, &MainWindow::disableShortcuts, Qt::AutoConnection);
QObject::connect(m->graphics(), &ProfileWidget2::enableShortcuts, m, &MainWindow::enableShortcuts, Qt::AutoConnection); QObject::connect(m->graphics(), &ProfileWidget2::enableShortcuts, m, &MainWindow::enableShortcuts, Qt::AutoConnection);
QObject::connect(m->graphics(), &ProfileWidget2::refreshDisplay, m, &MainWindow::refreshDisplay, Qt::AutoConnection);
if (verbose > 0) if (verbose > 0)
print_files(); print_files();
if (!quit) if (!quit)