From a084673a752bcc7a8c20c1af2f720db9b555d6ba Mon Sep 17 00:00:00 2001 From: Postnickov <postnickov.lyoha@yandex.ru> Date: Thu, 8 Oct 2020 13:15:21 +0300 Subject: [PATCH 1/2] [*]BugReportScreen add frmEditMessage --- vpn/ui/dialogs/BugReportScreen.ui | 65 ++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/vpn/ui/dialogs/BugReportScreen.ui b/vpn/ui/dialogs/BugReportScreen.ui index 33f75e70e..71b0aecd7 100644 --- a/vpn/ui/dialogs/BugReportScreen.ui +++ b/vpn/ui/dialogs/BugReportScreen.ui @@ -89,25 +89,52 @@ <widget class="QWidget" name="wgtMessageTopMargin" native="true"/> </item> <item> - <widget class="CustomTextEdit" name="edtMessage"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="inputMethodHints"> - <set>Qt::ImhMultiLine</set> - </property> - <property name="verticalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="horizontalScrollBarPolicy"> - <enum>Qt::ScrollBarAlwaysOff</enum> - </property> - <property name="placeholderText"> - <string>Please describe the details of problem you faced. What actions did you take and what happened.</string> - </property> + <widget class="QFrame" name="frmEditMessage"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="CustomTextEdit" name="edtMessage"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="inputMethodHints"> + <set>Qt::ImhMultiLine</set> + </property> + <property name="verticalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="horizontalScrollBarPolicy"> + <enum>Qt::ScrollBarAlwaysOff</enum> + </property> + <property name="placeholderText"> + <string>Please describe the details of problem you faced. What actions did you take and what happened.</string> + </property> + </widget> + </item> + </layout> </widget> </item> <item alignment="Qt::AlignRight"> -- GitLab From 4d3654b600b792403495c0a28047eee39cc0519f Mon Sep 17 00:00:00 2001 From: Postnickov <postnickov.lyoha@yandex.ru> Date: Mon, 12 Oct 2020 15:19:34 +0300 Subject: [PATCH 2/2] [*]BugReportScreen add widgets for margins --- vpn/ui/dialogs/BugReportScreen.ui | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/vpn/ui/dialogs/BugReportScreen.ui b/vpn/ui/dialogs/BugReportScreen.ui index 71b0aecd7..0916804c4 100644 --- a/vpn/ui/dialogs/BugReportScreen.ui +++ b/vpn/ui/dialogs/BugReportScreen.ui @@ -96,10 +96,7 @@ <property name="frameShadow"> <enum>QFrame::Raised</enum> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <property name="spacing"> - <number>0</number> - </property> + <layout class="QGridLayout" name="gridLayout"> <property name="leftMargin"> <number>0</number> </property> @@ -112,7 +109,10 @@ <property name="bottomMargin"> <number>0</number> </property> - <item> + <property name="spacing"> + <number>0</number> + </property> + <item row="1" column="1"> <widget class="CustomTextEdit" name="edtMessage"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -134,6 +134,18 @@ </property> </widget> </item> + <item row="1" column="0"> + <widget class="QWidget" name="wgtLeftMargin" native="true"/> + </item> + <item row="1" column="2"> + <widget class="QWidget" name="wgtRightMargin" native="true"/> + </item> + <item row="0" column="0" colspan="3"> + <widget class="QWidget" name="wgtTopMargin" native="true"/> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QWidget" name="wgtBottomMargin" native="true"/> + </item> </layout> </widget> </item> -- GitLab