From be2607541608d6ed66971807ac367d41fc4a1588 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Wed, 15 Feb 2012 21:21:16 +0100
Subject: [PATCH] Fixed dark color of text in locationbar when using dark theme
 on Linux.

---
 .gitignore                             | 4 +++-
 bin/themes/linux/main.css              | 7 -------
 src/cookies/cookiemanager.cpp          | 2 +-
 src/downloads/downloadoptionsdialog.ui | 9 ++++++++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21cfffeed..f783658e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,9 @@ src-*
 bin/qupzilla
 bin/plugins/libExamplePlugin.so
 *.autosave
+*~
 bin/core
 qupzilla.sh
 git_revision
-bin/qupzilla.exe
\ No newline at end of file
+bin/qupzilla.exe
+Thumbs.db
diff --git a/bin/themes/linux/main.css b/bin/themes/linux/main.css
index 52c080a16..4090dc590 100644
--- a/bin/themes/linux/main.css
+++ b/bin/themes/linux/main.css
@@ -12,11 +12,6 @@
 }
 
 /*MainWindow*/
-#mainwindow-menubar:item
-{
-    color: black;
-}
-
 #statusbar-ip-label
 {
     padding-right: 5px;
@@ -115,7 +110,6 @@
 #locationbar
 {
     border-width:4;
-    color:black;
     padding-left: 22px;
     padding-top: -2px;
     qproperty-fixedheight: 27;
@@ -187,7 +181,6 @@
 #websearchbar
 {
     border-width:4;
-    color:black;
     padding-left: 30px;
     padding-top: -2px;
     qproperty-fixedheight: 27;
diff --git a/src/cookies/cookiemanager.cpp b/src/cookies/cookiemanager.cpp
index db32c0b2b..41d199120 100644
--- a/src/cookies/cookiemanager.cpp
+++ b/src/cookies/cookiemanager.cpp
@@ -151,7 +151,7 @@ void CookieManager::slotRefreshTable()
     int counter = 0;
     QString cookieDomain;
     for (int i = 0; i < allCookies.count(); ++i) {
-        const QNetworkCookie& cookie = allCookies.at(i);
+        const QNetworkCookie &cookie = allCookies.at(i);
         QTreeWidgetItem* item;
 
         cookieDomain = cookie.domain();
diff --git a/src/downloads/downloadoptionsdialog.ui b/src/downloads/downloadoptionsdialog.ui
index 613a0cd2c..8d7bfec11 100644
--- a/src/downloads/downloadoptionsdialog.ui
+++ b/src/downloads/downloadoptionsdialog.ui
@@ -47,7 +47,7 @@
     </widget>
    </item>
    <item row="1" column="1" colspan="2">
-    <widget class="QLabel" name="fileName">
+    <widget class="SqueezeLabelV1" name="fileName">
      <property name="text">
       <string/>
      </property>
@@ -164,6 +164,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SqueezeLabelV1</class>
+   <extends>QLabel</extends>
+   <header>squeezelabelv1.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>