Refactored CAD tool bars to use predefined actions.

[architektonas] / src / forms / cadtoolbarmain.ui

diff --git a/src/forms/cadtoolbarmain.ui b/src/forms/cadtoolbarmain.ui
index 3f11b244393b9eb370ca0766fd05e41a4f4c32d6..b20cf86aab7a04bf516f908f6f0078030727a761 100644 (file)
--- a/src/forms/cadtoolbarmain.ui
+++ b/src/forms/cadtoolbarmain.ui
@@ -7,11 +7,11 @@
     <x>0</x>
     <y>0</y>
     <width>86</width>
-    <height>336</height>
+    <height>224</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,15 +19,27 @@
   <property name="minimumSize">
    <size>
     <width>56</width>
-    <height>336</height>
+    <height>200</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Main</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
     <widget class="QToolButton" name="bMenuPoint">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Points</string>
      </property>
@@ -38,10 +50,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menupoint.xpm</normaloff>:/res/qg_menupoint.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QToolButton" name="bMenuLine">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Lines&quot;</string>
      </property>
@@ -52,10 +76,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuline.xpm</normaloff>:/res/qg_menuline.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QToolButton" name="bMenuArc">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Arcs&quot;</string>
      </property>
@@ -66,10 +102,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuarc.xpm</normaloff>:/res/qg_menuarc.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QToolButton" name="bMenuCircle">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Circles&quot;</string>
      </property>
@@ -80,10 +128,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menucircle.xpm</normaloff>:/res/qg_menucircle.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="2" column="0">
     <widget class="QToolButton" name="bMenuEllipse">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Ellipses&quot;</string>
      </property>
@@ -94,10 +154,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuellipse.xpm</normaloff>:/res/qg_menuellipse.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="QToolButton" name="bMenuSpline">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Splines</string>
      </property>
@@ -108,10 +180,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuspline.xpm</normaloff>:/res/qg_menuspline.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="3" column="0">
     <widget class="QToolButton" name="bMenuPolyline">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Polylines</string>
      </property>
@@ -122,12 +206,18 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menupolyline.xpm</normaloff>:/res/qg_menupolyline.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="4" column="0">
     <widget class="QToolButton" name="bMenuText">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -142,12 +232,18 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menutext.xpm</normaloff>:/res/qg_menutext.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="4" column="1">
     <widget class="QToolButton" name="bMenuDim">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -162,12 +258,18 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menudim.png</normaloff>:/res/qg_menudim.png</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="5" column="0">
     <widget class="QToolButton" name="bMenuHatch">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -182,10 +284,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuhatch.xpm</normaloff>:/res/qg_menuhatch.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="5" column="1">
     <widget class="QToolButton" name="bMenuImage">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Raster Image</string>
      </property>
@@ -196,10 +310,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuimage.xpm</normaloff>:/res/qg_menuimage.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QToolButton" name="bMenuModify">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Edit&quot;</string>
      </property>
@@ -210,10 +336,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuedit.xpm</normaloff>:/res/qg_menuedit.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="6" column="1">
     <widget class="QToolButton" name="bMenuInfo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Measure&quot;</string>
      </property>
@@ -224,10 +362,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menumeasure.xpm</normaloff>:/res/qg_menumeasure.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="7" column="0">
     <widget class="QToolButton" name="bMenuBlock">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Create Block</string>
      </property>
@@ -238,10 +388,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menublock.xpm</normaloff>:/res/qg_menublock.xpm</iconset>
      </property>
+     <property name="iconSize">
+      <size>
+       <width>18</width>
+       <height>18</height>
+      </size>
+     </property>
     </widget>
    </item>
    <item row="7" column="1">
     <widget class="QToolButton" name="bMenuSelect">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip">
       <string>Show menu &quot;Select&quot;</string>
      </property>
@@ -252,29 +414,22 @@
       <iconset resource="res/architektonas.qrc">
        <normaloff>:/res/qg_menuselect.xpm</normaloff>:/res/qg_menuselect.xpm</iconset>
      </property>
-    </widget>
-   </item>
-   <item row="8" column="0" colspan="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
+     <property name="iconSize">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>18</width>
+       <height>18</height>
       </size>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="3" column="2" rowspan="3">
+   <item row="4" column="2">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
-       <width>40</width>
+       <width>8</width>
        <height>20</height>
       </size>
      </property>