Skip to content
Permalink
Browse files

Rename custom colors to standard colors

  • Loading branch information
nyalldawson committed Aug 14, 2014
1 parent a31e3f5 commit 9b8f2ba9124ee5e1e97183881a7a8134187dce37
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/core/qgscolorscheme.h
  2. +3 −3 src/ui/qgsoptionsbase.ui
@@ -103,7 +103,7 @@ class CORE_EXPORT QgsCustomColorScheme : public QgsColorScheme

virtual ~QgsCustomColorScheme();

virtual QString schemeName() const { return QT_TR_NOOP( "Custom color palette" ); }
virtual QString schemeName() const { return QT_TR_NOOP( "Standard colors" ); }

virtual QgsNamedColorList fetchColors( const QString context = QString(),
const QColor baseColor = QColor() );
@@ -2278,7 +2278,7 @@
<item>
<widget class="QgsCollapsibleGroupBox" name="groupBox_7">
<property name="title">
<string>Custom color palette</string>
<string>Standard colors</string>
</property>
<layout class="QGridLayout" name="gridLayout_12">
<item row="2" column="1">
@@ -2355,7 +2355,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>524</width>
<width>526</width>
<height>327</height>
</rect>
</property>
@@ -3180,7 +3180,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>502</width>
<width>504</width>
<height>307</height>
</rect>
</property>

0 comments on commit 9b8f2ba

Please sign in to comment.
You can’t perform that action at this time.