diff options
author | Doug Junkins <junkins@foghead.com> | 2019-07-12 16:49:11 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-07-13 09:38:40 -0700 |
commit | 0fb4ac760244ca71e2a7be3d781ca4512b365db2 (patch) | |
tree | 74b3a9627515535dfb1f2255e577caf166f3558e /desktop-widgets/filterwidget2.ui | |
parent | 96ee6898e8124e36dd810c449b8e05a43949663b (diff) | |
download | subsurface-0fb4ac760244ca71e2a7be3d781ca4512b365db2.tar.gz |
Fixed filter scrollarea not adjusting to parent height
Changed the Qt Layout for FilterWidget2 to "Lay Out on a Grid" to
allow the scrollarea to adjust when the height of FilterWidget2
changes. Fixes issues #2174.
Signed-off-by: Doug Junkins <junkins@foghead.com>
Diffstat (limited to 'desktop-widgets/filterwidget2.ui')
-rw-r--r-- | desktop-widgets/filterwidget2.ui | 906 |
1 files changed, 451 insertions, 455 deletions
diff --git a/desktop-widgets/filterwidget2.ui b/desktop-widgets/filterwidget2.ui index 86326de69..bc52a0a4c 100644 --- a/desktop-widgets/filterwidget2.ui +++ b/desktop-widgets/filterwidget2.ui @@ -13,461 +13,457 @@ <property name="windowTitle"> <string>Form</string> </property> - <widget class="QScrollArea" name="scrollArea"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>510</width> - <height>200</height> - </rect> - </property> - <property name="frameShape"> - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow"> - <enum>QFrame::Plain</enum> - </property> - <property name="widgetResizable"> - <bool>true</bool> - </property> - <widget class="QWidget" name="scrollAreaWidgetContents"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>510</width> - <height>200</height> - </rect> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="filterButtonExplanation"> - <property name="text"> - <string>Reset / close</string> - </property> - </widget> - </item> - <item row="8" column="4" colspan="2"> - <widget class="QLineEdit" name="tags"/> - </item> - <item row="1" column="1"> - <widget class="QLabel" name="label_3"> - <property name="text"> - <string>Min</string> - </property> - </widget> - </item> - <item row="9" column="0"> - <widget class="QLabel" name="label_8"> - <property name="text"> - <string>People</string> - </property> - </widget> - </item> - <item row="3" column="4"> - <widget class="QLabel" name="label_13"> - <property name="text"> - <string>Max</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Rating</string> - </property> - </widget> - </item> - <item row="8" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Tags</string> - </property> - </widget> - </item> - <item row="3" column="2"> - <widget class="QDoubleSpinBox" name="minWaterTemp"/> - </item> - <item row="2" column="4"> - <widget class="QLabel" name="label_16"> - <property name="text"> - <string>Max</string> - </property> - </widget> - </item> - <item row="3" column="1"> - <widget class="QLabel" name="label_12"> - <property name="text"> - <string>Min</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QLabel" name="label_4"> - <property name="text"> - <string>From</string> - </property> - </widget> - </item> - <item row="6" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>To</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLabel" name="label_17"> - <property name="text"> - <string>Min</string> - </property> - </widget> - </item> - <item row="3" column="5"> - <widget class="QDoubleSpinBox" name="maxWaterTemp"/> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_5"> - <property name="text"> - <string>Visibility</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QLabel" name="label_14"> - <property name="text"> - <string>Min</string> - </property> - </widget> - </item> - <item row="1" column="4"> - <widget class="QLabel" name="label_15"> - <property name="text"> - <string>Max</string> - </property> - </widget> - </item> - <item row="10" column="4" colspan="2"> - <widget class="QLineEdit" name="location"/> - </item> - <item row="11" column="4" colspan="2"> - <widget class="QLineEdit" name="suit"/> - </item> - <item row="12" column="4" colspan="2"> - <widget class="QLineEdit" name="dnotes"/> - </item> - <item row="13" column="0"> - <widget class="QLabel" name="labelEquipment"> - <property name="text"> - <string>Equipment</string> - </property> - </widget> - </item> - <item row="4" column="2"> - <widget class="QDoubleSpinBox" name="minAirTemp"/> - </item> - <item row="4" column="5"> - <widget class="QDoubleSpinBox" name="maxAirTemp"/> - </item> - <item row="11" column="4" colspan="2"> - <widget class="QLineEdit" name="equipment"/> - </item> - <item row="3" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Water Temp</string> - </property> - </widget> - </item> - <item row="9" column="4" colspan="2"> - <widget class="QLineEdit" name="people"/> - </item> - <item row="4" column="4"> - <widget class="QLabel" name="label_18"> - <property name="text"> - <string>Max</string> - </property> - </widget> - </item> - <item row="10" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Location</string> - </property> - </widget> - </item> - <item row="11" column="0"> - <widget class="QLabel" name="label_10"> - <property name="text"> - <string>Suit</string> - </property> - </widget> - </item> - <item row="12" column="0"> - <widget class="QLabel" name="label_19"> - <property name="text"> - <string>Notes</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>Air Temp</string> - </property> - </widget> - </item> - <item row="2" column="5"> - <widget class="StarWidget" name="maxVisibility" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::TabFocus</enum> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="StarWidget" name="minVisibility" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::TabFocus</enum> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="StarWidget" name="minRating" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::TabFocus</enum> - </property> - </widget> - </item> - <item row="1" column="5"> - <widget class="StarWidget" name="maxRating" native="true"> - <property name="sizePolicy"> - <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy"> - <enum>Qt::TabFocus</enum> - </property> - </widget> - </item> - <item row="7" column="1"> - <widget class="QCheckBox" name="logged"> - <property name="text"> - <string>Logged</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="7" column="4"> - <widget class="QCheckBox" name="planned"> - <property name="text"> - <string>Planned</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="5" column="4"> - <widget class="QTimeEdit" name="fromTime"/> - </item> - <item row="5" column="1" colspan="2"> - <widget class="QDateTimeEdit" name="fromDate"> - <property name="calendarPopup"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="6" column="1" colspan="2"> - <widget class="QDateTimeEdit" name="toDate"> - <property name="calendarPopup"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="6" column="4"> - <widget class="QTimeEdit" name="toTime"/> - </item> - <item row="0" column="2"> - <widget class="QToolButton" name="close"> - <property name="toolTip"> - <string>Close and reset filters</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:filter-close</normaloff>:filter-close</iconset> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QToolButton" name="clear"> - <property name="toolTip"> - <string>Reset filters</string> - </property> - <property name="icon"> - <iconset> - <normaloff>:edit-clear-icon</normaloff>:edit-clear-icon</iconset> - </property> - <property name="autoRaise"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="8" column="1" colspan="2"> - <widget class="QComboBox" name="tagsMode"> - <item> - <property name="text"> - <string>All of</string> - </property> - </item> - <item> - <property name="text"> - <string>Any of</string> - </property> - </item> - <item> - <property name="text"> - <string>None of</string> - </property> - </item> - </widget> - </item> - <item row="9" column="1" colspan="2"> - <widget class="QComboBox" name="peopleMode"> - <item> - <property name="text"> - <string>All of</string> - </property> - </item> - <item> - <property name="text"> - <string>Any of</string> - </property> - </item> - <item> - <property name="text"> - <string>None of</string> - </property> - </item> - </widget> - </item> - <item row="10" column="1" colspan="2"> - <widget class="QComboBox" name="locationMode"> - <item> - <property name="text"> - <string>All of</string> - </property> - </item> - <item> - <property name="text"> - <string>Any of</string> - </property> - </item> - <item> - <property name="text"> - <string>None of</string> - </property> - </item> - </widget> - </item> - <item row="11" column="1" colspan="2"> - <widget class="QComboBox" name="suitMode"> - <item> - <property name="text"> - <string>All of</string> - </property> - </item> - <item> - <property name="text"> - <string>Any of</string> - </property> - </item> - <item> - <property name="text"> - <string>None of</string> - </property> - </item> - </widget> - </item> - <item row="12" column="1" colspan="2"> - <widget class="QComboBox" name="dnotesMode"> - <item> - <property name="text"> - <string>All of</string> - </property> - </item> - <item> - <property name="text"> - <string>Any of</string> - </property> - </item> - <item> - <property name="text"> - <string>None of</string> - </property> - </item> - </widget> - </item> - <item row="13" column="1" colspan="2"> - <widget class="QComboBox" name="equipmentMode"> - <item> - <property name="text"> - <string>All of</string> - </property> - </item> - <item> - <property name="text"> - <string>Any of</string> - </property> - </item> - <item> - <property name="text"> - <string>None of</string> - </property> - </item> - </widget> - </item> - <item row="13" column="0"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </widget> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QScrollArea" name="scrollArea"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>486</width> + <height>487</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="filterButtonExplanation"> + <property name="text"> + <string>Reset / close</string> + </property> + </widget> + </item> + <item row="8" column="4" colspan="2"> + <widget class="QLineEdit" name="tags"/> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Min</string> + </property> + </widget> + </item> + <item row="9" column="0"> + <widget class="QLabel" name="label_8"> + <property name="text"> + <string>People</string> + </property> + </widget> + </item> + <item row="3" column="4"> + <widget class="QLabel" name="label_13"> + <property name="text"> + <string>Max</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Rating</string> + </property> + </widget> + </item> + <item row="8" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Tags</string> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QDoubleSpinBox" name="minWaterTemp"/> + </item> + <item row="2" column="4"> + <widget class="QLabel" name="label_16"> + <property name="text"> + <string>Max</string> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="label_12"> + <property name="text"> + <string>Min</string> + </property> + </widget> + </item> + <item row="5" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>From</string> + </property> + </widget> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>To</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="label_17"> + <property name="text"> + <string>Min</string> + </property> + </widget> + </item> + <item row="3" column="5"> + <widget class="QDoubleSpinBox" name="maxWaterTemp"/> + </item> + <item row="2" column="0"> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string>Visibility</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="label_14"> + <property name="text"> + <string>Min</string> + </property> + </widget> + </item> + <item row="1" column="4"> + <widget class="QLabel" name="label_15"> + <property name="text"> + <string>Max</string> + </property> + </widget> + </item> + <item row="10" column="4" colspan="2"> + <widget class="QLineEdit" name="location"/> + </item> + <item row="11" column="4" colspan="2"> + <widget class="QLineEdit" name="suit"/> + </item> + <item row="12" column="4" colspan="2"> + <widget class="QLineEdit" name="dnotes"/> + </item> + <item row="13" column="0"> + <widget class="QLabel" name="labelEquipment"> + <property name="text"> + <string>Equipment</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QDoubleSpinBox" name="minAirTemp"/> + </item> + <item row="4" column="5"> + <widget class="QDoubleSpinBox" name="maxAirTemp"/> + </item> + <item row="11" column="4" colspan="2"> + <widget class="QLineEdit" name="equipment"/> + </item> + <item row="3" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Water Temp</string> + </property> + </widget> + </item> + <item row="9" column="4" colspan="2"> + <widget class="QLineEdit" name="people"/> + </item> + <item row="4" column="4"> + <widget class="QLabel" name="label_18"> + <property name="text"> + <string>Max</string> + </property> + </widget> + </item> + <item row="10" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Location</string> + </property> + </widget> + </item> + <item row="11" column="0"> + <widget class="QLabel" name="label_10"> + <property name="text"> + <string>Suit</string> + </property> + </widget> + </item> + <item row="12" column="0"> + <widget class="QLabel" name="label_19"> + <property name="text"> + <string>Notes</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Air Temp</string> + </property> + </widget> + </item> + <item row="2" column="5"> + <widget class="StarWidget" name="maxVisibility" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="StarWidget" name="minVisibility" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="StarWidget" name="minRating" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> + </property> + </widget> + </item> + <item row="1" column="5"> + <widget class="StarWidget" name="maxRating" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::TabFocus</enum> + </property> + </widget> + </item> + <item row="7" column="1"> + <widget class="QCheckBox" name="logged"> + <property name="text"> + <string>Logged</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="7" column="4"> + <widget class="QCheckBox" name="planned"> + <property name="text"> + <string>Planned</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="5" column="4"> + <widget class="QTimeEdit" name="fromTime"/> + </item> + <item row="5" column="1" colspan="2"> + <widget class="QDateTimeEdit" name="fromDate"> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="6" column="1" colspan="2"> + <widget class="QDateTimeEdit" name="toDate"> + <property name="calendarPopup"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="6" column="4"> + <widget class="QTimeEdit" name="toTime"/> + </item> + <item row="0" column="2"> + <widget class="QToolButton" name="close"> + <property name="toolTip"> + <string>Close and reset filters</string> + </property> + <property name="icon"> + <iconset> + <normaloff>:filter-close</normaloff>:filter-close</iconset> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="1"> + <widget class="QToolButton" name="clear"> + <property name="toolTip"> + <string>Reset filters</string> + </property> + <property name="icon"> + <iconset> + <normaloff>:edit-clear-icon</normaloff>:edit-clear-icon</iconset> + </property> + <property name="autoRaise"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="8" column="1" colspan="2"> + <widget class="QComboBox" name="tagsMode"> + <item> + <property name="text"> + <string>All of</string> + </property> + </item> + <item> + <property name="text"> + <string>Any of</string> + </property> + </item> + <item> + <property name="text"> + <string>None of</string> + </property> + </item> + </widget> + </item> + <item row="9" column="1" colspan="2"> + <widget class="QComboBox" name="peopleMode"> + <item> + <property name="text"> + <string>All of</string> + </property> + </item> + <item> + <property name="text"> + <string>Any of</string> + </property> + </item> + <item> + <property name="text"> + <string>None of</string> + </property> + </item> + </widget> + </item> + <item row="10" column="1" colspan="2"> + <widget class="QComboBox" name="locationMode"> + <item> + <property name="text"> + <string>All of</string> + </property> + </item> + <item> + <property name="text"> + <string>Any of</string> + </property> + </item> + <item> + <property name="text"> + <string>None of</string> + </property> + </item> + </widget> + </item> + <item row="11" column="1" colspan="2"> + <widget class="QComboBox" name="suitMode"> + <item> + <property name="text"> + <string>All of</string> + </property> + </item> + <item> + <property name="text"> + <string>Any of</string> + </property> + </item> + <item> + <property name="text"> + <string>None of</string> + </property> + </item> + </widget> + </item> + <item row="12" column="1" colspan="2"> + <widget class="QComboBox" name="dnotesMode"> + <item> + <property name="text"> + <string>All of</string> + </property> + </item> + <item> + <property name="text"> + <string>Any of</string> + </property> + </item> + <item> + <property name="text"> + <string>None of</string> + </property> + </item> + </widget> + </item> + <item row="13" column="1" colspan="2"> + <widget class="QComboBox" name="equipmentMode"> + <item> + <property name="text"> + <string>All of</string> + </property> + </item> + <item> + <property name="text"> + <string>Any of</string> + </property> + </item> + <item> + <property name="text"> + <string>None of</string> + </property> + </item> + </widget> + </item> + <item row="13" column="0"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + </layout> </widget> <customwidgets> <customwidget> |