Commit 21e8384d authored by Boudewijn Rempt's avatar Boudewijn Rempt

Rename foreGround/backGround to foreground/background

This is more consistent with the rest of Krita and is more correct.
However, the colorSource and halftone filter haven't been changed
since those used these strings to save and load config.
parent 24f97f7d
......@@ -199,7 +199,7 @@ bool Document::setColorSpace(const QString &colorModel, const QString &colorDept
return true;
}
QColor Document::backGroundColor()
QColor Document::backgroundColor()
{
if (!d->document) return QColor();
if (!d->document->image()) return QColor();
......
......@@ -196,7 +196,7 @@ public Q_SLOTS:
*
* @return QColor
*/
QColor backGroundColor();
QColor backgroundColor();
/**
* @brief setBackGroundColor sets the background color of the document. It will trigger a projection
......
......@@ -132,7 +132,7 @@ void View::activateResource(Resource *resource)
}
ManagedColor *View::foreGroundColor() const
ManagedColor *View::foregroundColor() const
{
if (!d->view) return 0;
return new ManagedColor(d->view->resourceProvider()->fgColor());
......@@ -144,7 +144,7 @@ void View::setForeGroundColor(ManagedColor *color)
d->view->resourceProvider()->setFGColor(color->color());
}
ManagedColor *View::backGroundColor() const
ManagedColor *View::backgroundColor() const
{
if (!d->view) return 0;
return new ManagedColor(d->view->resourceProvider()->bgColor());
......
......@@ -79,10 +79,10 @@ public Q_SLOTS:
void activateResource(Resource *resource);
/**
* @brief foreGroundColor allows access to the currently active color.
* @brief foregroundColor allows access to the currently active color.
* This is nominally per canvas/view, but in practice per mainwindow.
* @code
color = Application.activeWindow().activeView().foreGroundColor()
color = Application.activeWindow().activeView().foregroundColor()
components = color.components()
components[0] = 1.0
components[1] = 0.6
......@@ -91,10 +91,10 @@ color.setComponents(components)
Application.activeWindow().activeView().setForeGroundColor(color)
* @endcode
*/
ManagedColor *foreGroundColor() const;
ManagedColor *foregroundColor() const;
void setForeGroundColor(ManagedColor *color);
ManagedColor *backGroundColor() const;
ManagedColor *backgroundColor() const;
void setBackGroundColor(ManagedColor *color);
Resource *currentBrushPreset() const;
......
......@@ -26,7 +26,7 @@ public Q_SLOTS:
QString colorProfile() const;
bool setColorProfile(const QString &colorProfile);
bool setColorSpace(const QString &value, const QString &colorDepth, const QString &colorProfile);
QColor backGroundColor();
QColor backgroundColor();
bool setBackGroundColor(const QColor &color);
QString documentInfo() const;
void setDocumentInfo(const QString &document);
......
......@@ -16,10 +16,10 @@ public Q_SLOTS:
Canvas * canvas() const /Factory/;
void activateResource(Resource *resource);
ManagedColor *foreGroundColor() const /Factory/;
ManagedColor *foregroundColor() const /Factory/;
void setForeGroundColor(ManagedColor *color);
ManagedColor *backGroundColor() const /Factory/;
ManagedColor *backgroundColor() const /Factory/;
void setBackGroundColor(ManagedColor *color);
Resource *currentBrushPreset() const /Factory/;
......
......@@ -181,7 +181,7 @@ class Palette_Docker(DockWidget):
def slot_add_entry(self):
if (self.canvas()) is not None:
if (self.canvas().view()) is not None:
color = self.canvas().view().foreGroundColor()
color = self.canvas().view().foregroundColor()
success = self.paletteView.addEntryWithDialog(color)
if success is True:
self.slot_fill_combobox()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment