From c251683c202aee03d3f43af206949363d80c1722 Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Sun, 14 Sep 2014 21:17:27 +0200
Subject: [PATCH] Move ToolBar setup to GUI design file.

---
 src/MainWindow.ui | 123 ++++++++++++++++++++++++++++++++--------------
 src/mainwin.cc    |  31 +-----------
 2 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index cbc56d8f..071df825 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>936</width>
+    <width>1397</width>
     <height>586</height>
    </rect>
   </property>
@@ -108,7 +108,26 @@
         </widget>
        </item>
        <item>
-        <widget class="ToolBar" name="toolBar" native="true"/>
+        <widget class="ToolBar" name="toolBar">
+         <addaction name="designActionPreview"/>
+         <addaction name="designActionRender"/>
+         <addaction name="separator"/>
+         <addaction name="viewActionZoomIn"/>
+         <addaction name="viewActionZoomOut"/>
+         <addaction name="separator"/>
+         <addaction name="viewActionRight"/>
+         <addaction name="viewActionTop"/>
+         <addaction name="viewActionBottom"/>
+         <addaction name="viewActionLeft"/>
+         <addaction name="viewActionFront"/>
+         <addaction name="viewActionBack"/>
+         <addaction name="separator"/>
+         <addaction name="viewActionPerspective"/>
+         <addaction name="viewActionOrthogonal"/>
+         <addaction name="viewActionShowAxes"/>
+         <addaction name="viewActionShowCrosshairs"/>
+         <addaction name="viewActionShowEdges"/>
+        </widget>
        </item>
       </layout>
       <zorder>animate_panel</zorder>
@@ -123,8 +142,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>936</width>
-     <height>22</height>
+     <width>1397</width>
+     <height>34</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">
@@ -282,7 +301,11 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="EditorToolBar" name="editortoolbar" native="true"/>
+      <widget class="EditorToolBar" name="editortoolbar">
+       <addaction name="fileActionNew"/>
+       <addaction name="fileActionOpen"/>
+       <addaction name="fileActionSave"/>
+      </widget>
      </item>
      <item>
       <widget class="QFrame" name="find_panel">
@@ -407,8 +430,8 @@
   </widget>
   <action name="fileActionNew">
    <property name="icon">
-    <iconset>
-     <normaloff>:/Document-New-128.png</normaloff>:/Document-New-128.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackNew.png</normaloff>:/images/blackNew.png</iconset>
    </property>
    <property name="text">
     <string>&amp;New</string>
@@ -419,8 +442,8 @@
   </action>
   <action name="fileActionOpen">
    <property name="icon">
-    <iconset>
-     <normaloff>:/Open-128.png</normaloff>:/Open-128.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Open-32.png</normaloff>:/images/Open-32.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Open...</string>
@@ -431,8 +454,8 @@
   </action>
   <action name="fileActionSave">
    <property name="icon">
-    <iconset>
-     <normaloff>:/Save-128.png</normaloff>:/Save-128.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Save-32.png</normaloff>:/images/Save-32.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Save</string>
@@ -598,6 +621,10 @@
    </property>
   </action>
   <action name="designActionPreview">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Preview-32.png</normaloff>:/images/Preview-32.png</iconset>
+   </property>
    <property name="text">
     <string>&amp;Preview</string>
    </property>
@@ -607,8 +634,8 @@
   </action>
   <action name="designActionRender">
    <property name="icon">
-    <iconset>
-     <normaloff>:/Arrowhead-Right-32.png</normaloff>:/Arrowhead-Right-32.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackRender.png</normaloff>:/images/blackRender.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Render</string>
@@ -696,8 +723,8 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
-     <normaloff>:/grid.png</normaloff>:/grid.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/Rotation-32.png</normaloff>:/images/Rotation-32.png</iconset>
    </property>
    <property name="text">
     <string>Show Edges</string>
@@ -711,8 +738,8 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
-     <normaloff>:/axes.png</normaloff>:/axes.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackaxes.png</normaloff>:/images/blackaxes.png</iconset>
    </property>
    <property name="text">
     <string>Show Axes</string>
@@ -725,6 +752,10 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/cross.png</normaloff>:/images/cross.png</iconset>
+   </property>
    <property name="text">
     <string>Show Crosshairs</string>
    </property>
@@ -742,8 +773,8 @@
   </action>
   <action name="viewActionTop">
    <property name="icon">
-    <iconset>
-     <normaloff>:/up.png</normaloff>:/up.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackUp.png</normaloff>:/images/blackUp.png</iconset>
    </property>
    <property name="text">
     <string>Top</string>
@@ -754,8 +785,8 @@
   </action>
   <action name="viewActionBottom">
    <property name="icon">
-    <iconset>
-     <normaloff>:/bottom.png</normaloff>:/bottom.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackbottom.png</normaloff>:/images/blackbottom.png</iconset>
    </property>
    <property name="text">
     <string>Bottom</string>
@@ -766,8 +797,8 @@
   </action>
   <action name="viewActionLeft">
    <property name="icon">
-    <iconset>
-     <normaloff>:/left.png</normaloff>:/left.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackleft (copy).png</normaloff>:/images/blackleft (copy).png</iconset>
    </property>
    <property name="text">
     <string>Left</string>
@@ -778,8 +809,8 @@
   </action>
   <action name="viewActionRight">
    <property name="icon">
-    <iconset>
-     <normaloff>:/right.png</normaloff>:/right.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/rightright.png</normaloff>:/images/rightright.png</iconset>
    </property>
    <property name="text">
     <string>Right</string>
@@ -790,8 +821,8 @@
   </action>
   <action name="viewActionFront">
    <property name="icon">
-    <iconset>
-     <normaloff>:/front.png</normaloff>:/front.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackfront.png</normaloff>:/images/blackfront.png</iconset>
    </property>
    <property name="text">
     <string>Front</string>
@@ -802,8 +833,8 @@
   </action>
   <action name="viewActionBack">
    <property name="icon">
-    <iconset>
-     <normaloff>:/back.png</normaloff>:/back.png</iconset>
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/blackback.png</normaloff>:/images/blackback.png</iconset>
    </property>
    <property name="text">
     <string>Back</string>
@@ -829,6 +860,10 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/perspective1.png</normaloff>:/images/perspective1.png</iconset>
+   </property>
    <property name="text">
     <string>Perspective</string>
    </property>
@@ -837,6 +872,10 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/orthogonal.png</normaloff>:/images/orthogonal.png</iconset>
+   </property>
    <property name="text">
     <string>Orthogonal</string>
    </property>
@@ -992,6 +1031,10 @@
    </property>
   </action>
   <action name="viewActionZoomIn">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/zoomin.png</normaloff>:/images/zoomin.png</iconset>
+   </property>
    <property name="text">
     <string>Zoom In</string>
    </property>
@@ -1000,6 +1043,10 @@
    </property>
   </action>
   <action name="viewActionZoomOut">
+   <property name="icon">
+    <iconset resource="../openscad.qrc">
+     <normaloff>:/images/zoomout.png</normaloff>:/images/zoomout.png</iconset>
+   </property>
    <property name="text">
     <string>Zoom Out</string>
    </property>
@@ -1028,20 +1075,22 @@
    <header>QGLView.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>EditorToolBar</class>
-   <extends>QWidget</extends>
-   <header>editortoolbar.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>ToolBar</class>
-   <extends>QWidget</extends>
+   <extends>QToolBar</extends>
    <header>toolbar.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>EditorToolBar</class>
+   <extends>QToolBar</extends>
+   <header>editortoolbar.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../openscad.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>fileActionClose</sender>
diff --git a/src/mainwin.cc b/src/mainwin.cc
index dc063f6d..34ffba8a 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -184,9 +184,6 @@ MainWindow::MainWindow(const QString &filename)
 
 	editorDockContents->layout()->addWidget(editor);
 
-	editortoolbar = new EditorToolBar(this);
-	editorDockContents->layout()->addWidget(editortoolbar);
-
 	setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
 	setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
 	setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
@@ -455,7 +452,7 @@ MainWindow::MainWindow(const QString &filename)
         
 	if(defaultcolor > 165){ 
 	 fileActionNew->setIcon(QIcon("://images/blackNew.png"));
-	 fileActionOpen->setIcon(QIcon("://images/Open-32(1).png"));
+	 fileActionOpen->setIcon(QIcon("://images/Open-32.png"));
 	 fileActionSave->setIcon(QIcon("://images/Save-32.png"));
 	 editActionZoomIn->setIcon(QIcon("://images/zoomin.png"));
 	 editActionZoomOut->setIcon(QIcon("://images/zoomout.png"));
@@ -504,32 +501,6 @@ MainWindow::MainWindow(const QString &filename)
 	 viewActionAnimate->setIcon(QIcon("://images/animate.png"));
 	}
 	
-	 editortoolbar->addAction(fileActionNew);
-	 editortoolbar->addAction(fileActionOpen);
-	 editortoolbar->addAction(fileActionSave);
-	 editortoolbar->addAction(editActionZoomIn);
-	 editortoolbar->addAction(editActionZoomOut);
-
-	 toolBar->addAction(designActionRender);
-	 toolBar->addAction(viewActionPreview);
-	 //toolBar->addAction(viewActionSurfaces);
-	 //toolBar->addAction(viewActionWireframe);
-	 toolBar->addAction(viewActionShowAxes);
-	 //toolBar->addAction(viewActionShowEdges);
-	 toolBar->addAction(viewActionZoomIn);
-	 toolBar->addAction(viewActionZoomOut);
-	 toolBar->addAction(viewActionTop);
-	 toolBar->addAction(viewActionBottom);
-	 toolBar->addAction(viewActionLeft);
-	 toolBar->addAction(viewActionRight);
-	 toolBar->addAction(viewActionFront);
-	 toolBar->addAction(viewActionBack);
-	 //toolBar->addAction(viewActionShowCrosshairs);
-	 toolBar->addAction(viewActionPerspective);
-	 toolBar->addAction(viewActionOrthogonal);
-	 toolBar->addAction(viewActionAnimate);
- 	toolBar->setStyleSheet("QToolBar{border:1 solid black;}" );
-	
 	// make sure it looks nice..
 	QSettings settings;
 	QByteArray windowState = settings.value("window/state", QByteArray()).toByteArray();