Skip to content

Commit

Permalink
m2k/ui: Removed right menu unnecessary margins for all instruments.
Browse files Browse the repository at this point in the history 
Signed-off-by: andreidanila1 <[email protected]>
  • Loading branch information
@andreidanila1
andreidanila1 committed Nov 8, 2024
1 parent a1c39f7 commit dc2e345
Show file tree
Hide file tree
Showing 13 changed files with 471 additions and 355 deletions.
102 changes: 66 additions & 36 deletions plugins/m2k/ui/channel_settings.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,80 @@
<number>0</number>
</property>
<property name="leftMargin">
<number>30</number>
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
<number>10</number>
</property>
<property name="rightMargin">
<number>30</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<widget class="QLabel" name="label_channelName">
<widget class="QWidget" name="widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Channel</string>
</property>
<property name="menu_title_label" stdset="0">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>15</number>
</property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_channelName">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Channel</string>
</property>
<property name="menu_title_label" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_channelColor">
<property name="minimumSize">
<size>
<width>0</width>
<height>2</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>2</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">border: 2px solid #ff7200;</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
Expand All @@ -58,28 +110,6 @@
</property>
</spacer>
</item>
<item>
<widget class="Line" name="line_channelColor">
<property name="minimumSize">
<size>
<width>0</width>
<height>2</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>2</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">border: 2px solid #ff7200;</string>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="sizePolicy">
Expand All @@ -102,8 +132,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>475</width>
<height>919</height>
<width>535</width>
<height>893</height>
</rect>
</property>
<property name="sizePolicy">
Expand All @@ -117,7 +147,7 @@
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
<number>10</number>
</property>
<property name="topMargin">
<number>0</number>
Expand Down
58 changes: 38 additions & 20 deletions plugins/m2k/ui/cursors_settings.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<number>0</number>
</property>
<property name="topMargin">
<number>5</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
Expand Down Expand Up @@ -55,10 +55,22 @@
<x>0</x>
<y>0</y>
<width>314</width>
<height>598</height>
<height>603</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
Expand All @@ -75,6 +87,22 @@
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>9</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Line" name="line">
<property name="sizePolicy">
Expand Down Expand Up @@ -103,22 +131,6 @@
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>15</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
Expand Down Expand Up @@ -167,7 +179,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -178,6 +190,12 @@
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>238</width>
<height>30</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QPushButton {
min-height: 30px;
Expand Down Expand Up @@ -776,7 +794,7 @@ color: rgba(255,255,255,51);
<customwidget>
<class>scopy::CustomSwitch</class>
<extends>QPushButton</extends>
<header>customSwitch.h</header>
<header>gui/customSwitch.h</header>
</customwidget>
<customwidget>
<class>scopy::SmallOnOffSwitch</class>
Expand Down
16 changes: 9 additions & 7 deletions plugins/m2k/ui/dmm.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,16 +898,16 @@ QLabel{font-size:35pt;}</string>
<number>0</number>
</property>
<property name="leftMargin">
<number>25</number>
<number>0</number>
</property>
<property name="topMargin">
<number>20</number>
<number>10</number>
</property>
<property name="rightMargin">
<number>5</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>10</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
Expand All @@ -932,6 +932,9 @@ QLabel{font-size:35pt;}</string>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContents</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
Expand All @@ -955,7 +958,7 @@ QLabel{font-size:35pt;}</string>
<number>15</number>
</property>
<property name="leftMargin">
<number>0</number>
<number>10</number>
</property>
<property name="topMargin">
<number>0</number>
Expand Down Expand Up @@ -2032,7 +2035,6 @@ line-height: 14px;
</customwidgets>
<resources>
<include location="../../../gui/res/resources.qrc"/>
<include location="../../../gui/res/resources.qrc"/>
</resources>
<connections>
<connection>
Expand Down Expand Up @@ -2069,7 +2071,7 @@ line-height: 14px;
</connection>
</connections>
<buttongroups>
<buttongroup name="buttonGroup_2"/>
<buttongroup name="buttonGroup"/>
<buttongroup name="buttonGroup_2"/>
</buttongroups>
</ui>
Loading

0 comments on commit dc2e345

Please sign in to comment.