From 613b7fc6f3ce9e69cf6c1cc7d56c694e7145cd07 Mon Sep 17 00:00:00 2001
From: Mikkel Krautz <mikkel@krautz.dk>
Date: Sun, 7 Aug 2016 21:03:08 +0200
Subject: [PATCH] GlobalShortcut, Themes: move hard-coded stylesheet from
 GlobalShortcut.ui into the Themes class's default stylesheet.

---
 src/mumble/GlobalShortcut.ui | 7 -------
 src/mumble/Themes.cpp        | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/mumble/GlobalShortcut.ui b/src/mumble/GlobalShortcut.ui
index 56633f8d0..74f5383b8 100644
--- a/src/mumble/GlobalShortcut.ui
+++ b/src/mumble/GlobalShortcut.ui
@@ -28,13 +28,6 @@
       </property>
       <item>
        <widget class="QWidget" name="qwMacWarning" native="true">
-        <property name="styleSheet">
-         <string notr="true">#qwMacWarning {
-  background-color: #FFFEDC;
-  border-radius: 5px;
-  border: 1px solid #B5B59E;
-}</string>
-        </property>
         <layout class="QVBoxLayout" name="verticalLayout_4">
          <item>
           <widget class="QLabel" name="label">
diff --git a/src/mumble/Themes.cpp b/src/mumble/Themes.cpp
index ad33d26f6..fc98fcd9b 100644
--- a/src/mumble/Themes.cpp
+++ b/src/mumble/Themes.cpp
@@ -118,5 +118,5 @@ QVector<QDir> Themes::getSearchDirectories() {
 }
 
 QString Themes::getDefaultStylesheet() {
-	return QLatin1String(".log-channel{text-decoration:none;}.log-user{text-decoration:none;}p{margin:0;}");
+	return QLatin1String(".log-channel{text-decoration:none;}.log-user{text-decoration:none;}p{margin:0;}#qwMacWarning{background-color:#FFFEDC;border-radius:5px;border:1px solid #B5B59E;}");
 }