Commit 6d98a986 authored by Ming Rui Zhang's avatar Ming Rui Zhang Committed by Andreas Traczyk

taskbar title: fix empty taskbar title

- change taskber title according to widget name

Change-Id: Ie5d8db53744aeda8138041a432e5640727e96a2c
Gitlab: #458
parent 3a2bb130
......@@ -21,11 +21,11 @@
#include "ui_mainwindow.h"
#include <QDesktopWidget>
#include <QScreen>
#include <QWindow>
#include <QTimer>
#include <QDir>
#include <QScreen>
#include <QStandardPaths>
#include <QTimer>
#include <QWindow>
#include "media/text.h"
#include "media/textrecording.h"
......@@ -60,6 +60,13 @@ MainWindow::MainWindow(QWidget* parent)
if (auto navWidget = dynamic_cast<NavWidget*>(ui->navStack->widget(i))) {
navWidget->navigated(scr == i);
}
if (scr == ScreenEnum::WizardScreen) {
setWindowTitle(QStringLiteral("Log In"));
} else if (scr == ScreenEnum::SetttingsScreen) {
setWindowTitle(QStringLiteral("Settings"));
} else {
setWindowTitle(QStringLiteral("Jami"));
}
}
Utils::setStackWidget(ui->navStack, ui->navStack->widget(scr));
});
......@@ -71,9 +78,7 @@ MainWindow::MainWindow(QWidget* parent)
Qt::QueuedConnection);
QIcon icon(":images/jami.png");
this->setWindowIcon(icon);
setWindowTitle(" ");
GlobalSystemTray& sysIcon = GlobalSystemTray::instance();
sysIcon.setIcon(icon);
......@@ -145,8 +150,10 @@ MainWindow::MainWindow(QWidget* parent)
readSettingsFromRegistry();
startScreen = ScreenEnum::CallScreen;
emit LRCInstance::instance().accountOnBoarded();
setWindowTitle(QStringLiteral("Jami"));
} else {
startScreen = ScreenEnum::WizardScreen;
setWindowTitle(QStringLiteral("Log In"));
}
Utils::setStackWidget(ui->navStack, ui->navStack->widget(startScreen));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment