Changes in MainWindow & PvP-intro scenes

include/gui/mainmenu.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1145</width>
-    <height>702</height>
+    <width>1626</width>
+    <height>1186</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -30,210 +30,34 @@
     <number>0</number>
    </property>
    <item row="0" column="0">
-    <widget class="QWidget" name="topleft_border_" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">border-image: url(:/assets/window/thick_opaque-border-topleft.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QWidget" name="top_border_" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-top.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="QWidget" name="topright_border_" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-topright.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QWidget" name="left_border_" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-left.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
     <widget class="QWidget" name="content_" native="true">
      <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-background.png);</string>
+      <string notr="true">border-image: url(:/assets/common/background.jpg);</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <item row="2" column="0">
+      <property name="leftMargin">
+       <number>75</number>
+      </property>
+      <property name="topMargin">
+       <number>150</number>
+      </property>
+      <item row="0" column="0">
        <widget class="QWidget" name="menu_" native="true">
-        <property name="maximumSize">
+        <property name="minimumSize">
          <size>
           <width>400</width>
-          <height>200</height>
+          <height>600</height>
          </size>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <item>
-          <widget class="QPushButton" name="pvp_local_battle_button">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>350</width>
-             <height>100</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>350</width>
-             <height>100</height>
-            </size>
-           </property>
-           <property name="font">
-            <font>
-             <family>Viking Cyr</family>
-             <pointsize>10</pointsize>
-             <weight>50</weight>
-             <italic>false</italic>
-             <bold>false</bold>
-            </font>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">font: 10pt &quot;Viking Cyr&quot;;
-color: rgb(255, 255, 0);
-border-image: url(:/assets/window/button1.png);
-</string>
-           </property>
-           <property name="text">
-            <string>Игрок против игрока</string>
-           </property>
-           <property name="checkable">
-            <bool>false</bool>
-           </property>
-           <property name="flat">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="exit_button">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>350</width>
-             <height>100</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>350</width>
-             <height>100</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">font: 10pt &quot;Viking Cyr&quot;;
-color: rgb(255, 255, 0);
-border-image: url(:/assets/window/button1.png);
-</string>
-           </property>
-           <property name="text">
-            <string>Выйти из игры</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::MinimumExpanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
+        <property name="maximumSize">
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>400</width>
+          <height>600</height>
          </size>
         </property>
-       </spacer>
-      </item>
-      <item row="0" column="0" colspan="2">
-       <widget class="QLabel" name="title_">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
         <property name="styleSheet">
-         <string notr="true">font: 14pt &quot;Barocco Initial&quot;;</string>
-        </property>
-        <property name="text">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:18pt; color:#b12d2d;&quot;&gt;Супер-мега-крутая-игрушка-название-которой-мы-еще-не-придумали&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="wordWrap">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::MinimumExpanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="1" rowspan="3">
-       <widget class="QWidget" name="image" native="true">
-        <property name="minimumSize">
-         <size>
-          <width>600</width>
-          <height>400</height>
-         </size>
+         <string notr="true">border-image:none;
+background-image:none;</string>
         </property>
         <layout class="QGridLayout" name="gridLayout_3">
          <property name="leftMargin">
@@ -252,7 +76,7 @@ border-image: url(:/assets/window/button1.png);
           <number>0</number>
          </property>
          <item row="0" column="0">
-          <widget class="QWidget" name="widget" native="true">
+          <widget class="QWidget" name="border_upleft_" native="true">
            <property name="minimumSize">
             <size>
              <width>8</width>
@@ -271,10 +95,10 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="0" column="1">
-          <widget class="QWidget" name="widget_2" native="true">
+          <widget class="QWidget" name="border_up_" native="true">
            <property name="minimumSize">
             <size>
-             <width>0</width>
+             <width>8</width>
              <height>5</height>
             </size>
            </property>
@@ -290,7 +114,7 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="0" column="2">
-          <widget class="QWidget" name="widget_3" native="true">
+          <widget class="QWidget" name="border_upright_" native="true">
            <property name="minimumSize">
             <size>
              <width>8</width>
@@ -309,11 +133,11 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="1" column="0">
-          <widget class="QWidget" name="widget_4" native="true">
+          <widget class="QWidget" name="border_left_" native="true">
            <property name="minimumSize">
             <size>
              <width>5</width>
-             <height>0</height>
+             <height>8</height>
             </size>
            </property>
            <property name="maximumSize">
@@ -328,14 +152,149 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="1" column="1">
-          <widget class="QWidget" name="widget_5" native="true">
+          <widget class="QWidget" name="content" native="true">
            <property name="styleSheet">
-            <string notr="true">border-image: url(:/assets/common/background.jpg);</string>
-           </property>
+            <string notr="true">background-image: url(:/assets/window/strong_translucent-background.png);</string>
+           </property>
+           <widget class="QPushButton" name="exit_button">
+            <property name="geometry">
+             <rect>
+              <x>10</x>
+              <y>350</y>
+              <width>350</width>
+              <height>100</height>
+             </rect>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>350</width>
+              <height>100</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>350</width>
+              <height>100</height>
+             </size>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">font: 10pt &quot;Viking Cyr&quot;;
+color: rgb(255, 255, 0);
+border-image: url(:/assets/window/button1.png);
+</string>
+            </property>
+            <property name="text">
+             <string>Выйти из игры</string>
+            </property>
+           </widget>
+           <widget class="QPushButton" name="pvp_local_battle_button">
+            <property name="geometry">
+             <rect>
+              <x>10</x>
+              <y>250</y>
+              <width>350</width>
+              <height>100</height>
+             </rect>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>350</width>
+              <height>100</height>
+             </size>
+            </property>
+            <property name="maximumSize">
+             <size>
+              <width>350</width>
+              <height>100</height>
+             </size>
+            </property>
+            <property name="font">
+             <font>
+              <family>Viking Cyr</family>
+              <pointsize>10</pointsize>
+              <weight>50</weight>
+              <italic>false</italic>
+              <bold>false</bold>
+             </font>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">font: 10pt &quot;Viking Cyr&quot;;
+color: rgb(255, 255, 0);
+border-image: url(:/assets/window/button1.png);
+</string>
+            </property>
+            <property name="text">
+             <string>Игрок против игрока</string>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <property name="flat">
+             <bool>true</bool>
+            </property>
+           </widget>
+           <widget class="QLabel" name="title_">
+            <property name="geometry">
+             <rect>
+              <x>170</x>
+              <y>10</y>
+              <width>191</width>
+              <height>211</height>
+             </rect>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">font: 14pt &quot;Barocco Initial&quot;;
+border-image:none;
+background-image:none;</string>
+            </property>
+            <property name="text">
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:12pt; color:#b12d2d;&quot;&gt;Супер-мега-крутая-игрушка-название-которой-мы-еще-не-придумали&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+           <widget class="QWidget" name="widget" native="true">
+            <property name="geometry">
+             <rect>
+              <x>10</x>
+              <y>20</y>
+              <width>150</width>
+              <height>150</height>
+             </rect>
+            </property>
+            <property name="styleSheet">
+             <string notr="true">border-image: url(:/assets/common/logo.png);</string>
+            </property>
+           </widget>
           </widget>
          </item>
          <item row="1" column="2">
-          <widget class="QWidget" name="widget_6" native="true">
+          <widget class="QWidget" name="border_right_" native="true">
+           <property name="minimumSize">
+            <size>
+             <width>8</width>
+             <height>8</height>
+            </size>
+           </property>
            <property name="maximumSize">
             <size>
              <width>8</width>
@@ -348,7 +307,7 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="2" column="0">
-          <widget class="QWidget" name="widget_8" native="true">
+          <widget class="QWidget" name="border_botleft_" native="true">
            <property name="minimumSize">
             <size>
              <width>8</width>
@@ -367,7 +326,13 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="2" column="1">
-          <widget class="QWidget" name="widget_9" native="true">
+          <widget class="QWidget" name="border_bottom_" native="true">
+           <property name="minimumSize">
+            <size>
+             <width>8</width>
+             <height>8</height>
+            </size>
+           </property>
            <property name="maximumSize">
             <size>
              <width>16777215</width>
@@ -380,7 +345,7 @@ border-image: url(:/assets/window/button1.png);
           </widget>
          </item>
          <item row="2" column="2">
-          <widget class="QWidget" name="widget_7" native="true">
+          <widget class="QWidget" name="border_botright_" native="true">
            <property name="minimumSize">
             <size>
              <width>8</width>
@@ -401,71 +366,39 @@ border-image: url(:/assets/window/button1.png);
         </layout>
        </widget>
       </item>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::MinimumExpanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QWidget" name="right_border_" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-right.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QWidget" name="botleft_border_" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-botleft.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QWidget" name="bottom_border_" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-bottom.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QWidget" name="botright_border_" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-botright.png);</string>
-     </property>
-    </widget>
-   </item>
   </layout>
-  <zorder>content_</zorder>
-  <zorder>top_border_</zorder>
-  <zorder>topleft_border_</zorder>
-  <zorder>left_border_</zorder>
-  <zorder>botleft_border_</zorder>
-  <zorder>bottom_border_</zorder>
-  <zorder>botright_border_</zorder>
-  <zorder>right_border_</zorder>
-  <zorder>topright_border_</zorder>
  </widget>
  <customwidgets>
   <customwidget>

include/hotseatgame/gui/playervsplayerintro.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0">
+  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -29,111 +29,7 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="3">
-    <widget class="QWidget" name="widget_5" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-topright.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QWidget" name="widget_4" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-topleft.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QWidget" name="widget_8" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-botleft.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3">
-    <widget class="QWidget" name="widget_9" native="true">
-     <property name="minimumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>45</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-botright.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QWidget" name="widget_3" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-top.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" rowspan="3">
-    <widget class="QWidget" name="widget_6" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-left.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3" rowspan="3">
-    <widget class="QWidget" name="widget_10" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-right.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1" colspan="2">
-    <widget class="QWidget" name="widget_7" native="true">
-     <property name="styleSheet">
-      <string notr="true">background-image: url(:/assets/window/thick_opaque-border-bottom.png);</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" rowspan="3" colspan="2">
+   <item row="0" column="0" rowspan="2" colspan="2">
     <widget class="QWidget" name="widget" native="true">
      <property name="autoFillBackground">
       <bool>false</bool>

res/GUI.qrc

@@ -17,5 +17,6 @@
         <file>../assets/common/town.jpg</file>
         <file>../assets/common/background.jpg</file>
         <file>../assets/common/book.png</file>
+        <file>../assets/common/logo.png</file>
     </qresource>
 </RCC>