Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use QgsScrollArea
(cherry picked from commit 64b032f)
  • Loading branch information
nyalldawson committed Jan 25, 2022
1 parent c96000f commit 933b4a0
Show file tree
Hide file tree
Showing 12 changed files with 137 additions and 63 deletions.
18 changes: 12 additions & 6 deletions src/auth/oauth2/gui/qgsauthoauth2edit.ui
Expand Up @@ -188,7 +188,7 @@
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollAreaConfigure">
<widget class="QgsScrollArea" name="scrollAreaConfigure">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -856,7 +856,7 @@
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="scrollAreaAdvanced">
<widget class="QgsScrollArea" name="scrollAreaAdvanced">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -1009,16 +1009,22 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsPasswordLineEdit</class>
<extends>QLineEdit</extends>
<header>qgspasswordlineedit.h</header>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBoxBasic</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<header location="global">qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsPasswordLineEdit</class>
<extends>QLineEdit</extends>
<header>qgspasswordlineedit.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>cmbbxGrantFlow</tabstop>
Expand Down
10 changes: 9 additions & 1 deletion src/plugins/geometry_checker/qgsgeometrycheckerresulttab.ui
Expand Up @@ -27,7 +27,7 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -417,6 +417,14 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>tableWidgetErrors</tabstop>
Expand Down
8 changes: 7 additions & 1 deletion src/ui/3d/qgs3doptionsbase.ui
Expand Up @@ -34,7 +34,7 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -160,6 +160,12 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand Down
8 changes: 7 additions & 1 deletion src/ui/layout/qgslayout3dmapwidgetbase.ui
Expand Up @@ -46,7 +46,7 @@
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -216,6 +216,12 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
Expand Down
10 changes: 9 additions & 1 deletion src/ui/layout/qgsreportorganizerwidgetbase.ui
Expand Up @@ -97,7 +97,7 @@
</layout>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -130,6 +130,14 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mViewSections</tabstop>
<tabstop>mButtonAddSection</tabstop>
Expand Down
10 changes: 9 additions & 1 deletion src/ui/qgsattributesformproperties.ui
Expand Up @@ -213,7 +213,7 @@ Use this function to add extra logic to your forms.</string>
</item>
</layout>
</widget>
<widget class="QScrollArea" name="scrollArea_2">
<widget class="QgsScrollArea" name="scrollArea_2">
<property name="minimumSize">
<size>
<width>600</width>
Expand Down Expand Up @@ -245,6 +245,14 @@ Use this function to add extra logic to your forms.</string>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mEditorLayoutComboBox</tabstop>
<tabstop>mTbInitCode</tabstop>
Expand Down
10 changes: 8 additions & 2 deletions src/ui/qgscodeditorsettings.ui
Expand Up @@ -204,7 +204,7 @@
</item>
</layout>
</widget>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -808,9 +808,15 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<extends>QToolButton</extends>
<header>qgscolorbutton.h</header>
<container>1</container>
</customwidget>
Expand Down
8 changes: 7 additions & 1 deletion src/ui/qgsdelimitedtextsourceselectbase.ui
Expand Up @@ -137,7 +137,7 @@
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -1406,6 +1406,12 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
Expand Down
8 changes: 7 additions & 1 deletion src/ui/qgsfeatureselectiondlg.ui
Expand Up @@ -39,7 +39,7 @@
<widget class="QgsMessageBar" name="mMessageBar" native="true"/>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
Expand Down Expand Up @@ -209,6 +209,12 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsDualView</class>
<extends>QStackedWidget</extends>
Expand Down
18 changes: 12 additions & 6 deletions src/ui/qgsmetadatawidget.ui
Expand Up @@ -55,7 +55,7 @@
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea">
<widget class="QgsScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -656,7 +656,7 @@
<number>0</number>
</property>
<item>
<widget class="QScrollArea" name="scrollArea_2">
<widget class="QgsScrollArea" name="scrollArea_2">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
Expand Down Expand Up @@ -1059,7 +1059,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QScrollArea" name="panelDetails">
<widget class="QgsScrollArea" name="panelDetails">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -1486,16 +1486,22 @@
</widget>
<customwidgets>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsExtentGroupBox</class>
<extends>QgsCollapsibleGroupBox</extends>
Expand Down

0 comments on commit 933b4a0

Please sign in to comment.