Skip to content

Commit

Permalink
Merge pull request #11 from MangriMen/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@MangriMen
MangriMen authored Aug 20, 2021
2 parents a23c8a6 + ba1ab3d commit bb40aeb
Show file tree
Hide file tree
Showing 4 changed files with 323 additions and 58 deletions.
144 changes: 132 additions & 12 deletions data/TRND.ui → data/main_window.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<item row="0" column="1">
<widget class="QTabWidget" name="tabWidgetMain">
<property name="font">
<font>
Expand Down Expand Up @@ -54,7 +54,7 @@
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QSplitter" name="splitter">
<widget class="QSplitter" name="splitterTabMain">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -296,6 +296,123 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tabParts">
<attribute name="title">
<string>Оружие и моды</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QSplitter" name="splitterTabParts">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="handleWidth">
<number>15</number>
</property>
<widget class="QWidget" name="verticalLayoutWidget">
<layout class="QVBoxLayout" name="PartsWeaponsLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
<layout class="QHBoxLayout" name="PartsWeaponsFindLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="lblPartsWeaponsFind">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>ОРУЖИЕ:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lePartsWeaponsFind">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeView" name="twPartsWeapons">
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="verticalLayoutWidget_2">
<layout class="QVBoxLayout" name="PartsModsLayout">
<property name="leftMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="PartsModsFindLayout">
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="lblPartsModsFind">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>МОД:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lePartsModsFind">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeView" name="twPartsMods">
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabData">
<attribute name="title">
<string>Данные</string>
Expand Down Expand Up @@ -346,7 +463,7 @@
</widget>
</item>
<item row="1" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="UpdateInfoLayout">
<item>
<widget class="QTextEdit" name="teUpdateInfo">
<property name="font">
Expand All @@ -365,13 +482,13 @@
<widget class="QLabel" name="lblTotal">
<property name="font">
<font>
<pointsize>8</pointsize>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>ВСЕГО:</string>
<string>Всего:</string>
</property>
</widget>
</item>
Expand All @@ -390,7 +507,7 @@
</property>
<property name="font">
<font>
<pointsize>8</pointsize>
<pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
Expand All @@ -405,7 +522,7 @@
<number>1</number>
</property>
<property name="text">
<string>СЕЙЧАС:</string>
<string>Сейчас:</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
Expand All @@ -425,7 +542,7 @@
<widget class="QLabel" name="lblProgress">
<property name="font">
<font>
<pointsize>10</pointsize>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
Expand Down Expand Up @@ -689,31 +806,34 @@
</property>
<property name="minimumSize">
<size>
<width>165</width>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>ВЕРСИЯ ПРИЛОЖЕНИЯ:</string>
<string>Версия:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblVersion">
<property name="font">
<font>
<pointsize>10</pointsize>
<pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>TextLabel</string>
</property>
Expand Down
Loading

0 comments on commit bb40aeb

Please sign in to comment.