Skip to content
Permalink
Browse files

Remove useless orientation combobox from copyright dialog

  • Loading branch information
nyalldawson committed Jan 30, 2016
1 parent 4ab5611 commit 45489f6cf4f4503235d505851e264fb89c1c1f50
Showing with 9 additions and 68 deletions.
  1. +0 −4 src/app/qgsdecorationcopyrightdialog.cpp
  2. +9 −64 src/ui/qgsdecorationcopyrightdialog.ui
@@ -34,10 +34,6 @@ QgsDecorationCopyrightDialog::QgsDecorationCopyrightDialog( QgsDecorationCopyrig
QPushButton* applyButton = buttonBox->button( QDialogButtonBox::Apply );
connect( applyButton, SIGNAL( clicked() ), this, SLOT( apply() ) );

//programmatically hide orientation selection for now
cboOrientation->hide();
textLabel15->hide();

grpEnable->setChecked( mDeco.enabled() );
// text
txtCopyrightText->setPlainText( mDeco.mLabelQString );
@@ -7,16 +7,15 @@
<x>0</x>
<y>0</y>
<width>543</width>
<height>291</height>
<height>322</height>
</rect>
</property>
<property name="windowTitle">
<string>Copyright Label Decoration</string>
</property>
<property name="windowIcon">
<iconset>
<normaloff/>
</iconset>
<normaloff>.</normaloff>.</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
@@ -46,7 +45,7 @@
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
@@ -57,7 +56,7 @@
</property>
</widget>
</item>
<item row="6" column="1" colspan="2">
<item row="4" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="textLabel1_4">
@@ -123,7 +122,7 @@
</item>
</layout>
</item>
<item row="5" column="1" colspan="2">
<item row="3" column="1" colspan="2">
<widget class="QComboBox" name="cboPlacement"/>
</item>
<item row="1" column="0" colspan="3">
@@ -137,7 +136,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="5" column="0">
<item row="3" column="0">
<widget class="QLabel" name="textLabel16">
<property name="maximumSize">
<size>
@@ -153,7 +152,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="6" column="0">
<item row="4" column="0">
<widget class="QLabel" name="lblMargin">
<property name="minimumSize">
<size>
@@ -166,7 +165,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
@@ -179,23 +178,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="textLabel15">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>&amp;Orientation</string>
</property>
<property name="buddy">
<cstring>cboOrientation</cstring>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2">
<item row="2" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QgsColorButtonV2" name="pbnColorChooser">
@@ -231,43 +214,6 @@ p, li { white-space: pre-wrap; }
</item>
</layout>
</item>
<item row="4" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QComboBox" name="cboOrientation">
<property name="minimumSize">
<size>
<width>150</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>Horizontal</string>
</property>
</item>
<item>
<property name="text">
<string>Vertical</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
@@ -297,7 +243,6 @@ p, li { white-space: pre-wrap; }
<tabstop>grpEnable</tabstop>
<tabstop>txtCopyrightText</tabstop>
<tabstop>pbnColorChooser</tabstop>
<tabstop>cboOrientation</tabstop>
<tabstop>cboPlacement</tabstop>
<tabstop>spnHorizontal</tabstop>
<tabstop>spnVertical</tabstop>

0 comments on commit 45489f6

Please sign in to comment.
You can’t perform that action at this time.