razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Add ALT+click to add as new style to palette

Browse source
This commit is contained in:
manongjohn 2021-09-16 10:48:32 -04:00
parent e4952e437c
commit cfb741692e
9 changed files with 268 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/include/toonz/palettecmd.h
View file

@ -38,7 +38,7 @@ DVAPI void arrangeStyles(TPaletteHandle *paletteHandle, int dstPageIndex,
int dstIndexInPage, int srcPageIndex,
const std::set<int> &srcIndicesInPage);
DVAPI void createStyle(TPaletteHandle *paletteHandle, TPalette::Page *page);
DVAPI int createStyle(TPaletteHandle *paletteHandle, TPalette::Page *page);
DVAPI void addStyles(TPaletteHandle *paletteHandle, int pageIndex,
int indexInPage, const std::vector<TColorStyle *> &styles);

9
toonz/sources/include/toonz/palettecontroller.h
View file

@ -7,6 +7,8 @@
#include "tcommon.h"
#include "tpixel.h"
#include "toonzqt/paletteviewer.h"
// Qt includes
#include <QObject>
@ -55,6 +57,8 @@ class DVAPI PaletteController final : public QObject {
TPalette *m_defaultToonzRaster;
TPalette *m_defaultRaster;
PaletteViewer *m_currentPaletteViewer;
public:
PaletteController();
~PaletteController();
@ -93,6 +97,11 @@ public:
emit stylePassivePicked(ink, paint, tone);
}
PaletteViewer *getCurrentPaletteViewer() { return m_currentPaletteViewer; }
void setCurrentPaletteViewer(PaletteViewer *viewer) {
m_currentPaletteViewer = viewer;
}
public slots:
void editLevelPalette();

11
toonz/sources/include/toonzqt/paletteviewer.h
View file

@ -5,6 +5,7 @@
#include "paletteviewergui.h"
#include "toonz/tpalettehandle.h"
#include "toonz/tapplication.h"
#undef DVAPI
#undef DVVAR
@ -80,6 +81,11 @@ public:
bool getIsFrozen() { return m_frozen; }
void setIsFrozen(bool frozen);
void setApplication(TApplication *app) { m_app = app; }
TApplication *getApplication() { return m_app; }
int geCurrentPageIndex() { return m_currentIndexPage; }
protected:
TPaletteHandle *m_paletteHandle;
TFrameHandle *m_frameHandle;
@ -88,6 +94,7 @@ protected:
QScrollArea *m_pageViewerScrollArea;
PaletteViewerGUI::PageViewer *m_pageViewer;
int m_currentIndexPage;
TabBarContainter *m_tabBarContainer;
PaletteTabBar *m_pagesBar;
@ -114,6 +121,8 @@ protected:
QToolButton *m_freezePaletteToolButton;
bool m_frozen = false;
TApplication *m_app;
protected:
void createTabBar();
@ -141,6 +150,8 @@ protected:
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
void enterEvent(QEvent *) override;
void dragEnterEvent(QDragEnterEvent *event) override;
void dropEvent(QDropEvent *event) override;

23
toonz/sources/include/toonzqt/styleeditor.h
View file

@ -422,6 +422,7 @@ class StyleEditorPage : public QFrame {
public:
bool m_favorite = false;
bool m_allowFavorite = false;
StyleEditor *m_editor;
StyleEditorPage(QWidget *parent);
@ -552,6 +553,7 @@ public:
virtual void drawChip(QPainter &p, QRect rect, int index) = 0;
virtual void onSelect(int index) {}
virtual void onAddNewStyle(int index) {}
virtual void removeFavorite(){};
virtual void addFavorite() {}
@ -580,8 +582,9 @@ protected slots:
void onUpdateFavorite();
signals:
void styleSelected(const TColorStyle &style);
void favoritesUpdated(QString pageType);
void refreshFavorites(QString pageType);
void addStyleToPalette(const TColorStyle &style);
void favoritesUpdated();
void refreshFavorites();
};
//=============================================================================
@ -721,6 +724,9 @@ class DVAPI StyleEditor final : public QWidget, public SaveLoadQSettings {
QMenu *m_vectorMenu;
QMenu *m_rasterMenu;
bool m_isAltPressed = false;
bool m_isCtrlPressed = false;
public:
StyleEditor(PaletteController *, QWidget *parent = 0);
~StyleEditor();
@ -750,6 +756,11 @@ public:
void createStyleMenus();
bool isAltPressed() { return m_isAltPressed; }
bool isCtrlPressed() { return m_isCtrlPressed; }
void clearSelection();
protected:
/*! Return false if style is linked and style must be set to null.*/
bool setStyle(TColorStyle *currentStyle);
@ -777,6 +788,9 @@ protected:
protected:
void showEvent(QShowEvent *) override;
void hideEvent(QHideEvent *) override;
void keyPressEvent(QKeyEvent *event) override;
void keyReleaseEvent(QKeyEvent *event) override;
void enterEvent(QEvent *event) override;
protected slots:
@ -798,6 +812,7 @@ protected slots:
void onColorChanged(const ColorModel &, bool isDragging);
void selectStyle(const TColorStyle &style);
void addToPalette(const TColorStyle &style);
void applyButtonClicked();
void autoCheckChanged(bool value);
@ -833,8 +848,8 @@ protected slots:
void onExpandAllVectorSet();
void onExpandAllRasterSet();
void onReloadFavorites(QString pageType);
void onUpdateFavorites(QString pageType);
void onReloadFavorites();
void onUpdateFavorites();
private:
QFrame *createBottomWidget();

1
toonz/sources/toonz/tpanels.cpp
View file

@ -500,6 +500,7 @@ PaletteViewerPanel::PaletteViewerPanel(QWidget *parent)
m_paletteViewer->setXsheetHandle(app->getCurrentXsheet());
// for clearing cache when paste style command called from the StyleSelection
m_paletteViewer->setLevelHandle(app->getCurrentLevel());
m_paletteViewer->setApplication(app);
TSceneHandle *sceneHandle = app->getCurrentScene();
bool ret = connect(sceneHandle, SIGNAL(sceneSwitched()), this,

6
toonz/sources/toonzlib/palettecmd.cpp
View file

@ -330,8 +330,8 @@ public:
//-----------------------------------------------------------------------------
void PaletteCmd::createStyle(TPaletteHandle *paletteHandle,
TPalette::Page *page) {
int PaletteCmd::createStyle(TPaletteHandle *paletteHandle,
TPalette::Page *page) {
int index = paletteHandle->getStyleIndex();
TPalette *palette = paletteHandle->getPalette();
int newIndex;
@ -383,6 +383,8 @@ void PaletteCmd::createStyle(TPaletteHandle *paletteHandle,
paletteHandle->notifyPaletteChanged();
TUndoManager::manager()->add(new CreateStyleUndo(
paletteHandle, page->getIndex(), page->getStyleId(newIndex)));
return newStyleId;
}
//=============================================================================

3
toonz/sources/toonzlib/palettecontroller.cpp
View file

@ -51,7 +51,8 @@ PaletteController::PaletteController()
, m_colorSample()
, m_defaultRaster(0)
, m_defaultToonzRaster(0)
, m_defaultVector(0) {
, m_defaultVector(0)
, m_currentPaletteViewer(0) {
m_currentLevelPalette = new TPaletteHandle;
m_currentCleanupPalette = new TPaletteHandle;
m_currentPalette = new TPaletteHandle;

9
toonz/sources/toonzqt/paletteviewer.cpp
View file

@ -24,6 +24,8 @@
#include "toonz/txshlevelhandle.h"
#include "toonz/txshleveltypes.h"
#include "../include/toonz/palettecontroller.h"
// TnzCore includes
#include "tconvert.h"
#include "tsystem.h"
@ -866,6 +868,12 @@ void PaletteViewer::hideEvent(QHideEvent *) {
SLOT(onFrameSwitched()));
}
//-----------------------------------------------------------------------------
void PaletteViewer::enterEvent(QEvent *) {
getApplication()->getPaletteController()->setCurrentPaletteViewer(this);
}
//-----------------------------------------------------------------------------
/*! If currente palette viewer exist verify event data, if is a PaletteData or
has urls accept event.
@ -1018,6 +1026,7 @@ void PaletteViewer::clearStyleSelection() { m_pageViewer->clearSelection(); }
void PaletteViewer::setPageView(int currentIndexPage) {
TPalette *palette = getPalette();
TPalette::Page *page = palette ? palette->getPage(currentIndexPage) : 0;
m_currentIndexPage = palette ? currentIndexPage : 0;
m_pageViewer->setPage(page);
}

250
toonz/sources/toonzqt/styleeditor.cpp
View file

@ -20,6 +20,7 @@
#include "toonz/levelproperties.h" //iwsw
#include "toonz/mypaintbrushstyle.h"
#include "toonz/preferences.h"
#include "toonz/palettecmd.h"
// TnzCore includes
#include "tconvert.h"
@ -1517,6 +1518,8 @@ StyleEditorPage::StyleEditorPage(QWidget *parent) : QFrame(parent) {
// It is necessary for the style sheets
setObjectName("styleEditorPage");
setFrameStyle(QFrame::StyledPanel);
m_editor = dynamic_cast<StyleEditor *>(parent);
}
//*****************************************************************************
@ -2005,8 +2008,14 @@ void StyleChooserPage::mousePressEvent(QMouseEvent *event) {
QPoint pos = event->pos();
int currentIndex = posToIndex(pos);
if (currentIndex < 0) return;
m_currentIndex = currentIndex;
onSelect(currentIndex);
if (m_editor->isAltPressed()) {
onAddNewStyle(currentIndex);
} else {
onSelect(currentIndex);
}
update();
}
@ -2035,6 +2044,7 @@ void StyleChooserPage::contextMenuEvent(QContextMenuEvent *event) {
connect(action, SIGNAL(triggered()), SLOT(onAddFavorite()));
}
menu->addAction(action);
menu->exec(event->globalPos());
}
@ -2134,10 +2144,11 @@ else return false;
}
}
void onSelect(int index) override;
void onAddNewStyle(int index) override;
void removeFavorite() override;
void addFavorite() override;
void updateFavorite() override { emit refreshFavorites("custom"); };
void updateFavorite() override { emit refreshFavorites(); };
bool isLoading() { return m_styleManager->isLoading(); }
};
@ -2195,6 +2206,26 @@ void CustomStyleChooserPage::onSelect(int index) {
//-----------------------------------------------------------------------------
void CustomStyleChooserPage::onAddNewStyle(int index) {
if (index <= 0 || index >= getChipCount()) return;
index--;
CustomStyleManager::PatternData pattern = m_styleManager->getPattern(index);
if (m_currentIndex < 0) return;
std::string name = pattern.m_patternName;
if (pattern.m_isVector) {
TVectorImagePatternStrokeStyle cs(m_stylesFolder, name);
emit addStyleToPalette(cs);
} else {
TRasterImagePatternStrokeStyle cs(m_stylesFolder, name);
emit addStyleToPalette(cs);
}
}
//-----------------------------------------------------------------------------
void CustomStyleChooserPage::removeFavorite() {
if (!isFavorite()) return;
@ -2213,7 +2244,7 @@ void CustomStyleChooserPage::removeFavorite() {
TSystem::readDirectory(fileList, patternDir, false);
bool deleted = deleteFromFavorites(fileList);
if (deleted) emit favoritesUpdated("custom");
if (deleted) emit favoritesUpdated();
}
//-----------------------------------------------------------------------------
@ -2239,7 +2270,7 @@ void CustomStyleChooserPage::addFavorite() {
ToonzFolder::getMyFavoritesFolder() + TFilePath("library/vector brushes");
bool added = copyToFavorites(fileList, myFavoritesPath);
if (added) emit favoritesUpdated("custom");
if (added) emit favoritesUpdated();
}
//*****************************************************************************
@ -2288,6 +2319,7 @@ public:
void drawChip(QPainter &p, QRect rect, int index) override;
void onSelect(int index) override;
void onAddNewStyle(int index) override;
void removeFavorite() override;
void addFavorite() override;
@ -2360,6 +2392,25 @@ void VectorBrushStyleChooserPage::onSelect(int index) {
//-----------------------------------------------------------------------------
void VectorBrushStyleChooserPage::onAddNewStyle(int index) {
if (index <= 0 || index >= getChipCount()) return;
--index;
CustomStyleManager::PatternData pattern = m_styleManager->getPattern(index);
if (m_currentIndex < 0) return;
std::string name = pattern.m_patternName;
assert(pattern.m_isVector);
if (!pattern.m_isVector) return;
TVectorBrushStyle cs(m_stylesFolder, name);
emit addStyleToPalette(cs);
}
//-----------------------------------------------------------------------------
void VectorBrushStyleChooserPage::removeFavorite() {
if (!isFavorite()) return;
@ -2378,7 +2429,7 @@ void VectorBrushStyleChooserPage::removeFavorite() {
TSystem::readDirectory(fileList, patternDir, false);
bool deleted = deleteFromFavorites(fileList);
if (deleted) emit favoritesUpdated("custom");
if (deleted) emit favoritesUpdated();
}
//-----------------------------------------------------------------------------
@ -2404,7 +2455,7 @@ void VectorBrushStyleChooserPage::addFavorite() {
ToonzFolder::getMyFavoritesFolder() + TFilePath("library/vector brushes");
bool added = copyToFavorites(fileList, myFavoritesPath);
if (added) emit favoritesUpdated("custom");
if (added) emit favoritesUpdated();
}
//*****************************************************************************
@ -2465,10 +2516,11 @@ public:
}
void onSelect(int index) override;
void onAddNewStyle(int index) override;
void removeFavorite() override;
void addFavorite() override;
void updateFavorite() override { emit refreshFavorites("textures"); };
void updateFavorite() override { emit refreshFavorites(); };
};
//-----------------------------------------------------------------------------
@ -2495,6 +2547,22 @@ void TextureStyleChooserPage::onSelect(int index) {
//-----------------------------------------------------------------------------
void TextureStyleChooserPage::onAddNewStyle(int index) {
if (index <= 0 || index >= getChipCount()) return;
index--;
TextureStyleManager::TextureData texture = m_styleManager->getTexture(index);
if (m_currentIndex < 0) return;
TTextureStyle style(texture.m_raster,
m_stylesFolder + TFilePath(texture.m_textureName));
emit addStyleToPalette(style);
}
//-----------------------------------------------------------------------------
bool TextureStyleChooserPage::event(QEvent *e) {
if (e->type() != QEvent::ToolTip) return StyleChooserPage::event(e);
@ -2538,7 +2606,7 @@ void TextureStyleChooserPage::removeFavorite() {
fileList.push_back(texture.m_path);
bool deleted = deleteFromFavorites(fileList);
if (deleted) emit favoritesUpdated("textures");
if (deleted) emit favoritesUpdated();
}
//-----------------------------------------------------------------------------
@ -2559,7 +2627,7 @@ void TextureStyleChooserPage::addFavorite() {
ToonzFolder::getMyFavoritesFolder() + TFilePath("library/textures");
bool added = copyToFavorites(fileList, myFavoritesPath);
if (added) emit favoritesUpdated("textures");
if (added) emit favoritesUpdated();
}
//*****************************************************************************
@ -2619,10 +2687,11 @@ public:
}
void onSelect(int index) override;
void onAddNewStyle(int index) override;
void removeFavorite() override;
void addFavorite() override;
void updateFavorite() override { emit refreshFavorites("raster"); };
void updateFavorite() override { emit refreshFavorites(); };
};
//-----------------------------------------------------------------------------
@ -2646,6 +2715,20 @@ void MyPaintBrushStyleChooserPage::onSelect(int index) {
//-----------------------------------------------------------------------------
void MyPaintBrushStyleChooserPage::onAddNewStyle(int index) {
if (index <= 0 || index >= getChipCount()) return;
index--;
BrushStyleManager::BrushData brush = m_styleManager->getBrush(index);
if (m_currentIndex < 0) return;
emit addStyleToPalette(brush.m_brush);
}
//-----------------------------------------------------------------------------
bool MyPaintBrushStyleChooserPage::event(QEvent *e) {
if (e->type() != QEvent::ToolTip) return StyleChooserPage::event(e);
@ -2687,7 +2770,7 @@ void MyPaintBrushStyleChooserPage::removeFavorite() {
fileList.push_back(brush.m_path.withName(name + "_prev").withType("png"));
bool deleted = deleteFromFavorites(fileList);
if (deleted) emit favoritesUpdated("raster");
if (deleted) emit favoritesUpdated();
}
//-----------------------------------------------------------------------------
@ -2708,7 +2791,7 @@ void MyPaintBrushStyleChooserPage::addFavorite() {
ToonzFolder::getMyFavoritesFolder() + TFilePath("library/raster brushes");
bool added = copyToFavorites(fileList, myFavoritesPath);
if (added) emit favoritesUpdated("raster");
if (added) emit favoritesUpdated();
}
//*****************************************************************************
@ -2743,6 +2826,7 @@ public:
void drawChip(QPainter &p, QRect rect, int index) override;
void onSelect(int index) override;
void onAddNewStyle(int index) override;
bool event(QEvent *e) override;
};
@ -2824,6 +2908,17 @@ void SpecialStyleChooserPage::onSelect(int index) {
//-----------------------------------------------------------------------------
void SpecialStyleChooserPage::onAddNewStyle(int index) {
if (index == 0 || m_currentIndex < 0) return;
int j = index - 1;
int tagId = m_customStyles[j].first;
TColorStyle *cs = TColorStyle::create(tagId);
emit addStyleToPalette(*cs);
}
//-----------------------------------------------------------------------------
bool SpecialStyleChooserPage::event(QEvent *e) {
if (e->type() == QEvent::ToolTip) {
QHelpEvent *helpEvent = dynamic_cast<QHelpEvent *>(e);
@ -3336,7 +3431,6 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
, m_oldStyle(0)
, m_parent(parent)
, m_editedStyle(0) {
setFocusPolicy(Qt::NoFocus);
// TOGLIERE
TFilePath libraryPath = ToonzFolder::getLibraryFolder();
TFilePath myFavoritesPath = ToonzFolder::getMyFavoritesFolder() + "library";
@ -3353,7 +3447,8 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
m_colorParameterSelector = new ColorParameterSelector(this);
m_plainColorPage = new PlainColorPage(0);
m_specialStylePage = new SpecialStyleChooserPage();
m_specialStylePage =
new SpecialStyleChooserPage(TFilePath(), QString(), this);
m_settingsPage = new SettingsPage(0);
QWidget *emptyPage = new StyleEditorPage(0);
@ -3511,11 +3606,14 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
ret = ret && connect(*itP, SIGNAL(styleSelected(const TColorStyle &)), this,
SLOT(selectStyle(const TColorStyle &)));
ret = ret && connect(*itP, SIGNAL(favoritesUpdated(QString)), this,
SLOT(onReloadFavorites(QString)));
ret = ret && connect(*itP, SIGNAL(addStyleToPalette(const TColorStyle &)),
this, SLOT(addToPalette(const TColorStyle &)));
ret = ret && connect(*itP, SIGNAL(refreshFavorites(QString)), this,
SLOT(onUpdateFavorites(QString)));
ret = ret && connect(*itP, SIGNAL(favoritesUpdated()), this,
SLOT(onReloadFavorites()));
ret = ret && connect(*itP, SIGNAL(refreshFavorites()), this,
SLOT(onUpdateFavorites()));
ret = ret &&
connect(*itB, SIGNAL(toggled(bool)), *itP, SLOT(setVisible(bool)));
@ -3526,11 +3624,14 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
ret = ret && connect(*itP, SIGNAL(styleSelected(const TColorStyle &)), this,
SLOT(selectStyle(const TColorStyle &)));
ret = ret && connect(*itP, SIGNAL(favoritesUpdated(QString)), this,
SLOT(onReloadFavorites(QString)));
ret = ret && connect(*itP, SIGNAL(addStyleToPalette(const TColorStyle &)),
this, SLOT(addToPalette(const TColorStyle &)));
ret = ret && connect(*itP, SIGNAL(refreshFavorites(QString)), this,
SLOT(onUpdateFavorites(QString)));
ret = ret && connect(*itP, SIGNAL(favoritesUpdated()), this,
SLOT(onReloadFavorites()));
ret = ret && connect(*itP, SIGNAL(refreshFavorites()), this,
SLOT(onUpdateFavorites()));
ret = ret &&
connect(*itB, SIGNAL(toggled(bool)), *itP, SLOT(setVisible(bool)));
@ -3541,11 +3642,14 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
ret = ret && connect(*itP, SIGNAL(styleSelected(const TColorStyle &)), this,
SLOT(selectStyle(const TColorStyle &)));
ret = ret && connect(*itP, SIGNAL(favoritesUpdated(QString)), this,
SLOT(onReloadFavorites(QString)));
ret = ret && connect(*itP, SIGNAL(addStyleToPalette(const TColorStyle &)),
this, SLOT(addToPalette(const TColorStyle &)));
ret = ret && connect(*itP, SIGNAL(refreshFavorites(QString)), this,
SLOT(onUpdateFavorites(QString)));
ret = ret && connect(*itP, SIGNAL(favoritesUpdated()), this,
SLOT(onReloadFavorites()));
ret = ret && connect(*itP, SIGNAL(refreshFavorites()), this,
SLOT(onUpdateFavorites()));
ret = ret &&
connect(*itB, SIGNAL(toggled(bool)), *itP, SLOT(setVisible(bool)));
@ -3877,6 +3981,26 @@ void StyleEditor::hideEvent(QHideEvent *) {
//-----------------------------------------------------------------------------
void StyleEditor::keyPressEvent(QKeyEvent *event) {
switch (event->key()) {
case Qt::Key_Alt:
m_isAltPressed = true;
break;
}
}
//-----------------------------------------------------------------------------
void StyleEditor::keyReleaseEvent(QKeyEvent *event) {
m_isAltPressed = false;
}
//-----------------------------------------------------------------------------
void StyleEditor::enterEvent(QEvent *event) { setFocus(Qt::MouseFocusReason); };
//-----------------------------------------------------------------------------
void StyleEditor::updateOrientationButton() {
if (m_plainColorPage->getIsVertical()) {
m_toggleOrientationAction->setIcon(createQIcon("orientation_h"));
@ -4338,6 +4462,52 @@ void StyleEditor::selectStyle(const TColorStyle &newStyle) {
//-----------------------------------------------------------------------------
void StyleEditor::addToPalette(const TColorStyle &newStyle) {
TPalette *palette = m_paletteHandle->getPalette();
if (!palette || palette->isLocked()) return;
PaletteViewer *viewer = m_paletteController->getCurrentPaletteViewer();
int pageIndex = viewer ? viewer->geCurrentPageIndex() : 0;
int styleIndex =
PaletteCmd::createStyle(m_paletteHandle, palette->getPage(pageIndex));
m_paletteController->getCurrentLevelPalette()->setStyleIndex(styleIndex);
setEditedStyleToStyle(&newStyle);
palette->setStyle(styleIndex, m_editedStyle->clone());
m_paletteHandle->notifyColorStyleChanged(false);
palette->setDirtyFlag(true);
// Update editor widgets
m_newColor->setStyle(*m_editedStyle);
int tag = m_editedStyle->getTagId();
if (tag == 4 || tag == 2000 || tag == 2800 || getStyleIndex() == 0) {
m_fillColorWidget->hide();
} else {
m_fillColorWidget->show();
// TPixel32 color = m_editedStyle->getMainColor();
TPixel32 color = m_editedStyle->getColorParamValue(getColorParam());
QString hexColor = color2Hex(color);
m_hexLineEdit->setText(hexColor);
m_newColor->setToolTip(hexColor);
m_fillColorWidget->setToolTip(hexColor);
QString myColor = QString::number(color.r) + ", " +
QString::number(color.g) + ", " +
QString::number(color.b);
std::string myColorStr = myColor.toStdString();
QString styleSheet = "QFrame {background-color: rgb(%1); }";
m_fillColorWidget->setStyleSheet(styleSheet.arg(myColor));
}
m_plainColorPage->setColor(*m_editedStyle, getColorParam());
m_colorParameterSelector->setStyle(*m_editedStyle);
m_settingsPage->setStyle(m_editedStyle);
}
//-----------------------------------------------------------------------------
void StyleEditor::onColorParamChanged() {
TPalette *palette = getPalette();
if (!palette) return;
@ -4565,7 +4735,7 @@ void StyleEditor::createStylePage(StylePageType pageType, TFilePath styleFolder,
switch (pageType) {
case StylePageType::Texture: {
TextureStyleChooserPage *newPage =
new TextureStyleChooserPage(styleFolder, filters);
new TextureStyleChooserPage(styleFolder, filters, this);
if (isFavorite)
newPage->setFavorite(true);
else
@ -4590,7 +4760,7 @@ void StyleEditor::createStylePage(StylePageType pageType, TFilePath styleFolder,
}
case StylePageType::VectorCustom: {
CustomStyleChooserPage *newPage =
new CustomStyleChooserPage(styleFolder, filters);
new CustomStyleChooserPage(styleFolder, filters, this);
if (isFavorite)
newPage->setFavorite(true);
else
@ -4609,7 +4779,7 @@ void StyleEditor::createStylePage(StylePageType pageType, TFilePath styleFolder,
}
case StylePageType::VectorBrush: {
VectorBrushStyleChooserPage *newPage =
new VectorBrushStyleChooserPage(styleFolder, filters);
new VectorBrushStyleChooserPage(styleFolder, filters, this);
if (isFavorite)
newPage->setFavorite(true);
else
@ -4628,7 +4798,7 @@ void StyleEditor::createStylePage(StylePageType pageType, TFilePath styleFolder,
}
case StylePageType::Raster: {
MyPaintBrushStyleChooserPage *newPage =
new MyPaintBrushStyleChooserPage(styleFolder, filters);
new MyPaintBrushStyleChooserPage(styleFolder, filters, this);
if (isFavorite)
newPage->setFavorite(true);
else
@ -4935,16 +5105,18 @@ void StyleEditor::onExpandAllRasterSet() {
//-----------------------------------------------------------------------------
void StyleEditor::onReloadFavorites(QString pageType) {
if (pageType == "textures") {
void StyleEditor::onReloadFavorites() {
int tab = m_styleBar->currentIndex();
if (tab == 1) { // Textures tab
TextureStyleChooserPage *page =
dynamic_cast<TextureStyleChooserPage *>(m_texturePages[0]);
page->loadItems();
} else if (pageType == "custom") {
} else if (tab == 2) { // Vector tab
CustomStyleChooserPage *page =
dynamic_cast<CustomStyleChooserPage *>(m_vectorPages[0]);
page->loadItems();
} else if (pageType == "raster") {
} else if (tab == 3) { // Raster tab
MyPaintBrushStyleChooserPage *page =
dynamic_cast<MyPaintBrushStyleChooserPage *>(m_rasterPages[0]);
page->loadItems();
@ -4953,8 +5125,10 @@ void StyleEditor::onReloadFavorites(QString pageType) {
//-----------------------------------------------------------------------------
void StyleEditor::onUpdateFavorites(QString pageType) {
if (pageType == "textures") {
void StyleEditor::onUpdateFavorites() {
int tab = m_styleBar->currentIndex();
if (tab == 1) { // Textures tab
TextureStyleChooserPage *page =
dynamic_cast<TextureStyleChooserPage *>(m_texturePages[0]);
int chipSize = page->getChipCount();
@ -4970,7 +5144,7 @@ void StyleEditor::onUpdateFavorites(QString pageType) {
m_textureButtons[0]->setDisabled(true);
}
m_textureMenu->actions()[0]->setVisible(!m_textureButtons[0]->isHidden());
} else if (pageType == "custom") {
} else if (tab == 2) { // Vector tab
CustomStyleChooserPage *page =
dynamic_cast<CustomStyleChooserPage *>(m_vectorPages[0]);
int chipSize = page->getChipCount();
@ -4986,7 +5160,7 @@ void StyleEditor::onUpdateFavorites(QString pageType) {
m_vectorButtons[0]->setDisabled(true);
}
m_vectorMenu->actions()[0]->setVisible(!m_vectorButtons[0]->isHidden());
} else if (pageType == "raster") {
} else if (tab == 3) { // Raster tab
MyPaintBrushStyleChooserPage *page =
dynamic_cast<MyPaintBrushStyleChooserPage *>(m_rasterPages[0]);
int chipSize = page->getChipCount();