From 5776f43b98733d3cf2834ad11fcc5ae83b18974d Mon Sep 17 00:00:00 2001 From: Weslly Date: Tue, 21 Mar 2017 23:01:44 -0300 Subject: [PATCH] Add proxy icon to title bar in OSX --- src/gui/DatabaseTabWidget.cpp | 10 ++++++++++ src/gui/DatabaseTabWidget.h | 1 + src/gui/MainWindow.cpp | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index ea4723e5c..2c14ace16 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -552,6 +552,16 @@ bool DatabaseTabWidget::isModified(int index) return indexDatabaseManagerStruct(index).modified; } +QString DatabaseTabWidget::databasePath(int index) +{ + if (index == -1) { + index = currentIndex(); + } + + return indexDatabaseManagerStruct(index).filePath; +} + + void DatabaseTabWidget::updateTabName(Database* db) { int index = databaseIndex(db); diff --git a/src/gui/DatabaseTabWidget.h b/src/gui/DatabaseTabWidget.h index 443fc73e5..ea8f60030 100644 --- a/src/gui/DatabaseTabWidget.h +++ b/src/gui/DatabaseTabWidget.h @@ -81,6 +81,7 @@ public slots: bool isModified(int index = -1); void performGlobalAutoType(); void lockDatabases(); + QString databasePath(int index = -1); signals: void tabNameChanged(); diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 0f883e4aa..712566e5f 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -530,6 +530,12 @@ void MainWindow::updateWindowTitle() windowTitle = QString("%1 - %2").arg(customWindowTitlePart, BaseWindowTitle); } + if (customWindowTitlePart.isEmpty() || stackedWidgetIndex == 1) { + setWindowFilePath(""); + } else { + setWindowFilePath(m_ui->tabWidget->databasePath(tabWidgetIndex)); + } + setWindowModified(m_ui->tabWidget->isModified(tabWidgetIndex)); setWindowTitle(windowTitle);