Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
UI update to the raster & vector save as dialogs (#4083)
  • Loading branch information
DelazJ authored and nirvn committed Feb 7, 2017
1 parent ae74220 commit 11f0836
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 83 deletions.
6 changes: 3 additions & 3 deletions src/gui/qgsrasterlayersaveasdialog.cpp
Expand Up @@ -42,9 +42,9 @@ QgsRasterLayerSaveAsDialog::QgsRasterLayerSaveAsDialog( QgsRasterLayer* rasterLa
, mResolutionState( OriginalResolution )
{
setupUi( this );
mAddNoDataManuallyToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionNewAttribute.svg" ) ) );
mLoadTransparentNoDataToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionEditCopy.svg" ) ) );
mRemoveSelectedNoDataToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionDeleteAttribute.svg" ) ) );
mAddNoDataManuallyToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/symbologyAdd.svg" ) ) );
mLoadTransparentNoDataToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFileOpen.svg" ) ) );
mRemoveSelectedNoDataToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/symbologyRemove.svg" ) ) );
mRemoveAllNoDataToolButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionRemove.svg" ) ) );

mNoDataTableWidget->setColumnCount( 2 );
Expand Down
88 changes: 60 additions & 28 deletions src/ui/qgsrasterformatsaveoptionswidgetbase.ui
Expand Up @@ -30,22 +30,47 @@
<property name="text">
<string>New</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mProfileDeleteButton">
<property name="text">
<string>Remove</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="mProfileResetButton">
<property name="text">
<string>Reset</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionUndo.svg</normaloff>:/images/themes/default/mActionUndo.svg</iconset>
</property>
</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>
</widget>
</item>
Expand Down Expand Up @@ -110,65 +135,70 @@
</column>
</widget>
</item>
<item row="0" column="1">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QPushButton" name="mOptionsAddButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>+</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>1</width>
<height>1</height>
<width>16</width>
<height>16</height>
</size>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QPushButton" name="mOptionsValidateButton">
<item row="0" column="1">
<widget class="QPushButton" name="mOptionsDeleteButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Validate</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPushButton" name="mOptionsHelpButton">
<item row="0" column="2">
<widget class="QPushButton" name="mOptionsValidateButton">
<property name="text">
<string>Help</string>
<string>Validate</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="mOptionsDeleteButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="0" column="3">
<widget class="QPushButton" name="mOptionsHelpButton">
<property name="text">
<string>-</string>
<string>Help</string>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="verticalSpacer_3">
<item row="0" column="4">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<width>40</width>
<height>20</height>
</size>
</property>
Expand Down Expand Up @@ -218,6 +248,8 @@
<tabstop>mOptionsHelpButton</tabstop>
<tabstop>mOptionsLineEdit</tabstop>
</tabstops>
<resources/>
<resources>
<include location="../../images/images.qrc"/>
</resources>
<connections/>
</ui>
109 changes: 69 additions & 40 deletions src/ui/qgsrasterlayersaveasdialogbase.ui
Expand Up @@ -190,7 +190,7 @@ datasets with maximum width and height specified below.</string>
<x>0</x>
<y>0</y>
<width>541</width>
<height>583</height>
<height>754</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
Expand Down Expand Up @@ -235,7 +235,6 @@ datasets with maximum width and height specified below.</string>
<property name="saveCollapsedState" stdset="0">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</widget>
</item>
<item>
Expand Down Expand Up @@ -530,83 +529,113 @@ datasets with maximum width and height specified below.</string>
<property name="checked">
<bool>false</bool>
</property>
<property name="collapsed" stdset="0">
<property name="collapsed">
<bool>false</bool>
</property>
<property name="saveCollapsedState" stdset="0">
<property name="saveCollapsedState">
<bool>true</bool>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QTableWidget" name="mNoDataTableWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QToolButton" name="mAddNoDataManuallyToolButton">
<item row="2" column="1">
<widget class="QPushButton" name="mRemoveSelectedNoDataToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Add values manually</string>
<string>Remove selected row</string>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string>...</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionNewAttribute.svg</normaloff>:/images/themes/default/mActionNewAttribute.svg</iconset>
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QToolButton" name="mLoadTransparentNoDataToolButton">
<widget class="QPushButton" name="mAddNoDataManuallyToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Load user defined fully transparent (100%) values </string>
<string>Add values manually</string>
</property>
<property name="text">
<string>...</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionEditCopy.svg</normaloff>:/images/themes/default/mActionEditCopy.svg</iconset>
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QToolButton" name="mRemoveSelectedNoDataToolButton">
<property name="toolTip">
<string>Remove selected row</string>
<item row="1" column="0" colspan="5">
<widget class="QTableWidget" name="mNoDataTableWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<attribute name="horizontalHeaderDefaultSectionSize">
<number>250</number>
</attribute>
<attribute name="horizontalHeaderMinimumSectionSize">
<number>200</number>
</attribute>
</widget>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="mLoadTransparentNoDataToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Load user defined fully transparent (100%) values </string>
</property>
<property name="text">
<string>...</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionDeleteAttribute.svg</normaloff>:/images/themes/default/mActionDeleteAttribute.svg</iconset>
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="mRemoveAllNoDataToolButton">
<item row="2" column="3">
<widget class="QPushButton" name="mRemoveAllNoDataToolButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Clear all</string>
</property>
<property name="text">
<string>...</string>
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
Expand Down

0 comments on commit 11f0836

Please sign in to comment.