From 757bb7d875406ed499b4e625ddcf6524d0c9875e Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Thu, 13 Feb 2014 12:11:45 +0000 Subject: [PATCH] More UnifiedTitleToolbar Fixups .. fix preferences dialog toolbar .. dodgy stylesheet fixed in MainWindow --- src/ConfigDialog.cpp | 2 ++ src/MainWindow.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ConfigDialog.cpp b/src/ConfigDialog.cpp index 5b31d7016..2c3f03661 100644 --- a/src/ConfigDialog.cpp +++ b/src/ConfigDialog.cpp @@ -41,6 +41,8 @@ ConfigDialog::ConfigDialog(QDir _home, Zones *_zones, Context *context) : QToolBar *head = addToolBar(tr("Preferences")); setFixedSize(525,540); setUnifiedTitleAndToolBarOnMac(true); + head->setFloatable(false); + head->setMovable(false); #else QToolBar *head = addToolBar(tr("Options")); head->setMovable(false); // oops! diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 10dbe8109..90d277003 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -246,8 +246,8 @@ MainWindow::MainWindow(const QDir &home) head->setStyleSheet(" QToolBar:active { border: 0px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #C6C6C6, stop: 1 #A5A5A5 ); } " " QToolBar:!active { border: 0px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #D9D9D9, stop: 1 #D6D6D6 ); } "); #else - head->setStyleSheet(" QToolBar:!active { border: 0px; black; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F0F0F0, stop: 1 #E8E8E8 ); } " - " QToolBar:active { border: 0px; black; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #D9D9D9, stop: 1 #A5A5A5 ); } "); + head->setStyleSheet(" QToolBar:!active { border: 0px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F0F0F0, stop: 1 #E8E8E8 ); } " + " QToolBar:active { border: 0px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #D9D9D9, stop: 1 #A5A5A5 ); } "); #endif // widgets