sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

add scrollarea to the output layer group in the raster and mesh

Browse Source 
calculator dialogs to make them usable on small screens
This commit is contained in:
Alexander Bruy 2025-03-30 14:08:02 +01:00
parent 644c1f835b
commit 84ce4108d1
2 changed files with 1048 additions and 991 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/ui/mesh/qgsmeshcalculatordialogbase.ui
View File

@ -14,6 +14,36 @@
<string>Mesh Calculator</string> <string>Mesh Calculator</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QgsScrollArea" name="scrollArea_2">
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</enum>
</property>
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>900</width>
<height>906</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_7">
<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> <item>
<widget class="QSplitter" name="splitter_2"> <widget class="QSplitter" name="splitter_2">
<property name="orientation"> <property name="orientation">
@ -38,8 +68,45 @@
<string>Result Layer</string> <string>Result Layer</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QgsScrollArea" name="scrollArea">
<property name="frameShape">
<enum>QFrame::Shape::NoFrame</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>509</width>
<height>406</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<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> <item>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="3" column="0">
<widget class="QLabel" name="mOutputFormatLabel_2">
<property name="text">
<string>Group name</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="mUseVirtualProviderCheckBox"> <widget class="QCheckBox" name="mUseVirtualProviderCheckBox">
<property name="layoutDirection"> <property name="layoutDirection">
@ -53,13 +120,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="1" column="1" colspan="2">
<widget class="QLabel" name="mOutputFormatLabel_2"> <widget class="QgsFileWidget" name="mOutputDatasetFileWidget" native="true"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mOutputDatasetFileLabel">
<property name="text"> <property name="text">
<string>Group name</string> <string>Output file</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="mOutputGroupNameLineEdit"/>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="mOutputFormatLabel"> <widget class="QLabel" name="mOutputFormatLabel">
<property name="text"> <property name="text">
@ -67,22 +140,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2">
<widget class="QgsFileWidget" name="mOutputDatasetFileWidget" native="true"/>
</item>
<item row="2" column="1" colspan="2"> <item row="2" column="1" colspan="2">
<widget class="QComboBox" name="mOutputFormatComboBox"/> <widget class="QComboBox" name="mOutputFormatComboBox"/>
</item> </item>
<item row="3" column="1" colspan="2">
<widget class="QLineEdit" name="mOutputGroupNameLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mOutputDatasetFileLabel">
<property name="text">
<string>Output file</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -259,18 +319,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> </layout>
<spacer name="verticalSpacer"> </widget>
<property name="orientation"> </widget>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -508,6 +559,10 @@
</widget> </widget>
</widget> </widget>
</item> </item>
</layout>
</widget>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="mExpressionValidLabel"> <widget class="QLabel" name="mExpressionValidLabel">
<property name="text"> <property name="text">
@ -528,7 +583,7 @@
</layout> </layout>
<zorder>mButtonBox</zorder> <zorder>mButtonBox</zorder>
<zorder>mExpressionValidLabel</zorder> <zorder>mExpressionValidLabel</zorder>
<zorder>splitter_2</zorder> <zorder>scrollArea_2</zorder>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
@ -543,17 +598,23 @@
<header>qgsfilewidget.h</header> <header>qgsfilewidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QgsExtentGroupBox</class> <class>QgsExtentGroupBox</class>
<extends>QGroupBox</extends> <extends>QGroupBox</extends>
<header>qgsextentgroupbox.h</header> <header>qgsextentgroupbox.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsMapLayerComboBox</class>
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>mDatasetsListWidget</tabstop> <tabstop>mDatasetsListWidget</tabstop>

268
src/ui/qgsrastercalcdialogbase.ui
View File

@ -6,39 +6,45 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>931</width>
<height>939</height> <height>576</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>640</width>
<height>530</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Raster Calculator</string> <string>Raster Calculator</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="1" column="0"> <item>
<widget class="QDialogButtonBox" name="mButtonBox"> <widget class="QgsScrollArea" name="scrollArea">
<property name="orientation"> <property name="frameShape">
<enum>Qt::Orientation::Horizontal</enum> <enum>QFrame::Shape::NoFrame</enum>
</property> </property>
<property name="standardButtons"> <property name="widgetResizable">
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Help|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QgsScrollArea" name="scrollArea" native="true">
<property name="widgetResizable" stdset="0">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_8"> <widget class="QWidget" name="scrollAreaWidgetContents">
<item row="0" column="0"> <property name="geometry">
<layout class="QGridLayout" name="gridLayout_7"> <rect>
<item row="0" column="0"> <x>0</x>
<y>0</y>
<width>919</width>
<height>500</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<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="QSplitter" name="splitter_2"> <widget class="QSplitter" name="splitter_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Orientation::Vertical</enum> <enum>Qt::Orientation::Vertical</enum>
@ -61,18 +67,38 @@
<property name="title"> <property name="title">
<string>Result Layer</string> <string>Result Layer</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0,0"> <layout class="QGridLayout" name="gridLayout_4" columnstretch="0">
<item row="2" column="1" colspan="3"> <item row="0" column="0">
<widget class="QgsFileWidget" name="mOutputLayer" native="true"/> <widget class="QgsScrollArea" name="scrollArea_2">
</item> <property name="frameShape">
<item row="4" column="0" colspan="4"> <enum>QFrame::Shape::NoFrame</enum>
<widget class="QgsExtentGroupBox" name="mExtentGroupBox">
<property name="title">
<string>Spatial Extent</string>
</property> </property>
</widget> <property name="widgetResizable">
</item> <bool>true</bool>
<item row="6" column="0" colspan="4"> </property>
<widget class="QWidget" name="scrollAreaWidgetContents_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>504</width>
<height>326</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<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 row="5" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
<string>Resolution</string> <string>Resolution</string>
@ -122,17 +148,17 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="7" column="1" colspan="3"> <item row="3" column="0">
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true"> <widget class="QLabel" name="mOutputFormatLabel">
<property name="focusPolicy"> <property name="text">
<enum>Qt::FocusPolicy::StrongFocus</enum> <string>Output format</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="3"> <item row="2" column="1">
<widget class="QComboBox" name="mOutputFormatComboBox"/> <widget class="QgsFileWidget" name="mOutputLayer" native="true"/>
</item> </item>
<item row="1" column="1" colspan="3"> <item row="1" column="1">
<widget class="QLineEdit" name="mVirtualLayerName"> <widget class="QLineEdit" name="mVirtualLayerName">
<property name="text"> <property name="text">
<string/> <string/>
@ -142,6 +168,30 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="QgsExtentGroupBox" name="mExtentGroupBox">
<property name="title">
<string>Spatial Extent</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="mOutputFormatComboBox"/>
</item>
<item row="7" column="1">
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
<property name="focusPolicy">
<enum>Qt::FocusPolicy::StrongFocus</enum>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Output CRS</string>
</property>
</widget>
</item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="mOutputLayerLabel"> <widget class="QLabel" name="mOutputLayerLabel">
<property name="text"> <property name="text">
@ -156,37 +206,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Output CRS</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="4">
<widget class="QCheckBox" name="mAddResultToProjectCheckBox">
<property name="text">
<string>Add result to project</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="10" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" colspan="4">
<widget class="QCheckBox" name="mUseVirtualProviderCheckBox"> <widget class="QCheckBox" name="mUseVirtualProviderCheckBox">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: the result raster will not be usable with any processing algorithm that expects a materialized raster.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: the result raster will not be usable with any processing algorithm that expects a materialized raster.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@ -202,14 +222,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="9" column="0">
<widget class="QLabel" name="mOutputFormatLabel"> <widget class="QCheckBox" name="mAddResultToProjectCheckBox">
<property name="text"> <property name="text">
<string>Output format</string> <string>Add result to project</string>
</property>
<property name="checked">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="4"> <item row="8" column="0" colspan="2">
<widget class="QgsCollapsibleGroupBox" name="mCreateOptionsGroupBox"> <widget class="QgsCollapsibleGroupBox" name="mCreateOptionsGroupBox">
<property name="title"> <property name="title">
<string>Create Options</string> <string>Create Options</string>
@ -245,8 +268,12 @@
</layout> </layout>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="verticalLayoutWidget"> </item>
<layout class="QVBoxLayout" name="verticalLayout"> </layout>
</widget>
</widget>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QgsCollapsibleGroupBox" name="mOperatorsGroupBox"> <widget class="QgsCollapsibleGroupBox" name="mOperatorsGroupBox">
<property name="title"> <property name="title">
@ -499,16 +526,25 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0"> </layout>
</widget>
</widget>
</item>
<item>
<widget class="QLabel" name="mExpressionValidLabel"> <widget class="QLabel" name="mExpressionValidLabel">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</item> <widget class="QDialogButtonBox" name="mButtonBox">
</layout> <property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Help|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -526,6 +562,18 @@
<header>qgsfilewidget.h</header> <header>qgsfilewidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsExtentGroupBox</class>
<extends>QGroupBox</extends>
<header>qgsextentgroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsProjectionSelectionWidget</class> <class>QgsProjectionSelectionWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -537,18 +585,6 @@
<extends>QSpinBox</extends> <extends>QSpinBox</extends>
<header>qgsspinbox.h</header> <header>qgsspinbox.h</header>
</customwidget> </customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QWidget</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsExtentGroupBox</class>
<extends>QGroupBox</extends>
<header>qgsextentgroupbox.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsRasterFormatSaveOptionsWidget</class> <class>QgsRasterFormatSaveOptionsWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
@ -556,46 +592,6 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops>
<tabstop>mRasterBandsListWidget</tabstop>
<tabstop>mUseVirtualProviderCheckBox</tabstop>
<tabstop>mVirtualLayerName</tabstop>
<tabstop>mOutputFormatComboBox</tabstop>
<tabstop>mNColumnsSpinBox</tabstop>
<tabstop>mNRowsSpinBox</tabstop>
<tabstop>mCrsSelector</tabstop>
<tabstop>mAddResultToProjectCheckBox</tabstop>
<tabstop>mPlusPushButton</tabstop>
<tabstop>mMultiplyPushButton</tabstop>
<tabstop>mOpenBracketPushButton</tabstop>
<tabstop>mMinButton</tabstop>
<tabstop>mConditionalStatButton</tabstop>
<tabstop>mCosButton</tabstop>
<tabstop>mACosButton</tabstop>
<tabstop>mMinusPushButton</tabstop>
<tabstop>mDividePushButton</tabstop>
<tabstop>mCloseBracketPushButton</tabstop>
<tabstop>mMaxButton</tabstop>
<tabstop>mAndButton</tabstop>
<tabstop>mSinButton</tabstop>
<tabstop>mASinButton</tabstop>
<tabstop>mLessButton</tabstop>
<tabstop>mGreaterButton</tabstop>
<tabstop>mEqualButton</tabstop>
<tabstop>mAbsButton</tabstop>
<tabstop>mOrButton</tabstop>
<tabstop>mTanButton</tabstop>
<tabstop>mATanButton</tabstop>
<tabstop>mLesserEqualButton</tabstop>
<tabstop>mGreaterEqualButton</tabstop>
<tabstop>mNotEqualButton</tabstop>
<tabstop>mExpButton</tabstop>
<tabstop>mSqrtButton</tabstop>
<tabstop>mLogButton</tabstop>
<tabstop>mLnButton</tabstop>
<tabstop>mExpressionTextEdit</tabstop>
<tabstop>mButtonBox</tabstop>
</tabstops>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>