Skip to content

Commit

Permalink
Fix issues in vector layers properties dialog
Browse files Browse the repository at this point in the history
- remove frames from new pages
- fix cramped widgets on hidpi screens
- fix broken aux storage layout
- standardise margins across pages
  • Loading branch information
nyalldawson committed Nov 10, 2017
1 parent 30cefca commit 6de3980
Show file tree
Hide file tree
Showing 4 changed files with 322 additions and 210 deletions.
2 changes: 2 additions & 0 deletions src/app/qgssourcefieldsproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ QgsSourceFieldsProperties::QgsSourceFieldsProperties( QgsVectorLayer *layer, QWi
return;

setupUi( this );
layout()->setContentsMargins( 0, 0,0 ,0 );
layout()->setMargin( 0 );

//button appearance
mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionNewAttribute.svg" ) ) );
Expand Down
68 changes: 55 additions & 13 deletions src/ui/qgsattributesformproperties.ui
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,42 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout" rowstretch="0,0,1">
<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="0" column="0">
<widget class="QWidget" name="widget_2" native="true">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<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="QComboBox" name="mEditorLayoutComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Autogenerate</string>
Expand Down Expand Up @@ -72,13 +96,19 @@ Use this function to add extra logic to your forms.</string>
</item>
<item row="1" column="0">
<widget class="QWidget" name="mUiFileFrame" native="true">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>50</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<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_2">
<property name="text">
Expand Down Expand Up @@ -106,6 +136,18 @@ Use this function to add extra logic to your forms.</string>
</property>
<widget class="QWidget" name="widget" native="true">
<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="0" column="2">
<widget class="QToolButton" name="mAddTabOrGroupButton">
<property name="text">
Expand Down
12 changes: 12 additions & 0 deletions src/ui/qgsmetadatawidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@
<string>Form</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="QTabWidget" name="tabWidget">
<property name="enabled">
Expand Down
Loading

0 comments on commit 6de3980

Please sign in to comment.