Skip to content

Commit

Permalink
[mesh] Standardise capitalization in widgets, standardize padding
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Jan 17, 2020
1 parent d573e3b commit 9a3445c
Show file tree
Hide file tree
Showing 10 changed files with 430 additions and 64 deletions.
1 change: 1 addition & 0 deletions src/app/3d/qgsmeshlayer3drendererwidget.cpp
View file
Expand Up @@ -30,6 +30,7 @@ QgsMeshLayer3DRendererWidget::QgsMeshLayer3DRendererWidget( QgsMeshLayer *layer,
setPanelTitle( tr( "3D View" ) );

QVBoxLayout *layout = new QVBoxLayout( this );
layout->setContentsMargins( 0, 0, 0, 0 );
chkEnabled = new QCheckBox( tr( "Enable 3D Renderer" ), this );
layout->addWidget( chkEnabled );

Expand Down
12 changes: 12 additions & 0 deletions src/ui/3d/map3dconfigwidget.ui
View file
Expand Up @@ -14,6 +14,18 @@
<string>Configure 3D Map Rendering</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<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="QgsScrollArea" name="scrollArea">
<property name="widgetResizable">
Expand Down
84 changes: 52 additions & 32 deletions src/ui/3d/qgsmesh3dpropswidget.ui
View file
Expand Up @@ -14,6 +14,18 @@
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<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="QgsCollapsibleGroupBox" name="mGroupBoxTrianglesSettings">
<property name="title">
Expand All @@ -23,11 +35,11 @@
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBoxWireframe">
<property name="title">
<string>Wireframe Line Width and Color</string>
<string>Wireframe line width and color</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QDoubleSpinBox" name="spinBoxWireframeLineWidth">
<widget class="QgsDoubleSpinBox" name="spinBoxWireframeLineWidth">
<property name="suffix">
<string> px</string>
</property>
Expand All @@ -37,11 +49,7 @@
</widget>
</item>
<item>
<widget class="QgsColorButton" name="colorButtonWireframe">
<property name="text">
<string>...</string>
</property>
</widget>
<widget class="QgsColorButton" name="colorButtonWireframe"/>
</item>
</layout>
</widget>
Expand All @@ -56,7 +64,7 @@
<item row="0" column="0">
<widget class="QCheckBox" name="chkSmoothTriangles">
<property name="text">
<string>Smooth Triangles</string>
<string>Smooth triangles</string>
</property>
</widget>
</item>
Expand All @@ -66,18 +74,18 @@
<item>
<widget class="QgsCollapsibleGroupBox" name="mGroupBoxVerticaleSettings">
<property name="title">
<string>Verticale Settings</string>
<string>Vertical Settings</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Verticale Scale</string>
<string>Vertical scale</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="spinBoxVerticaleScale">
<widget class="QgsDoubleSpinBox" name="spinBoxVerticaleScale">
<property name="maximum">
<double>9999999.990000000223517</double>
</property>
Expand All @@ -98,30 +106,10 @@
<item row="0" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Rendering Style</string>
<string>Rendering style</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QWidget" name="mMeshSingleColorWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Mesh color</string>
</property>
</widget>
</item>
<item>
<widget class="QgsColorButton" name="mMeshSingleColorButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mComboBoxTextureType">
<item>
Expand Down Expand Up @@ -211,6 +199,38 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QWidget" name="mMeshSingleColorWidget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_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>
<widget class="QLabel" name="label_6">
<property name="text">
<string>Mesh color</string>
</property>
</widget>
</item>
<item>
<widget class="QgsColorButton" name="mMeshSingleColorButton">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down

0 comments on commit 9a3445c

Please sign in to comment.