Showing the changes to interface/src/ui/InfoView.cpp (1 of 7 files). Show all
Unified · Split
| @@ -20,24 +20,24 @@ · 19 unmodified lines | |||
| 20 | #define SETTINGS_VERSION_KEY "info-version" | 20 | #define SETTINGS_VERSION_KEY "info-version" |
| 21 | #define MAX_DIALOG_HEIGHT_RATIO 0.9 | 21 | #define MAX_DIALOG_HEIGHT_RATIO 0.9 |
| 22 | 22 | ||
| 23 | InfoView::InfoView(bool forced) : | 23 | InfoView::InfoView(bool forced, QString path) : |
| 24 | _forced(forced) | 24 | _forced(forced) |
| 25 | { | 25 | { |
| 26 | setWindowFlags(Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint); | 26 | setWindowFlags(Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint); |
| 27 | 27 | ||
| 28 | QString absPath = QFileInfo(Application::resourcesPath() + "html/interface-welcome-allsvg.html").absoluteFilePath(); | 28 | QString absPath = QFileInfo(Application::resourcesPath() + path).absoluteFilePath(); |
| 29 | QUrl url = QUrl::fromLocalFile(absPath); | 29 | QUrl url = QUrl::fromLocalFile(absPath); |
| 30 | 30 | ||
| 31 | load(url); | 31 | load(url); |
| 32 | connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loaded(bool))); | 32 | connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loaded(bool))); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | void InfoView::showFirstTime() { | 35 | void InfoView::showFirstTime(QString path) { |
| 36 | new InfoView(false); | 36 | new InfoView(false, path); |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | void InfoView::forcedShow() { | 39 | void InfoView::forcedShow(QString path) { |
| 40 | new InfoView(true); | 40 | new InfoView(true, path); |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | bool InfoView::shouldShow() { | 43 | bool InfoView::shouldShow() { |