Merge remote-tracking branch 'remotes/origin/development'

This commit is contained in:
michal.szwaj 2018-06-01 01:48:14 +02:00
commit f3c6bf2d55

View File

@ -48,7 +48,7 @@ color: rgb(238, 238, 236);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>630</x> <x>630</x>
<y>370</y> <y>330</y>
<width>161</width> <width>161</width>
<height>41</height> <height>41</height>
</rect> </rect>
@ -67,7 +67,7 @@ color: rgb(238, 238, 236);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>630</x> <x>630</x>
<y>420</y> <y>380</y>
<width>161</width> <width>161</width>
<height>41</height> <height>41</height>
</rect> </rect>
@ -98,7 +98,7 @@ color: rgb(238, 238, 236);</string>
<x>10</x> <x>10</x>
<y>440</y> <y>440</y>
<width>271</width> <width>271</width>
<height>21</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -166,8 +166,8 @@ color: rgb(238, 238, 236);</string>
<widget class="QLabel" name="labelCopyrightsInfoIcon"> <widget class="QLabel" name="labelCopyrightsInfoIcon">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>230</x> <x>410</x>
<y>350</y> <y>440</y>
<width>21</width> <width>21</width>
<height>31</height> <height>31</height>
</rect> </rect>
@ -179,9 +179,9 @@ color: rgb(238, 238, 236);</string>
<widget class="QLabel" name="labelTrademark"> <widget class="QLabel" name="labelTrademark">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>260</x> <x>440</x>
<y>350</y> <y>440</y>
<width>361</width> <width>351</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
@ -193,7 +193,7 @@ color: rgb(238, 238, 236);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>630</x> <x>630</x>
<y>270</y> <y>230</y>
<width>161</width> <width>161</width>
<height>41</height> <height>41</height>
</rect> </rect>
@ -212,7 +212,7 @@ color: rgb(238, 238, 236);</string>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>630</x> <x>630</x>
<y>320</y> <y>280</y>
<width>161</width> <width>161</width>
<height>41</height> <height>41</height>
</rect> </rect>
@ -230,8 +230,8 @@ color: rgb(238, 238, 236);</string>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>70</x> <x>50</x>
<y>380</y> <y>370</y>
<width>551</width> <width>551</width>
<height>61</height> <height>61</height>
</rect> </rect>