From 166e3df8501e040362f7ac7bb1322360cfb24e2a Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Fri, 9 Jan 2015 18:20:07 +0100
Subject: [PATCH] Remove setting the font size for the warning/error bar.

---
 src/MainWindow.h  |  2 +-
 src/MainWindow.ui | 78 +++++++++++++++++++++++++++--------------------
 src/mainwin.cc    |  9 +++---
 3 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/MainWindow.h b/src/MainWindow.h
index dc5c8140..f753bdfe 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -205,7 +205,7 @@ public slots:
 	void actionReloadRenderPreview();
         void on_editorDock_visibilityChanged(bool);
         void on_consoleDock_visibilityChanged(bool);
-        void on_pushButtonCompileResultClose_clicked();
+        void on_toolButtonCompileResultClose_clicked();
         void editorTopLevelChanged(bool);
         void consoleTopLevelChanged(bool);
 #ifdef ENABLE_OPENCSG
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index e316e56b..22740ec6 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -45,37 +45,18 @@
           <property name="leftMargin">
            <number>9</number>
           </property>
+          <property name="topMargin">
+           <number>9</number>
+          </property>
           <property name="rightMargin">
-           <number>2</number>
+           <number>9</number>
           </property>
           <property name="bottomMargin">
-           <number>2</number>
+           <number>6</number>
+          </property>
+          <property name="horizontalSpacing">
+           <number>4</number>
           </property>
-          <item row="0" column="0">
-           <widget class="QLabel" name="labelCompileResultIcon">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>26</width>
-              <height>26</height>
-             </size>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="pixmap">
-             <pixmap resource="../openscad.qrc">:/icons/information-icons-error.png</pixmap>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="1">
            <widget class="QLabel" name="labelCompileResultMessage">
             <property name="sizePolicy">
@@ -86,7 +67,6 @@
             </property>
             <property name="font">
              <font>
-              <pointsize>14</pointsize>
               <weight>75</weight>
               <bold>true</bold>
              </font>
@@ -97,7 +77,10 @@
            </widget>
           </item>
           <item row="0" column="2">
-           <widget class="QPushButton" name="pushButtonCompileResultClose">
+           <widget class="QToolButton" name="toolButtonCompileResultClose">
+            <property name="styleSheet">
+             <string notr="true"/>
+            </property>
             <property name="text">
              <string/>
             </property>
@@ -105,11 +88,43 @@
              <iconset resource="../openscad.qrc">
               <normaloff>:/icons/close.png</normaloff>:/icons/close.png</iconset>
             </property>
-            <property name="flat">
+            <property name="iconSize">
+             <size>
+              <width>22</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="toolButtonStyle">
+             <enum>Qt::ToolButtonIconOnly</enum>
+            </property>
+            <property name="autoRaise">
              <bool>true</bool>
             </property>
            </widget>
           </item>
+          <item row="0" column="0">
+           <widget class="QToolButton" name="toolButtonCompileResultIcon">
+            <property name="styleSheet">
+             <string notr="true">QToolButton { border: none; }</string>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="../openscad.qrc">
+              <normaloff>:/icons/information-icons-error.png</normaloff>:/icons/information-icons-error.png</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>22</width>
+              <height>22</height>
+             </size>
+            </property>
+            <property name="autoRaise">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -874,9 +889,6 @@
    <property name="text">
     <string>Show Scale Markers</string>
    </property>
-   <!--<property name="shortcut">
-    <string></string>
-   </property>-->
   </action>
   <action name="viewActionAnimate">
    <property name="checkable">
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 123bfd4d..014a5f13 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -957,7 +957,7 @@ void MainWindow::waitAfterReload()
 	}
 }
 
-void MainWindow::on_pushButtonCompileResultClose_clicked()
+void MainWindow::on_toolButtonCompileResultClose_clicked()
 {
 	frameCompileResult->hide();
 }
@@ -977,10 +977,11 @@ void MainWindow::updateCompileResult()
 			QFileInfo fileInfo(fileName);
 			msg = QString(_("Error while compiling '%1'.")).arg(fileInfo.fileName());
 		}
-		labelCompileResultIcon->setPixmap(QPixmap(QString::fromUtf8(":/icons/information-icons-error.png")));
+		toolButtonCompileResultIcon->setIcon(QIcon(QString::fromUtf8(":/icons/information-icons-error.png")));
 	} else {
-		msg = QString(_("Compilation generated %1 warnings.")).arg(compileWarnings);
-		labelCompileResultIcon->setPixmap(QPixmap(QString::fromUtf8(":/icons/information-icons-warning.png")));
+		const char *fmt = ngettext("Compilation generated %1 warning.", "Compilation generated %1 warnings.", compileWarnings);
+		msg = QString(fmt).arg(compileWarnings);
+		toolButtonCompileResultIcon->setIcon(QIcon(QString::fromUtf8(":/icons/information-icons-warning.png")));
 	}
 	msg += _(" For details see <a href=\"#console\">console window</a>.");
 	labelCompileResultMessage->setText(msg);