version 2.17.0

iconedlabel icon size scale in auto scale mode
BlockItem decors visibility logic flags
This commit is contained in:
2023-06-05 23:26:23 +03:00
parent f6205cab55
commit 7ce2b31ec9
12 changed files with 243 additions and 78 deletions

View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1197</width>
<height>268</height>
<width>1166</width>
<height>108</height>
</rect>
</property>
<property name="windowTitle">
@@ -29,7 +29,7 @@
<item>
<widget class="QStackedWidget" name="stackedProperties">
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="QWidget" name="pageText">
<layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -686,12 +686,16 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="labelPen">
<property name="pixmap">
<pixmap resource="qad_blockview.qrc">:/icons/format-stroke-color.png</pixmap>
<widget class="IconedLabel" name="labelPen">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="scaledContents">
<bool>true</bool>
<property name="icon">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/format-stroke-color.png</normaloff>:/icons/format-stroke-color.png</iconset>
</property>
</widget>
</item>
@@ -722,12 +726,16 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="labelBrush">
<property name="pixmap">
<pixmap resource="qad_blockview.qrc">:/icons/format-fill-color.png</pixmap>
<widget class="IconedLabel" name="labelBrush">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="scaledContents">
<bool>true</bool>
<property name="icon">
<iconset resource="qad_blockview.qrc">
<normaloff>:/icons/format-fill-color.png</normaloff>:/icons/format-fill-color.png</iconset>
</property>
</widget>
</item>
@@ -741,6 +749,68 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupShowLogic">
<property name="title">
<string>Visible logic</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="bottomMargin">
<number>4</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkVLEnabled">
<property name="text">
<string>Enabled</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkVLHovered">
<property name="text">
<string>Hovered</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkVLSelected">
<property name="text">
<string>Selected</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkVLInverse">
<property name="text">
<string>Iversed</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
<action name="actionTop">
<property name="checkable">
@@ -812,6 +882,11 @@
<extends>QPushButton</extends>
<header>colorbutton.h</header>
</customwidget>
<customwidget>
<class>IconedLabel</class>
<extends>QFrame</extends>
<header>iconedlabel.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="qad_blockview.qrc"/>