1.1 --- a/ui/mainwindow.ui	Sun Aug 30 05:54:32 2015 +0300
     1.2 +++ b/ui/mainwindow.ui	Mon Aug 31 01:55:24 2015 +0300
     1.3 @@ -6,10 +6,16 @@
     1.4     <rect>
     1.5      <x>0</x>
     1.6      <y>0</y>
     1.7 -    <width>800</width>
     1.8 -    <height>480</height>
     1.9 +    <width>910</width>
    1.10 +    <height>591</height>
    1.11     </rect>
    1.12    </property>
    1.13 +  <property name="sizePolicy">
    1.14 +   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
    1.15 +    <horstretch>0</horstretch>
    1.16 +    <verstretch>0</verstretch>
    1.17 +   </sizepolicy>
    1.18 +  </property>
    1.19    <property name="windowTitle">
    1.20     <string>MainWindow</string>
    1.21    </property>
    1.22 @@ -17,249 +23,199 @@
    1.23     <layout class="QHBoxLayout" name="horizontalLayout">
    1.24      <item>
    1.25       <widget class="QTabWidget" name="tabWidget">
    1.26 +      <property name="sizePolicy">
    1.27 +       <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
    1.28 +        <horstretch>0</horstretch>
    1.29 +        <verstretch>0</verstretch>
    1.30 +       </sizepolicy>
    1.31 +      </property>
    1.32        <property name="currentIndex">
    1.33 -       <number>1</number>
    1.34 +       <number>0</number>
    1.35        </property>
    1.36        <widget class="QWidget" name="tab_create">
    1.37         <attribute name="title">
    1.38 -        <string>Tab 1</string>
    1.39 +        <string>Create</string>
    1.40         </attribute>
    1.41 -       <widget class="QPushButton" name="bn_add_sphere">
    1.42 -        <property name="geometry">
    1.43 -         <rect>
    1.44 -          <x>10</x>
    1.45 -          <y>10</y>
    1.46 -          <width>115</width>
    1.47 -          <height>32</height>
    1.48 -         </rect>
    1.49 -        </property>
    1.50 -        <property name="text">
    1.51 -         <string>Sphere</string>
    1.52 -        </property>
    1.53 -       </widget>
    1.54 -       <widget class="QPushButton" name="bn_add_box">
    1.55 -        <property name="geometry">
    1.56 -         <rect>
    1.57 -          <x>10</x>
    1.58 -          <y>40</y>
    1.59 -          <width>115</width>
    1.60 -          <height>32</height>
    1.61 -         </rect>
    1.62 -        </property>
    1.63 -        <property name="text">
    1.64 -         <string>Box</string>
    1.65 -        </property>
    1.66 -       </widget>
    1.67 -       <widget class="QPushButton" name="bn_add_capsule">
    1.68 -        <property name="geometry">
    1.69 -         <rect>
    1.70 -          <x>180</x>
    1.71 -          <y>70</y>
    1.72 -          <width>115</width>
    1.73 -          <height>32</height>
    1.74 -         </rect>
    1.75 -        </property>
    1.76 -        <property name="text">
    1.77 -         <string>Capsule</string>
    1.78 -        </property>
    1.79 -       </widget>
    1.80 -       <widget class="QPushButton" name="bn_add_rbox">
    1.81 -        <property name="geometry">
    1.82 -         <rect>
    1.83 -          <x>180</x>
    1.84 -          <y>40</y>
    1.85 -          <width>115</width>
    1.86 -          <height>32</height>
    1.87 -         </rect>
    1.88 -        </property>
    1.89 -        <property name="text">
    1.90 -         <string>Rounded Box</string>
    1.91 -        </property>
    1.92 -       </widget>
    1.93 -       <widget class="QPushButton" name="bn_add_cylinder">
    1.94 -        <property name="geometry">
    1.95 -         <rect>
    1.96 -          <x>10</x>
    1.97 -          <y>70</y>
    1.98 -          <width>115</width>
    1.99 -          <height>32</height>
   1.100 -         </rect>
   1.101 -        </property>
   1.102 -        <property name="text">
   1.103 -         <string>Cylinder</string>
   1.104 -        </property>
   1.105 -       </widget>
   1.106 -       <widget class="QPushButton" name="bn_add_cone">
   1.107 -        <property name="geometry">
   1.108 -         <rect>
   1.109 -          <x>10</x>
   1.110 -          <y>100</y>
   1.111 -          <width>115</width>
   1.112 -          <height>32</height>
   1.113 -         </rect>
   1.114 -        </property>
   1.115 -        <property name="text">
   1.116 -         <string>Cone</string>
   1.117 -        </property>
   1.118 -       </widget>
   1.119 -       <widget class="QPushButton" name="bn_add_revol">
   1.120 -        <property name="geometry">
   1.121 -         <rect>
   1.122 -          <x>180</x>
   1.123 -          <y>10</y>
   1.124 -          <width>115</width>
   1.125 -          <height>32</height>
   1.126 -         </rect>
   1.127 -        </property>
   1.128 -        <property name="text">
   1.129 -         <string>Revolution</string>
   1.130 -        </property>
   1.131 -       </widget>
   1.132 -       <widget class="QPushButton" name="bn_add_heightfield">
   1.133 -        <property name="geometry">
   1.134 -         <rect>
   1.135 -          <x>180</x>
   1.136 -          <y>130</y>
   1.137 -          <width>115</width>
   1.138 -          <height>32</height>
   1.139 -         </rect>
   1.140 -        </property>
   1.141 -        <property name="text">
   1.142 -         <string>Heightfield</string>
   1.143 -        </property>
   1.144 -       </widget>
   1.145 -       <widget class="QPushButton" name="bn_add_sweep">
   1.146 -        <property name="geometry">
   1.147 -         <rect>
   1.148 -          <x>180</x>
   1.149 -          <y>100</y>
   1.150 -          <width>115</width>
   1.151 -          <height>32</height>
   1.152 -         </rect>
   1.153 -        </property>
   1.154 -        <property name="text">
   1.155 -         <string>Sweep</string>
   1.156 -        </property>
   1.157 -       </widget>
   1.158 -       <widget class="QPushButton" name="bn_add_plane">
   1.159 -        <property name="geometry">
   1.160 -         <rect>
   1.161 -          <x>20</x>
   1.162 -          <y>130</y>
   1.163 -          <width>115</width>
   1.164 -          <height>32</height>
   1.165 -         </rect>
   1.166 -        </property>
   1.167 -        <property name="text">
   1.168 -         <string>Inf. Plane</string>
   1.169 -        </property>
   1.170 -       </widget>
   1.171 -       <widget class="QScrollArea" name="area_add_prop">
   1.172 -        <property name="geometry">
   1.173 -         <rect>
   1.174 -          <x>10</x>
   1.175 -          <y>180</y>
   1.176 -          <width>351</width>
   1.177 -          <height>251</height>
   1.178 -         </rect>
   1.179 -        </property>
   1.180 -        <property name="widgetResizable">
   1.181 -         <bool>true</bool>
   1.182 -        </property>
   1.183 -        <widget class="QWidget" name="addprop_null">
   1.184 -         <property name="enabled">
   1.185 -          <bool>true</bool>
   1.186 -         </property>
   1.187 -         <property name="geometry">
   1.188 -          <rect>
   1.189 -           <x>0</x>
   1.190 -           <y>0</y>
   1.191 -           <width>349</width>
   1.192 -           <height>249</height>
   1.193 -          </rect>
   1.194 -         </property>
   1.195 -        </widget>
   1.196 -       </widget>
   1.197 +       <layout class="QVBoxLayout" name="verticalLayout">
   1.198 +        <item>
   1.199 +         <layout class="QGridLayout" name="gridLayout">
   1.200 +          <item row="0" column="0">
   1.201 +           <widget class="QPushButton" name="bn_add_sphere">
   1.202 +            <property name="text">
   1.203 +             <string>Sphere</string>
   1.204 +            </property>
   1.205 +            <property name="checkable">
   1.206 +             <bool>false</bool>
   1.207 +            </property>
   1.208 +            <property name="checked">
   1.209 +             <bool>false</bool>
   1.210 +            </property>
   1.211 +           </widget>
   1.212 +          </item>
   1.213 +          <item row="0" column="1">
   1.214 +           <widget class="QPushButton" name="bn_add_revol">
   1.215 +            <property name="text">
   1.216 +             <string>Revolution</string>
   1.217 +            </property>
   1.218 +           </widget>
   1.219 +          </item>
   1.220 +          <item row="1" column="0">
   1.221 +           <widget class="QPushButton" name="bn_add_box">
   1.222 +            <property name="text">
   1.223 +             <string>Box</string>
   1.224 +            </property>
   1.225 +           </widget>
   1.226 +          </item>
   1.227 +          <item row="1" column="1">
   1.228 +           <widget class="QPushButton" name="bn_add_rbox">
   1.229 +            <property name="text">
   1.230 +             <string>Rounded Box</string>
   1.231 +            </property>
   1.232 +           </widget>
   1.233 +          </item>
   1.234 +          <item row="2" column="0">
   1.235 +           <widget class="QPushButton" name="bn_add_cylinder">
   1.236 +            <property name="text">
   1.237 +             <string>Cylinder</string>
   1.238 +            </property>
   1.239 +           </widget>
   1.240 +          </item>
   1.241 +          <item row="2" column="1">
   1.242 +           <widget class="QPushButton" name="bn_add_capsule">
   1.243 +            <property name="text">
   1.244 +             <string>Capsule</string>
   1.245 +            </property>
   1.246 +           </widget>
   1.247 +          </item>
   1.248 +          <item row="3" column="0">
   1.249 +           <widget class="QPushButton" name="bn_add_cone">
   1.250 +            <property name="text">
   1.251 +             <string>Cone</string>
   1.252 +            </property>
   1.253 +           </widget>
   1.254 +          </item>
   1.255 +          <item row="3" column="1">
   1.256 +           <widget class="QPushButton" name="bn_add_sweep">
   1.257 +            <property name="text">
   1.258 +             <string>Sweep</string>
   1.259 +            </property>
   1.260 +           </widget>
   1.261 +          </item>
   1.262 +          <item row="4" column="0">
   1.263 +           <widget class="QPushButton" name="bn_add_plane">
   1.264 +            <property name="text">
   1.265 +             <string>Inf. Plane</string>
   1.266 +            </property>
   1.267 +           </widget>
   1.268 +          </item>
   1.269 +          <item row="4" column="1">
   1.270 +           <widget class="QPushButton" name="bn_add_heightfield">
   1.271 +            <property name="text">
   1.272 +             <string>Heightfield</string>
   1.273 +            </property>
   1.274 +           </widget>
   1.275 +          </item>
   1.276 +         </layout>
   1.277 +        </item>
   1.278 +        <item>
   1.279 +         <widget class="QScrollArea" name="area_add_prop">
   1.280 +          <property name="sizePolicy">
   1.281 +           <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
   1.282 +            <horstretch>0</horstretch>
   1.283 +            <verstretch>0</verstretch>
   1.284 +           </sizepolicy>
   1.285 +          </property>
   1.286 +          <property name="widgetResizable">
   1.287 +           <bool>true</bool>
   1.288 +          </property>
   1.289 +          <widget class="QWidget" name="addprop_null">
   1.290 +           <property name="enabled">
   1.291 +            <bool>true</bool>
   1.292 +           </property>
   1.293 +           <property name="geometry">
   1.294 +            <rect>
   1.295 +             <x>0</x>
   1.296 +             <y>0</y>
   1.297 +             <width>344</width>
   1.298 +             <height>357</height>
   1.299 +            </rect>
   1.300 +           </property>
   1.301 +          </widget>
   1.302 +         </widget>
   1.303 +        </item>
   1.304 +       </layout>
   1.305        </widget>
   1.306        <widget class="QWidget" name="tab_2">
   1.307         <attribute name="title">
   1.308 -        <string>Tab 2</string>
   1.309 +        <string>Modify</string>
   1.310         </attribute>
   1.311 -       <widget class="QScrollArea" name="area_mod_prop">
   1.312 -        <property name="geometry">
   1.313 -         <rect>
   1.314 -          <x>10</x>
   1.315 -          <y>180</y>
   1.316 -          <width>351</width>
   1.317 -          <height>241</height>
   1.318 -         </rect>
   1.319 -        </property>
   1.320 -        <property name="widgetResizable">
   1.321 -         <bool>true</bool>
   1.322 -        </property>
   1.323 -        <widget class="QWidget" name="addprop_null_2">
   1.324 -         <property name="enabled">
   1.325 -          <bool>true</bool>
   1.326 -         </property>
   1.327 -         <property name="geometry">
   1.328 -          <rect>
   1.329 -           <x>0</x>
   1.330 -           <y>0</y>
   1.331 -           <width>349</width>
   1.332 -           <height>239</height>
   1.333 -          </rect>
   1.334 -         </property>
   1.335 -        </widget>
   1.336 -       </widget>
   1.337 -       <widget class="QListWidget" name="listWidget">
   1.338 -        <property name="geometry">
   1.339 -         <rect>
   1.340 -          <x>10</x>
   1.341 -          <y>0</y>
   1.342 -          <width>211</width>
   1.343 -          <height>171</height>
   1.344 -         </rect>
   1.345 -        </property>
   1.346 -       </widget>
   1.347 -       <widget class="QPushButton" name="bn_prim_dup">
   1.348 -        <property name="geometry">
   1.349 -         <rect>
   1.350 -          <x>240</x>
   1.351 -          <y>50</y>
   1.352 -          <width>115</width>
   1.353 -          <height>32</height>
   1.354 -         </rect>
   1.355 -        </property>
   1.356 -        <property name="text">
   1.357 -         <string>Duplicate</string>
   1.358 -        </property>
   1.359 -       </widget>
   1.360 -       <widget class="QPushButton" name="bn_prim_del">
   1.361 -        <property name="geometry">
   1.362 -         <rect>
   1.363 -          <x>240</x>
   1.364 -          <y>90</y>
   1.365 -          <width>115</width>
   1.366 -          <height>32</height>
   1.367 -         </rect>
   1.368 -        </property>
   1.369 -        <property name="text">
   1.370 -         <string>Delete</string>
   1.371 -        </property>
   1.372 -       </widget>
   1.373 -       <widget class="QPushButton" name="bn_prim_hide">
   1.374 -        <property name="geometry">
   1.375 -         <rect>
   1.376 -          <x>240</x>
   1.377 -          <y>10</y>
   1.378 -          <width>115</width>
   1.379 -          <height>32</height>
   1.380 -         </rect>
   1.381 -        </property>
   1.382 -        <property name="text">
   1.383 -         <string>Hide</string>
   1.384 -        </property>
   1.385 -       </widget>
   1.386 +       <layout class="QVBoxLayout" name="verticalLayout_3">
   1.387 +        <item>
   1.388 +         <layout class="QHBoxLayout" name="horizontalLayout_2">
   1.389 +          <item>
   1.390 +           <widget class="QListWidget" name="listWidget">
   1.391 +            <property name="sizePolicy">
   1.392 +             <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
   1.393 +              <horstretch>0</horstretch>
   1.394 +              <verstretch>0</verstretch>
   1.395 +             </sizepolicy>
   1.396 +            </property>
   1.397 +           </widget>
   1.398 +          </item>
   1.399 +          <item>
   1.400 +           <layout class="QVBoxLayout" name="verticalLayout_2">
   1.401 +            <item>
   1.402 +             <widget class="QPushButton" name="bn_prim_hide">
   1.403 +              <property name="text">
   1.404 +               <string>Hide</string>
   1.405 +              </property>
   1.406 +             </widget>
   1.407 +            </item>
   1.408 +            <item>
   1.409 +             <widget class="QPushButton" name="bn_prim_dup">
   1.410 +              <property name="text">
   1.411 +               <string>Duplicate</string>
   1.412 +              </property>
   1.413 +             </widget>
   1.414 +            </item>
   1.415 +            <item>
   1.416 +             <widget class="QPushButton" name="bn_prim_del">
   1.417 +              <property name="text">
   1.418 +               <string>Delete</string>
   1.419 +              </property>
   1.420 +             </widget>
   1.421 +            </item>
   1.422 +           </layout>
   1.423 +          </item>
   1.424 +         </layout>
   1.425 +        </item>
   1.426 +        <item>
   1.427 +         <widget class="QScrollArea" name="area_mod_prop">
   1.428 +          <property name="sizePolicy">
   1.429 +           <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
   1.430 +            <horstretch>0</horstretch>
   1.431 +            <verstretch>0</verstretch>
   1.432 +           </sizepolicy>
   1.433 +          </property>
   1.434 +          <property name="widgetResizable">
   1.435 +           <bool>true</bool>
   1.436 +          </property>
   1.437 +          <widget class="QWidget" name="addprop_null_2">
   1.438 +           <property name="enabled">
   1.439 +            <bool>true</bool>
   1.440 +           </property>
   1.441 +           <property name="geometry">
   1.442 +            <rect>
   1.443 +             <x>0</x>
   1.444 +             <y>0</y>
   1.445 +             <width>344</width>
   1.446 +             <height>248</height>
   1.447 +            </rect>
   1.448 +           </property>
   1.449 +          </widget>
   1.450 +         </widget>
   1.451 +        </item>
   1.452 +       </layout>
   1.453        </widget>
   1.454       </widget>
   1.455      </item>
   1.456 @@ -281,6 +237,72 @@
   1.457      </item>
   1.458     </layout>
   1.459    </widget>
   1.460 +  <widget class="QMenuBar" name="menuBar">
   1.461 +   <property name="geometry">
   1.462 +    <rect>
   1.463 +     <x>0</x>
   1.464 +     <y>0</y>
   1.465 +     <width>910</width>
   1.466 +     <height>20</height>
   1.467 +    </rect>
   1.468 +   </property>
   1.469 +   <widget class="QMenu" name="menu_File">
   1.470 +    <property name="title">
   1.471 +     <string>&amp;File</string>
   1.472 +    </property>
   1.473 +    <addaction name="action_new"/>
   1.474 +    <addaction name="action_open"/>
   1.475 +    <addaction name="action_save"/>
   1.476 +    <addaction name="separator"/>
   1.477 +    <addaction name="action_export_mesh"/>
   1.478 +    <addaction name="action_export_shader"/>
   1.479 +    <addaction name="separator"/>
   1.480 +    <addaction name="action_quit"/>
   1.481 +   </widget>
   1.482 +   <widget class="QMenu" name="menu_Help">
   1.483 +    <property name="title">
   1.484 +     <string>&amp;Help</string>
   1.485 +    </property>
   1.486 +    <addaction name="action_about"/>
   1.487 +   </widget>
   1.488 +   <addaction name="menu_File"/>
   1.489 +   <addaction name="menu_Help"/>
   1.490 +  </widget>
   1.491 +  <action name="action_new">
   1.492 +   <property name="text">
   1.493 +    <string>&amp;New</string>
   1.494 +   </property>
   1.495 +  </action>
   1.496 +  <action name="action_open">
   1.497 +   <property name="text">
   1.498 +    <string>&amp;Open</string>
   1.499 +   </property>
   1.500 +  </action>
   1.501 +  <action name="action_save">
   1.502 +   <property name="text">
   1.503 +    <string>&amp;Save</string>
   1.504 +   </property>
   1.505 +  </action>
   1.506 +  <action name="action_export_mesh">
   1.507 +   <property name="text">
   1.508 +    <string>Export &amp;Mesh</string>
   1.509 +   </property>
   1.510 +  </action>
   1.511 +  <action name="action_export_shader">
   1.512 +   <property name="text">
   1.513 +    <string>Export &amp;GLSL</string>
   1.514 +   </property>
   1.515 +  </action>
   1.516 +  <action name="action_quit">
   1.517 +   <property name="text">
   1.518 +    <string>&amp;Quit</string>
   1.519 +   </property>
   1.520 +  </action>
   1.521 +  <action name="action_about">
   1.522 +   <property name="text">
   1.523 +    <string>&amp;About</string>
   1.524 +   </property>
   1.525 +  </action>
   1.526   </widget>
   1.527   <layoutdefault spacing="6" margin="11"/>
   1.528   <customwidgets>