Skip to content

Commit

Permalink
HIG compliance for composer and it's dialogs
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11747 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 3, 2009
1 parent a04b39d commit b5a9f42
Show file tree
Hide file tree
Showing 8 changed files with 547 additions and 504 deletions.
87 changes: 25 additions & 62 deletions src/ui/qgscomposerbase.ui
View file
Expand Up @@ -19,23 +19,8 @@
<property name="mouseTracking" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QSplitter" name="mSplitter" >
<property name="mouseTracking" >
<bool>true</bool>
Expand Down Expand Up @@ -171,51 +156,12 @@
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
<item row="1" column="0" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Close|QDialogButtonBox::Help|QDialogButtonBox::NoButton</set>
</property>
<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="QPushButton" name="helpPButton" >
<property name="text" >
<string>Help</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="closePButton" >
<property name="text" >
<string>Close</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -502,5 +448,22 @@
<tabstop>mSplitter</tabstop>
</tabstops>
<resources/>
<connections/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>QgsComposerBase</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel" >
<x>612</x>
<y>583</y>
</hint>
<hint type="destinationlabel" >
<x>735</x>
<y>567</y>
</hint>
</hints>
</connection>
</connections>
</ui>
15 changes: 12 additions & 3 deletions src/ui/qgscomposeritemwidgetbase.ui
View file
Expand Up @@ -22,7 +22,10 @@
<item row="0" column="0" >
<widget class="QLabel" name="mColorLabel" >
<property name="text" >
<string>Color:</string>
<string>Color</string>
</property>
<property name="buddy" >
<cstring>mFrameColorButton</cstring>
</property>
</widget>
</item>
Expand All @@ -43,7 +46,10 @@
<item row="1" column="0" colspan="2" >
<widget class="QLabel" name="mOpacityLabel" >
<property name="text" >
<string>Opacity:</string>
<string>Opacity</string>
</property>
<property name="buddy" >
<cstring>mOpacitySlider</cstring>
</property>
</widget>
</item>
Expand All @@ -60,7 +66,10 @@
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="mOutlineWidthLabel" >
<property name="text" >
<string>Outline width: </string>
<string>Outline width</string>
</property>
<property name="buddy" >
<cstring>mOutlineWidthSpinBox</cstring>
</property>
</widget>
</item>
Expand Down
7 changes: 6 additions & 1 deletion src/ui/qgscomposerlabelwidgetbase.ui
View file
Expand Up @@ -42,7 +42,10 @@
<item row="2" column="0" >
<widget class="QLabel" name="mMarginTextLabel" >
<property name="text" >
<string>Margin (mm):</string>
<string>Margin (mm)</string>
</property>
<property name="buddy" >
<cstring>mMarginDoubleSpinBox</cstring>
</property>
</widget>
</item>
Expand All @@ -53,7 +56,9 @@
</widget>
<layoutdefault spacing="6" margin="11" />
<tabstops>
<tabstop>mTextEdit</tabstop>
<tabstop>mFontButton</tabstop>
<tabstop>mMarginDoubleSpinBox</tabstop>
</tabstops>
<resources/>
<connections/>
Expand Down
13 changes: 8 additions & 5 deletions src/ui/qgscomposerlegenditemdialogbase.ui
View file
Expand Up @@ -16,7 +16,10 @@
<item row="0" column="0" >
<widget class="QLabel" name="mItemTextLabel" >
<property name="text" >
<string>Item text:</string>
<string>Item text</string>
</property>
<property name="buddy" >
<cstring>mItemTextLineEdit</cstring>
</property>
</widget>
</item>
Expand Down Expand Up @@ -44,8 +47,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>248</x>
<y>254</y>
<x>257</x>
<y>76</y>
</hint>
<hint type="destinationlabel" >
<x>157</x>
Expand All @@ -60,8 +63,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>316</x>
<y>260</y>
<x>325</x>
<y>76</y>
</hint>
<hint type="destinationlabel" >
<x>286</x>
Expand Down

0 comments on commit b5a9f42

Please sign in to comment.