Skip to content

Commit

Permalink
Fix dock widget layout (fix #15011)
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jun 13, 2016
1 parent 693ead2 commit cb4dbea
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 2 deletions.
7 changes: 7 additions & 0 deletions src/plugins/topology/checkDock.ui
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@
</property>
</action>
</widget>
<customwidgets>
<customwidget>
<class>QgsDockWidget</class>
<extends>QDockWidget</extends>
<header>qgsdockwidget.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="topol.qrc"/>
</resources>
Expand Down
22 changes: 21 additions & 1 deletion src/ui/qgsadvanceddigitizingdockwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@
</property>
<widget class="QWidget" name="dockWidgetContents">
<layout class="QGridLayout" name="gridLayout">
<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">
<layout class="QVBoxLayout" name="mLayout">
<item>
Expand Down Expand Up @@ -491,6 +503,14 @@
</layout>
</widget>
</widget>
<customwidgets>
<customwidget>
<class>QgsDockWidget</class>
<extends>QDockWidget</extends>
<header>qgsdockwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mEnabledButton</tabstop>
<tabstop>mConstructionModeButton</tabstop>
Expand All @@ -514,8 +534,8 @@
<tabstop>mRepeatingLockYButton</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
<include location="../plugins/georeferencer/georeferencer.qrc"/>
<include location="../../images/images.qrc"/>
</resources>
<connections/>
</ui>
7 changes: 7 additions & 0 deletions src/ui/qgsbookmarksbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,13 @@
</property>
</action>
</widget>
<customwidgets>
<customwidget>
<class>QgsDockWidget</class>
<extends>QDockWidget</extends>
<header>qgsdockwidget.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../../images/images.qrc"/>
</resources>
Expand Down
6 changes: 6 additions & 0 deletions src/ui/qgsbrowserdockwidgetbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,12 @@
<extends>QLineEdit</extends>
<header>qgsfilterlineedit.h</header>
</customwidget>
<customwidget>
<class>QgsDockWidget</class>
<extends>QDockWidget</extends>
<header>qgsdockwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../images/images.qrc"/>
Expand Down
7 changes: 6 additions & 1 deletion src/ui/qgsstatisticalsummarybase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,12 @@
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
</customwidget>
</customwidgets>
<customwidget>
<class>QgsDockWidget</class>
<extends>QDockWidget</extends>
<header>qgsdockwidget.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../../images/images.qrc"/>
</resources>
Expand Down

0 comments on commit cb4dbea

Please sign in to comment.