Skip to content

Commit

Permalink
[FEATURE] UI cleanups in prep of using property lists. Main visual di…
Browse files Browse the repository at this point in the history 
…fference is that labels dont have property lists no in vec props

git-svn-id: http://svn.osgeo.org/qgis/trunk@12095 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Nov 11, 2009
1 parent 253badb commit ec23e9a
Show file tree
Hide file tree
Showing 8 changed files with 717 additions and 852 deletions.
1 change: 0 additions & 1 deletion src/app/qgslabeldialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ void QgsLabelDialog::init( )
spinBufferSize->setValue( myLabelAttributes->bufferSize() );
//TODO - transparency attributes for buffers

listWidget->setItemSelected( listWidget->item( 0 ), true );
}


Expand Down
6 changes: 6 additions & 0 deletions src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@
<string>Form</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mTitleLabel">
<property name="text">
<string>Scale linearly between 0 and the following attribute value/ diagram size:</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
Expand Down
117 changes: 50 additions & 67 deletions src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,65 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsSVGDiagramFactoryWidgetBase</class>
<widget class="QWidget" name="QgsSVGDiagramFactoryWidgetBase" >
<property name="geometry" >
<widget class="QWidget" name="QgsSVGDiagramFactoryWidgetBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>351</width>
<height>342</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<property name="title">
<string>Search directories</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<layout class="QGridLayout">
<item row="0" column="0">
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>101</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="mAddDirectoryButton" >
<property name="text" >
<item row="0" column="1">
<widget class="QPushButton" name="mAddDirectoryButton">
<property name="text">
<string>Add...</string>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QPushButton" name="mRemoveDirectoryButton" >
<property name="text" >
<item row="0" column="2">
<widget class="QPushButton" name="mRemoveDirectoryButton">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3" >
<widget class="QComboBox" name="mSearchDirectoriesComboBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<item row="1" column="0" colspan="3">
<widget class="QComboBox" name="mSearchDirectoriesComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -65,82 +69,61 @@
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="mPreviewGroupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<item row="1" column="0">
<widget class="QGroupBox" name="mPreviewGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<property name="title">
<string>SVG Preview</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QListWidget" name="mPreviewListWidget" >
<property name="movement" >
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QListWidget" name="mPreviewListWidget">
<property name="movement">
<enum>QListView::Free</enum>
</property>
<property name="flow" >
<property name="flow">
<enum>QListView::LeftToRight</enum>
</property>
<property name="isWrapping" stdset="0" >
<property name="isWrapping" stdset="0">
<bool>true</bool>
</property>
<property name="gridSize" >
<property name="gridSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="viewMode" >
<property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
<property name="wordWrap" >
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="spacing" >
<item row="2" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</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" >
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="mPictureLineEdit" />
<widget class="QLineEdit" name="mPictureLineEdit"/>
</item>
<item>
<widget class="QPushButton" name="mPictureBrowseButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<size>
<width>150</width>
<height>32767</height>
</size>
</property>
<property name="text" >
<string>Browse...</string>
<widget class="QToolButton" name="mPictureBrowseButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
Expand Down
82 changes: 41 additions & 41 deletions src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@
<rect>
<x>0</x>
<y>0</y>
<width>342</width>
<width>412</width>
<height>277</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
Expand All @@ -30,50 +33,47 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="mAttributesComboBox"/>
<widget class="QComboBox" name="mAttributesComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QGridLayout">
<property name="margin">
<number>0</number>
<item row="0" column="1">
<widget class="QPushButton" name="mAddPushButton">
<property name="text">
<string>Add</string>
</property>
<property name="spacing">
<number>6</number>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="mRemovePushButton">
<property name="text">
<string>Remove</string>
</property>
<item row="1" column="0" colspan="2">
<widget class="QTreeWidget" name="mAttributesTreeWidget">
<property name="columnCount">
<number>2</number>
</property>
<column>
<property name="text">
<string>1</string>
</property>
</column>
<column>
<property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="mRemovePushButton">
<property name="text">
<string>Remove attribute</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="mAddPushButton">
<property name="text">
<string>Add attribute</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QTreeWidget" name="mAttributesTreeWidget">
<property name="columnCount">
<number>2</number>
</property>
<column>
<property name="text">
<string>1</string>
</property>
</column>
<column>
<property name="text">
<string>1</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
Expand Down
Loading

0 comments on commit ec23e9a

Please sign in to comment.