UI overhaul bonanza...hope this doesnt break anything...I guess we should say [FEATURE] at some point as the map composer dialogs have been somewhat overhauled....

git-svn-id: http://svn.osgeo.org/qgis/trunk@12031 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2009-11-08 19:34:54 +00:00
parent 7a2b2f0dcb
commit 4437567aad
23 changed files with 1278 additions and 1268 deletions

View File

@ -27,7 +27,7 @@ QgsComposerLabelWidget::QgsComposerLabelWidget( QgsComposerLabel* label ): QWidg
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, label );
gridLayout->addWidget( itemPropertiesWidget, 5, 0, 1, 2 );
toolBox->addItem( itemPropertiesWidget, tr( "Item properties" ) );
if ( mComposerLabel )
{

View File

@ -27,8 +27,8 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
//add widget for item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
gridLayout->addWidget( itemPropertiesWidget, 2, 0, 1, 1 );
toolBox->addItem( itemPropertiesWidget, tr( "Item Options") );
if ( legend )
{
mItemTreeView->setModel( legend->model() );

View File

@ -28,7 +28,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, composerMap );
gridLayout->addWidget( itemPropertiesWidget );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
QDoubleValidator v( 0 );
mWidthLineEdit->setValidator( &v );

View File

@ -35,7 +35,7 @@ QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, picture );
gridLayout->addWidget( itemPropertiesWidget, 8, 0, 1, 4 );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
mWidthLineEdit->setValidator( new QDoubleValidator( this ) );
mHeightLineEdit->setValidator( new QDoubleValidator( this ) );

View File

@ -28,7 +28,7 @@ QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scale
//add widget for general composer item properties
QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, scaleBar );
gridLayout->addWidget( itemPropertiesWidget );
toolBox->addItem( itemPropertiesWidget, tr( "General options" ) );
blockMemberSignals( true );
mStyleComboBox->insertItem( 0, tr( "Single Box" ) );

View File

@ -466,6 +466,7 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
QgsDebugMsg( QgsApplication::showSettings() );
QgsDebugMsg( "\n--------------------------\n\n\n" );
mMapCanvas->freeze( false );
mLastComposerId = 0;
} // QgisApp ctor
@ -3690,26 +3691,8 @@ void QgisApp::newPrintComposer()
}
//ask user about name
bool composerExists = true;
QString composerId;
while ( composerExists )
{
composerId = QInputDialog::getText( 0, tr( "Enter id string for composer" ), tr( "id:" ) );
if ( composerId.isNull() )
{
return;
}
if ( mPrintComposers.contains( composerId ) )
{
QMessageBox::critical( 0, tr( "Composer id already exists" ), tr( "The entered composer id '%1' already exists. Please enter a different id" ).arg( composerId ) );
}
else
{
composerExists = false;
}
}
mLastComposerId++;
QString composerId = QString( tr("Map Composer %1").arg( mLastComposerId ) );
//create new composer object
QgsComposer* newComposerObject = new QgsComposer( this, composerId );
//add it to the map of existing print composers
@ -4244,6 +4227,7 @@ bool QgisApp::loadComposersFromProject( const QString& projectFilePath )
composer->showMinimized();
composer->zoomFull();
}
mLastComposerId = composerNodes.size();
return true;
}
@ -4256,6 +4240,7 @@ void QgisApp::deletePrintComposers()
delete it.value();
}
mPrintComposers.clear();
mLastComposerId = 0;
}
void QgisApp::mergeSelectedFeatures()

View File

@ -991,6 +991,7 @@ class QgisApp : public QMainWindow
QgsUndoWidget* mUndoWidget;
int mLastComposerId;
};
#endif

View File

@ -6,119 +6,94 @@
<rect>
<x>0</x>
<y>0</y>
<width>215</width>
<height>434</height>
<width>236</width>
<height>314</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="mComposerItemPropertiesGroupBox">
<property name="title">
<string>Composer item properties</string>
<widget class="QPushButton" name="mFrameColorButton">
<property name="text">
<string>Frame color...</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mColorLabel">
<property name="text">
<string>Color</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mFrameColorButton</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mFrameColorButton">
<property name="text">
<string>Frame...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="mBackgroundColorButton">
<property name="text">
<string>Background...</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mOpacityLabel">
<property name="text">
<string>Opacity</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOpacitySlider</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QSlider" name="mOpacitySlider">
<property name="maximum">
<number>255</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="mOutlineWidthLabel">
<property name="text">
<string>Outline width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOutlineWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
</item>
<item row="7" column="0">
<widget class="QPushButton" name="mPositionButton">
<property name="text">
<string>Position...</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="mFrameCheckBox">
<property name="text">
<string>Show frame</string>
</property>
</widget>
</item>
<item row="9" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mBackgroundColorButton">
<property name="text">
<string>Background color...</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mOpacityLabel">
<property name="text">
<string>Opacity</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOpacitySlider</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QSlider" name="mOpacitySlider">
<property name="maximum">
<number>255</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mOutlineWidthLabel">
<property name="text">
<string>Outline width</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOutlineWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QDoubleSpinBox" name="mOutlineWidthSpinBox"/>
</item>
<item row="6" column="0">
<widget class="QPushButton" name="mPositionButton">
<property name="text">
<string>Position...</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="mFrameCheckBox">
<property name="text">
<string>Show frame</string>
</property>
</widget>
</item>
<item row="8" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>215</width>
<height>57</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>217</width>
<height>302</height>
<width>203</width>
<height>303</height>
</rect>
</property>
<property name="sizePolicy">
@ -19,43 +19,65 @@
<property name="windowTitle">
<string>Label Options</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_2">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QTextEdit" name="mTextEdit">
<property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>203</width>
<height>271</height>
</rect>
</property>
<attribute name="label">
<string>Label</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mMarginTextLabel">
<property name="text">
<string>Margin (mm)</string>
</property>
<property name="buddy">
<cstring>mMarginDoubleSpinBox</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox"/>
</item>
<item row="0" column="0">
<widget class="QTextEdit" name="mTextEdit">
<property name="lineWrapMode">
<enum>QTextEdit::NoWrap</enum>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="mFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mMarginTextLabel">
<property name="text">
<string>Margin (mm)</string>
</property>
<property name="buddy">
<cstring>mMarginDoubleSpinBox</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QDoubleSpinBox" name="mMarginDoubleSpinBox"/>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>

View File

@ -1,219 +1,255 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsComposerLegendWidgetBase</class>
<widget class="QWidget" name="QgsComposerLegendWidgetBase" >
<property name="geometry" >
<widget class="QWidget" name="QgsComposerLegendWidgetBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>520</width>
<height>498</height>
<width>354</width>
<height>474</height>
</rect>
</property>
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Barscale Options</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QGroupBox" name="mGeneralGroupBox" >
<property name="title" >
<string>General</string>
<layout class="QGridLayout" name="gridLayout_4">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="mTitleLabel" >
<property name="text" >
<string>Title</string>
</property>
<property name="buddy" >
<cstring>mTitleLineEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="8" >
<widget class="QLineEdit" name="mTitleLineEdit" />
</item>
<item row="1" column="0" colspan="3" >
<widget class="QLabel" name="mFontLabel" >
<property name="text" >
<string>Font</string>
</property>
</widget>
</item>
<item row="1" column="3" colspan="2" >
<widget class="QPushButton" name="mTitleFontButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Title...</string>
</property>
</widget>
</item>
<item row="1" column="5" colspan="2" >
<widget class="QPushButton" name="mLayerFontButton" >
<property name="text" >
<string>Layer...</string>
</property>
</widget>
</item>
<item row="1" column="7" colspan="2" >
<widget class="QPushButton" name="mItemFontButton" >
<property name="text" >
<string>Item...</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="4" >
<widget class="QLabel" name="mSymbolWidthLabel" >
<property name="text" >
<string>Symbol width</string>
</property>
<property name="buddy" >
<cstring>mSymbolWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="2" column="4" >
<widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox" />
</item>
<item row="2" column="5" colspan="3" >
<widget class="QLabel" name="mSymbolHeightLabel" >
<property name="text" >
<string>Symbol height</string>
</property>
<property name="buddy" >
<cstring>mSymbolHeightSpinBox</cstring>
</property>
</widget>
</item>
<item row="2" column="8" >
<widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox" />
</item>
<item row="3" column="0" colspan="2" >
<widget class="QLabel" name="mLayerSpaceLabel" >
<property name="text" >
<string>Layer space</string>
</property>
<property name="buddy" >
<cstring>mLayerSpaceSpinBox</cstring>
</property>
</widget>
</item>
<item row="3" column="2" colspan="3" >
<widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox" />
</item>
<item row="3" column="5" >
<widget class="QLabel" name="mSymbolSpaceLabel" >
<property name="text" >
<string>Symbol space</string>
</property>
<property name="buddy" >
<cstring>mSymbolSpaceSpinBox</cstring>
</property>
</widget>
</item>
<item row="3" column="6" colspan="3" >
<widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox" />
</item>
<item row="4" column="0" colspan="3" >
<widget class="QLabel" name="mIconLabelSpaceLabel" >
<property name="text" >
<string>Icon label space</string>
</property>
<property name="buddy" >
<cstring>mIconLabelSpaceSpinBox</cstring>
</property>
</widget>
</item>
<item row="4" column="3" colspan="2" >
<widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox" />
</item>
<item row="4" column="5" colspan="2" >
<widget class="QLabel" name="mBoxSpaceLabel" >
<property name="text" >
<string>Box space</string>
</property>
<property name="buddy" >
<cstring>mBoxSpaceSpinBox</cstring>
</property>
</widget>
</item>
<item row="4" column="7" colspan="2" >
<widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox" />
</item>
</layout>
</widget>
</item>
<item row="1" column="0" >
<widget class="QGroupBox" name="mLegendItemsGroupBox" >
<property name="title" >
<string>Legend items</string>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="6" >
<widget class="QTreeView" name="mItemTreeView" >
<property name="headerHidden" stdset="0" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QPushButton" name="mMoveDownPushButton" >
<property name="text" >
<string>Down</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="mMoveUpPushButton" >
<property name="text" >
<string>Up</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QPushButton" name="mRemovePushButton" >
<property name="text" >
<string>Remove</string>
</property>
</widget>
</item>
<item row="1" column="3" >
<widget class="QPushButton" name="mEditPushButton" >
<property name="text" >
<string>Edit...</string>
</property>
</widget>
</item>
<item row="1" column="4" >
<widget class="QPushButton" name="mUpdatePushButton" >
<property name="text" >
<string>Update</string>
</property>
</widget>
</item>
<item row="1" column="5" >
<widget class="QPushButton" name="mUpdateAllPushButton" >
<property name="text" >
<string>Update all</string>
</property>
</widget>
</item>
</layout>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>352</width>
<height>472</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>390</height>
</rect>
</property>
<attribute name="label">
<string>General</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mTitleLabel">
<property name="text">
<string>&amp;Title</string>
</property>
<property name="buddy">
<cstring>mTitleLineEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLineEdit" name="mTitleLineEdit"/>
</item>
<item row="2" column="0">
<widget class="QPushButton" name="mTitleFontButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Title Font...</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="mLayerFontButton">
<property name="text">
<string>Layer Font...</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QPushButton" name="mItemFontButton">
<property name="text">
<string>Item Font...</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QDoubleSpinBox" name="mSymbolWidthSpinBox">
<property name="prefix">
<string>Symbol width </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QDoubleSpinBox" name="mSymbolHeightSpinBox">
<property name="prefix">
<string>Symbol height </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QDoubleSpinBox" name="mLayerSpaceSpinBox">
<property name="prefix">
<string>Layer space </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QDoubleSpinBox" name="mSymbolSpaceSpinBox">
<property name="prefix">
<string>Symbol space </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QDoubleSpinBox" name="mIconLabelSpaceSpinBox">
<property name="prefix">
<string>Icon label space </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QDoubleSpinBox" name="mBoxSpaceSpinBox">
<property name="prefix">
<string>Box space </string>
</property>
<property name="suffix">
<string> mm</string>
</property>
</widget>
</item>
<item row="11" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>334</width>
<height>390</height>
</rect>
</property>
<attribute name="label">
<string>Legend items</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="6">
<widget class="QTreeView" name="mItemTreeView">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="headerHidden">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="mMoveDownPushButton">
<property name="text">
<string>v</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="mMoveUpPushButton_2">
<property name="text">
<string>^</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="toolButton">
<property name="text">
<string>X</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="mEditPushButton">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QToolButton" name="mUpdatePushButton">
<property name="text">
<string>Update</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QToolButton" name="mUpdatePushButton_2">
<property name="text">
<string>All</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mTitleLineEdit</tabstop>
<tabstop>mTitleFontButton</tabstop>
@ -226,12 +262,6 @@
<tabstop>mIconLabelSpaceSpinBox</tabstop>
<tabstop>mBoxSpaceSpinBox</tabstop>
<tabstop>mItemTreeView</tabstop>
<tabstop>mMoveDownPushButton</tabstop>
<tabstop>mMoveUpPushButton</tabstop>
<tabstop>mRemovePushButton</tabstop>
<tabstop>mEditPushButton</tabstop>
<tabstop>mUpdatePushButton</tabstop>
<tabstop>mUpdateAllPushButton</tabstop>
</tabstops>
<resources/>
<connections/>

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>504</width>
<height>802</height>
<width>404</width>
<height>447</height>
</rect>
</property>
<property name="sizePolicy">
@ -19,28 +19,28 @@
<property name="windowTitle">
<string>Map options</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<layout class="QGridLayout" name="gridLayout_8">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>481</width>
<height>1482</height>
<width>386</width>
<height>419</height>
</rect>
</property>
<attribute name="label">
<string>Map</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="title">
@ -175,7 +175,22 @@
</layout>
</widget>
</item>
<item row="2" column="0">
</layout>
</widget>
<widget class="QWidget" name="page_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>404</width>
<height>351</height>
</rect>
</property>
<attribute name="label">
<string>Extents</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QGroupBox" name="mMapExtentGroupBox">
<property name="title">
<string>Map extent</string>
@ -264,7 +279,14 @@
</layout>
</widget>
</item>
<item row="3" column="0">
</layout>
</widget>
<widget class="QWidget" name="page_3">
<attribute name="label">
<string>Grid</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QGroupBox" name="mGridCheckBox">
<property name="title">
<string>Show grid?</string>
@ -552,7 +574,6 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mPreviewModeComboBox</tabstop>
<tabstop>mUpdatePreviewButton</tabstop>
<tabstop>mWidthLineEdit</tabstop>

View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>347</width>
<width>240</width>
<height>540</height>
</rect>
</property>
@ -24,19 +24,22 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>324</width>
<width>226</width>
<height>679</height>
</rect>
</property>
<attribute name="label">
<string>Picture options</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QGroupBox" name="mSearchDirectoriesGroupBox">
@ -102,6 +105,12 @@
<string>Preview</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QListWidget" name="mPreviewListWidget">
<property name="showDropIndicator" stdset="0">
@ -251,7 +260,7 @@
<item row="8" column="0">
<widget class="QCheckBox" name="mRotationFromComposerMapCheckBox">
<property name="text">
<string>Take rotation from composer map</string>
<string>Sync from map</string>
</property>
</widget>
</item>
@ -280,7 +289,6 @@
<tabstop>mRotationSpinBox</tabstop>
<tabstop>mRotationFromComposerMapCheckBox</tabstop>
<tabstop>mComposerMapComboBox</tabstop>
<tabstop>scrollArea</tabstop>
</tabstops>
<resources/>
<connections/>

View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>212</width>
<width>325</width>
<height>537</height>
</rect>
</property>
@ -19,25 +19,28 @@
<property name="windowTitle">
<string>Barscale Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
<widget class="QToolBox" name="toolBox">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<widget class="QWidget" name="page">
<property name="geometry">
<rect>
<x>0</x>
<y>-179</y>
<width>189</width>
<y>0</y>
<width>307</width>
<height>714</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<attribute name="label">
<string>Scale bar</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="mSegmentSizeLabel">
<property name="text">
@ -269,22 +272,6 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>scrollArea</tabstop>
<tabstop>mSegmentSizeSpinBox</tabstop>
<tabstop>mMapUnitsPerBarUnitSpinBox</tabstop>
<tabstop>mNumberOfSegmentsSpinBox</tabstop>
<tabstop>mSegmentsLeftSpinBox</tabstop>
<tabstop>mStyleComboBox</tabstop>
<tabstop>mMapComboBox</tabstop>
<tabstop>mHeightSpinBox</tabstop>
<tabstop>mLineWidthSpinBox</tabstop>
<tabstop>mLabelBarSpaceSpinBox</tabstop>
<tabstop>mBoxSizeSpinBox</tabstop>
<tabstop>mUnitLabelLineEdit</tabstop>
<tabstop>mFontButton</tabstop>
<tabstop>mColorPushButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>514</width>
<height>535</height>
<width>416</width>
<height>620</height>
</rect>
</property>
<property name="sizePolicy">
@ -32,9 +32,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-290</y>
<width>491</width>
<height>823</height>
<y>-72</y>
<width>396</width>
<height>688</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3">
@ -243,6 +243,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mResolutionSpinBox</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
@ -262,6 +265,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOffsetXSpinBox</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
@ -275,6 +281,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mOffsetYSpinBox</cstring>
</property>
</widget>
</item>
<item row="6" column="0">
@ -288,6 +297,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mPenWidthSpinBox</cstring>
</property>
</widget>
</item>
<item row="8" column="0">
@ -301,6 +313,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mGridColorButton</cstring>
</property>
</widget>
</item>
<item row="10" column="0">
@ -324,6 +339,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="buddy">
<cstring>mGridStyleComboBox</cstring>
</property>
</widget>
</item>
<item row="12" column="0">

View File

@ -120,22 +120,6 @@
</tabstops>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>QgsConfigureShortcutsDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
@ -143,12 +127,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>334</x>
<y>279</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>267</x>
<y>297</y>
</hint>
</hints>
</connection>

View File

@ -6,132 +6,127 @@
<rect>
<x>0</x>
<y>0</y>
<width>506</width>
<height>265</height>
<width>453</width>
<height>222</height>
</rect>
</property>
<property name="windowTitle">
<string>Continuous color</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="1">
<layout class="QFormLayout" name="formLayout">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="classvarlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Classification field</string>
</property>
<property name="buddy">
<cstring>classificationComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="classificationComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="classvarlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Classification field</string>
</property>
<property name="buddy">
<cstring>classificationComboBox</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="classificationComboBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mincolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Minimum value</string>
</property>
<property name="buddy">
<cstring>btnMinValue</cstring>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="maxcolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Maximum value</string>
</property>
<property name="buddy">
<cstring>btnMaxValue</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="btnMinValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QgsColorButton" name="btnMaxValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="outlinewidthlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Outline width</string>
</property>
<property name="buddy">
<cstring>outlinewidthspinbox</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mincolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<widget class="QCheckBox" name="cb_polygonOutline">
<property name="text">
<string>Minimum value</string>
</property>
<property name="buddy">
<cstring>btnMinValue</cstring>
<string>Draw polygon outline</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="maxcolorlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Maximum value</string>
</property>
<property name="buddy">
<cstring>btnMaxValue</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="btnMinValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QgsColorButton" name="btnMaxValue">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="outlinewidthlabel">
<property name="minimumSize">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text">
<string>Outline width</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="outlinewidthspinbox"/>
</item>
</layout>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1">
<item row="1" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
@ -144,7 +139,20 @@
</property>
</spacer>
</item>
<item row="1" column="0">
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -157,13 +165,6 @@
</property>
</spacer>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="cb_polygonOutline">
<property name="text">
<string>Draw polygon outline</string>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
@ -174,6 +175,13 @@
<header>qgscolorbutton.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>classificationComboBox</tabstop>
<tabstop>btnMinValue</tabstop>
<tabstop>btnMaxValue</tabstop>
<tabstop>outlinewidthspinbox</tabstop>
<tabstop>cb_polygonOutline</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

View File

@ -1,128 +1,117 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsDetailedItemWidgetBase</class>
<widget class="QWidget" name="QgsDetailedItemWidgetBase" >
<property name="geometry" >
<widget class="QWidget" name="QgsDetailedItemWidgetBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>295</width>
<height>68</height>
<width>312</width>
<height>72</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>2</number>
</property>
<property name="topMargin" >
<number>2</number>
</property>
<property name="rightMargin" >
<number>2</number>
</property>
<property name="bottomMargin" >
<number>2</number>
</property>
<property name="horizontalSpacing" >
<number>2</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<item>
<widget class="QCheckBox" name="cbx" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblIcon" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>80</width>
<height>80</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="pixmap" >
<pixmap>../../images/icons/qgis-icon-16x16.png</pixmap>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="lblTitle" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font" >
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text" >
<string>Heading Label</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap" >
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="lblDetail" >
<property name="sizePolicy" >
<sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="lblIcon">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>80</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap>../../images/icons/qgis-icon-16x16.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="lblTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Heading Label</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="cbx">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QWidget" name="widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="lblDetail">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Detail label</string>
</property>
<property name="scaledContents" >
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="alignment" >
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap" >
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>

View File

@ -285,7 +285,7 @@
<item row="6" column="0" colspan="3">
<widget class="QTextEdit" name="mExpressionTextEdit"/>
</item>
<item row="7" column="1">
<item row="7" column="2">
<widget class="QDialogButtonBox" name="mButtonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@ -297,6 +297,40 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>mUpdateExistingFieldCheckBox</tabstop>
<tabstop>mExistingFieldComboBox</tabstop>
<tabstop>mOnlyUpdateSelectedCheckBox</tabstop>
<tabstop>mOutputFieldNameLineEdit</tabstop>
<tabstop>mOutputFieldTypeComboBox</tabstop>
<tabstop>mOuputFieldWidthSpinBox</tabstop>
<tabstop>mOutputFieldPrecisionSpinBox</tabstop>
<tabstop>mFieldsListWidget</tabstop>
<tabstop>mValueListWidget</tabstop>
<tabstop>mSamplePushButton</tabstop>
<tabstop>mAllPushButton</tabstop>
<tabstop>mPlusPushButton</tabstop>
<tabstop>mMultiplyPushButton</tabstop>
<tabstop>mSqrtButton</tabstop>
<tabstop>mSinButton</tabstop>
<tabstop>mTanButton</tabstop>
<tabstop>mACosButton</tabstop>
<tabstop>mOpenBracketPushButton</tabstop>
<tabstop>mMinusPushButton</tabstop>
<tabstop>mDividePushButton</tabstop>
<tabstop>mExpButton</tabstop>
<tabstop>mCosButton</tabstop>
<tabstop>mASinButton</tabstop>
<tabstop>mATanButton</tabstop>
<tabstop>mCloseBracketPushButton</tabstop>
<tabstop>mToRealButton</tabstop>
<tabstop>mToIntButton</tabstop>
<tabstop>mToStringButton</tabstop>
<tabstop>mLengthButton</tabstop>
<tabstop>mAreaButton</tabstop>
<tabstop>mExpressionTextEdit</tabstop>
<tabstop>mButtonBox</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
@ -306,8 +340,8 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>321</x>
<y>676</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
@ -322,8 +356,8 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
<x>321</x>
<y>676</y>
</hint>
<hint type="destinationlabel">
<x>286</x>

View File

@ -1,7 +1,8 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsGenericProjectionSelectorBase</class>
<widget class="QDialog" name="QgsGenericProjectionSelectorBase" >
<property name="geometry" >
<widget class="QDialog" name="QgsGenericProjectionSelectorBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@ -9,59 +10,62 @@
<height>563</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Coordinate Reference System Selector</string>
</property>
<property name="windowIcon" >
<property name="windowIcon">
<iconset>
<normaloff/>
</iconset>
</property>
<property name="modal" >
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QTextEdit" name="textEdit" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QTextEdit" name="textEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize" >
<property name="maximumSize">
<size>
<width>16777215</width>
<height>160</height>
</size>
</property>
<property name="focusPolicy" >
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="acceptDrops" >
<property name="acceptDrops">
<bool>false</bool>
</property>
<property name="lineWidth" >
<property name="lineWidth">
<number>2</number>
</property>
<property name="readOnly" >
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QgsProjectionSelector" native="1" name="projectionSelector" />
<item row="1" column="0">
<widget class="QgsProjectionSelector" name="projectionSelector" native="true"/>
</item>
<item row="2" column="0" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
<property name="centerButtons">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
<customwidget>
<class>QgsProjectionSelector</class>
@ -74,33 +78,33 @@
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<signal>accepted()</signal>
<receiver>QgsGenericProjectionSelectorBase</receiver>
<slot>reject()</slot>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>475</x>
<hint type="sourcelabel">
<x>409</x>
<y>534</y>
</hint>
<hint type="destinationlabel" >
<x>493</x>
<y>523</y>
<hint type="destinationlabel">
<x>417</x>
<y>559</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<signal>rejected()</signal>
<receiver>QgsGenericProjectionSelectorBase</receiver>
<slot>accept()</slot>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>566</x>
<y>534</y>
<hint type="sourcelabel">
<x>471</x>
<y>537</y>
</hint>
<hint type="destinationlabel" >
<x>600</x>
<y>530</y>
<hint type="destinationlabel">
<x>594</x>
<y>563</y>
</hint>
</hints>
</connection>

View File

@ -219,6 +219,7 @@
<tabstop>numberofclassesspinbox</tabstop>
<tabstop>mClassifyButton</tabstop>
<tabstop>mDeleteClassButton</tabstop>
<tabstop>mClassListWidget</tabstop>
</tabstops>
<resources/>
<connections/>

File diff suppressed because it is too large Load Diff

View File

@ -1,101 +1,75 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsLUDialogBase</class>
<widget class="QDialog" name="QgsLUDialogBase" >
<property name="geometry" >
<widget class="QDialog" name="QgsLUDialogBase">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>324</width>
<height>133</height>
<width>227</width>
<height>117</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string>Enter class bounds</string>
</property>
<property name="modal" >
<property name="modal">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>4</number>
</property>
<property name="topMargin" >
<number>4</number>
</property>
<property name="rightMargin" >
<number>4</number>
</property>
<property name="bottomMargin" >
<number>4</number>
</property>
<property name="horizontalSpacing" >
<number>-1</number>
</property>
<property name="verticalSpacing" >
<number>-1</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="mLowerLabel" >
<property name="text" >
<string>Lower value</string>
</property>
<property name="buddy" >
<cstring>mLowerEdit</cstring>
</property>
</widget>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="mLowerLabel">
<property name="text">
<string>Lower value</string>
</property>
<property name="buddy">
<cstring>mLowerEdit</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="mLowerEdit"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mUpperLabel">
<property name="text">
<string>Upper value</string>
</property>
<property name="buddy">
<cstring>mUpperEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="mUpperEdit"/>
</item>
</layout>
</item>
<item row="0" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>16</width>
<height>49</height>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2" >
<widget class="QLabel" name="mUpperLabel" >
<property name="text" >
<string>Upper value</string>
</property>
<property name="buddy" >
<cstring>mUpperEdit</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLineEdit" name="mLowerEdit" />
</item>
<item row="1" column="1" >
<widget class="QLabel" name="mBetweenLabel" >
<property name="text" >
<string>-</string>
</property>
<property name="textFormat" >
<enum>Qt::AutoText</enum>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QLineEdit" name="mUpperEdit" />
</item>
<item row="2" column="0" colspan="3" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="standardButtons" >
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
<layoutdefault spacing="6" margin="11"/>
<resources/>
<connections>
<connection>
@ -104,11 +78,11 @@
<receiver>QgsLUDialogBase</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>285</x>
<hint type="sourcelabel">
<x>163</x>
<y>120</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>321</x>
<y>35</y>
</hint>
@ -120,11 +94,11 @@
<receiver>QgsLUDialogBase</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>209</x>
<hint type="sourcelabel">
<x>163</x>
<y>116</y>
</hint>
<hint type="destinationlabel" >
<hint type="destinationlabel">
<x>151</x>
<y>7</y>
</hint>

View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>275</width>
<width>281</width>
<height>272</height>
</rect>
</property>
@ -154,6 +154,13 @@
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>
<tabstop>mTable</tabstop>
<tabstop>editTotal</tabstop>
<tabstop>btnHelp</tabstop>
<tabstop>mRestartButton</tabstop>
<tabstop>mCloseButton</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>