StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6361

Browse Source 
woxcab (1):
      fix(ui): reorder the window title
This commit is contained in:
Anthony Bilinski 2021-10-25 00:16:53 -07:00
commit 8af9d0905f
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/contentdialog.cpp
View File

@ -59,7 +59,7 @@ ContentDialog::ContentDialog(const Core &core, QWidget* parent)
, videoSurfaceSize(QSize()) , videoSurfaceSize(QSize())
, videoCount(0) , videoCount(0)
{ {
const Settings& s = Settings::getInstance(); const Settings& s = Settings::getInstance();
friendLayout->setMargin(0); friendLayout->setMargin(0);
friendLayout->setSpacing(0); friendLayout->setSpacing(0);
@ -383,7 +383,7 @@ void ContentDialog::updateTitleAndStatusIcon()
return; return;
} }
setWindowTitle(activeChatroomWidget->getTitle() + QStringLiteral(" - ") + username); setWindowTitle(username + QStringLiteral(" - ") + activeChatroomWidget->getTitle());
bool isGroupchat = activeChatroomWidget->getGroup() != nullptr; bool isGroupchat = activeChatroomWidget->getGroup() != nullptr;
if (isGroupchat) { if (isGroupchat) {

2
src/widget/gui.cpp
View File

@ -224,7 +224,7 @@ void GUI::_setWindowTitle(const QString& title)
if (title.isEmpty()) if (title.isEmpty())
w->setWindowTitle("qTox"); w->setWindowTitle("qTox");
else else
w->setWindowTitle("qTox - " + title); w->setWindowTitle(title + " - qTox");
} }
void GUI::_showInfo(const QString& title, const QString& msg) void GUI::_showInfo(const QString& title, const QString& msg)

4
src/widget/widget.cpp
View File

@ -829,8 +829,8 @@ void Widget::setWindowTitle(const QString& title)
} else { } else {
QString tmp = title; QString tmp = title;
/// <[^>]*> Regexp to remove HTML tags, in case someone used them in title /// <[^>]*> Regexp to remove HTML tags, in case someone used them in title
QMainWindow::setWindowTitle(QApplication::applicationName() + QStringLiteral(" - ") QMainWindow::setWindowTitle(tmp.remove(QRegExp("<[^>]*>")) + QStringLiteral(" - ")
+ tmp.remove(QRegExp("<[^>]*>"))); + QApplication::applicationName());
} }
} }