Skip to content

Commit

Permalink
Merge pull request #58160 from nyalldawson/move_project_symbol_settings
Browse files Browse the repository at this point in the history 
Tweak project properties color tab
  • Loading branch information
@troopa81
troopa81 authored Jul 18, 2024
2 parents 2927e06 + 05cd34d commit 2c2bc60
Showing 1 changed file with 112 additions and 81 deletions.
193 changes: 112 additions & 81 deletions src/ui/qgsprojectpropertiesbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>6</number>
<number>0</number>
</property>
<widget class="QWidget" name="mProjOptsGeneral">
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -1188,11 +1188,11 @@
<rect>
<x>0</x>
<y>0</y>
<width>694</width>
<height>789</height>
<width>685</width>
<height>791</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,1">
<layout class="QVBoxLayout" name="verticalLayout_12" stretch="0,0,1">
<property name="leftMargin">
<number>0</number>
</property>
Expand Down Expand Up @@ -1397,6 +1397,36 @@
</layout>
</widget>
</item>
<item>
<widget class="QgsCollapsibleGroupBox" name="groupBox_3">
<property name="title">
<string>Symbol Options</string>
</property>
<layout class="QGridLayout" name="gridLayout_28" columnstretch="0,1">
<item row="0" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Opacity</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsOpacityWidget" name="mDefaultOpacityWidget" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="cbxStyleRandomColors">
<property name="text">
<string>Assign random colors to symbols</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QgsCollapsibleGroupBox" name="mGroupBoxStyleDatabases">
<property name="sizePolicy">
Expand Down Expand Up @@ -1499,67 +1529,77 @@
<property name="syncGroup" stdset="0">
<string notr="true">projstyles</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="0">
<widget class="QLabel" name="mIccProfileLabel">
<property name="text">
<string>ICC Profile</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_27">
<property name="text">
<string>Opacity</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="4">
<widget class="QgsOpacityWidget" name="mDefaultOpacityWidget" native="true">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QToolButton" name="mAddIccProfile">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load an ICC profile file and attach it to the project.&lt;/p&gt;&lt;p&gt;Color model will be updated accordingly.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
<layout class="QGridLayout" name="gridLayout_4" columnstretch="1,0,2">
<property name="topMargin">
<number>8</number>
</property>
<item row="1" column="1" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin">
<number>0</number>
</property>
</widget>
<item>
<widget class="QLabel" name="mColorSpaceName">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mRemoveIccProfile">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove selected ICC profile&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionDeleteSelected.svg</normaloff>:/images/themes/default/mActionDeleteSelected.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mSaveIccProfile">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save ICC profile&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileSave.svg</normaloff>:/images/themes/default/mActionFileSave.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mAddIccProfile">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Load an ICC profile file and attach it to the project.&lt;/p&gt;&lt;p&gt;Color model will be updated accordingly.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileOpen.svg</normaloff>:/images/themes/default/mActionFileOpen.svg</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1" colspan="4">
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="mColorModel">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Color model used as default when selecting a color in the whole application.&lt;/p&gt;&lt;p&gt;Any color defined in a different color model than the one specified here will be converted to this color model when exporting a layout.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QToolButton" name="mRemoveIccProfile">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Remove selected ICC profile&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionDeleteSelected.svg</normaloff>:/images/themes/default/mActionDeleteSelected.svg</iconset>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="mColorSpaceName">
<item row="1" column="0">
<widget class="QLabel" name="mIccProfileLabel">
<property name="text">
<string/>
<string>ICC Profile</string>
</property>
</widget>
</item>
Expand All @@ -1570,27 +1610,6 @@
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QCheckBox" name="cbxStyleRandomColors">
<property name="text">
<string>Assign random colors to symbols</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="mSaveIccProfile">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Save ICC profile&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFileSave.svg</normaloff>:/images/themes/default/mActionFileSave.svg</iconset>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -1931,8 +1950,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>694</width>
<height>789</height>
<width>685</width>
<height>791</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_17">
Expand Down Expand Up @@ -2014,8 +2033,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>673</width>
<height>1503</height>
<width>671</width>
<height>1396</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
Expand Down Expand Up @@ -3670,6 +3689,8 @@
<tabstop>mStyleFillSymbol</tabstop>
<tabstop>mStyleColorRampSymbol</tabstop>
<tabstop>mStyleTextFormat</tabstop>
<tabstop>mDefaultOpacityWidget</tabstop>
<tabstop>cbxStyleRandomColors</tabstop>
<tabstop>mListStyleDatabases</tabstop>
<tabstop>mButtonAddStyleDatabase</tabstop>
<tabstop>mButtonRemoveStyleDatabase</tabstop>
Expand Down Expand Up @@ -3753,6 +3774,16 @@
<tabstop>mCoordinateCrs</tabstop>
<tabstop>twWmtsGrids</tabstop>
<tabstop>twWmtsLayers</tabstop>
<tabstop>mColorModel</tabstop>
<tabstop>mRemoveIccProfile</tabstop>
<tabstop>mSaveIccProfile</tabstop>
<tabstop>mAddIccProfile</tabstop>
<tabstop>mButtonAddColor</tabstop>
<tabstop>mButtonRemoveColor</tabstop>
<tabstop>mButtonCopyColors</tabstop>
<tabstop>mButtonPasteColors</tabstop>
<tabstop>mButtonImportColors</tabstop>
<tabstop>mButtonExportColors</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
Expand Down

0 comments on commit 2c2bc60

Please sign in to comment.