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

Merge pull request #921 from manongjohn/ui_fixes

Browse source 
UI fixes and updates
This commit is contained in:
manongjohn 2022-03-15 20:46:42 -04:00 committed by GitHub
commit 8af07a20a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 115 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -780,7 +780,7 @@ private slots:
// StyleEditor
//-----------------------------------------------------------------------------
enum StyleEditorTab { Color = 0, Raster, Vector, Texture, Settings };
enum StyleEditorTab { Color = 0, Raster, Texture, Vector, Settings, Empty };
class DVAPI StyleEditor final : public QWidget, public SaveLoadQSettings {
Q_OBJECT

60
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -1655,7 +1655,8 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
// Paint the cell edge-to-edge, we use LightLineColor with low opacity to
// pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(rect.adjusted(0, 0, 0, 1), QBrush(cellColor));
p.fillRect(rect.adjusted(0, 0, 0, (nextCell.isEmpty() ? 0 : 1)),
QBrush(cellColor));
else
p.fillRect(rect, QBrush(cellColor));
@ -1791,7 +1792,17 @@ void CellArea::drawDragHandle(QPainter &p, bool isStart, const QPoint &xy,
dragHandleRect.adjust(0, 1, 0, 0);
else
dragHandleRect.adjust(1, 0, 0, 0);
} else {
if (xy.x() > 1 && !m_viewer->orientation()->isVerticalTimeline())
dragHandleRect.adjust(-1, 0, 0, 0);
else if (xy.y() > 1 && m_viewer->orientation()->isVerticalTimeline())
dragHandleRect.adjust(0, -1, 0, 0);
}
// Adjust for 1st row
if (xy.x() <= 1 && !m_viewer->orientation()->isVerticalTimeline())
dragHandleRect.adjust(0, 0, -1, 0);
p.fillRect(dragHandleRect, QBrush(sideColor));
}
@ -1799,10 +1810,17 @@ void CellArea::drawDragHandle(QPainter &p, bool isStart, const QPoint &xy,
void CellArea::drawEndOfDragHandle(QPainter &p, bool isEnd, const QPoint &xy,
const QColor &cellColor) const {
if (!isEnd) return;
QPoint lxy = xy;
// Adjust left for 1st row
if (lxy.x() <= 1 && !m_viewer->orientation()->isVerticalTimeline())
lxy.setX(lxy.x() - 1);
QPoint frameAdj = m_viewer->getFrameZoomAdjustment();
QPainterPath corner = m_viewer->orientation()
->path(PredefinedPath::DRAG_HANDLE_CORNER)
.translated(xy - frameAdj);
.translated(lxy - frameAdj);
p.fillPath(corner, QBrush(cellColor));
}
@ -1811,17 +1829,36 @@ void CellArea::drawLockedDottedLine(QPainter &p, bool isLocked, bool isStart,
const QPoint &xy,
const QColor &cellColor) const {
if (!isLocked) return;
QPoint lxy = xy;
int adjEndX = 0, adjEndY = 0;
if (!m_viewer->orientation()->isVerticalTimeline()) {
if (lxy.x() <= 1) {
lxy.setX(lxy.x() + 1); // Adjust for 1st row
adjEndX = -2;
} else
adjEndX = -1;
} else {
if (lxy.y() <= 1) {
lxy.setY(lxy.y() + 1);
adjEndY = -2;
} else
adjEndY = -1;
}
p.setPen(QPen(cellColor, 2, Qt::DotLine));
QPoint frameAdj = m_viewer->getFrameZoomAdjustment();
QLine dottedLine =
m_viewer->orientation()->line(PredefinedLine::LOCKED).translated(xy);
m_viewer->orientation()->line(PredefinedLine::LOCKED).translated(lxy);
if (isStart) {
if (m_viewer->orientation()->isVerticalTimeline())
dottedLine.setP1(QPoint(dottedLine.x1(), dottedLine.y1() + 2));
else
dottedLine.setP1(QPoint(dottedLine.x1() + 2, dottedLine.y1()));
}
dottedLine.setP2(QPoint(dottedLine.x2(), dottedLine.y2()) - frameAdj);
dottedLine.setP2(QPoint(dottedLine.x2() + adjEndX, dottedLine.y2() + adjEndY) -
frameAdj);
p.drawLine(dottedLine);
}
@ -2046,7 +2083,8 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference,
// Paint the cell edge-to-edge, we use LightLineColor with low opacity
// to pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(rect.adjusted(0, 0, 0, 1), QBrush(cellColor));
p.fillRect(rect.adjusted(0, 0, 0, (nextCell.isEmpty() ? 0 : 1)),
QBrush(cellColor));
else
p.fillRect(rect, QBrush(cellColor));
}
@ -2120,7 +2158,8 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference,
// Paint the cell edge-to-edge, we use LightLineColor with low opacity to
// pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(rect.adjusted(0, 0, 0, 1), QBrush(cellColor));
p.fillRect(rect.adjusted(0, 0, 0, (nextCell.isEmpty() ? 0 : 1)),
QBrush(cellColor));
else
p.fillRect(rect, QBrush(cellColor));
@ -2389,7 +2428,8 @@ void CellArea::drawSoundTextCell(QPainter &p, int row, int col) {
// Paint the cell edge-to-edge, we use LightLineColor with low opacity to
// pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(rect.adjusted(0, 0, 0, 1), QBrush(cellColor));
p.fillRect(rect.adjusted(0, 0, 0, (nextCell.isEmpty() ? 0 : 1)),
QBrush(cellColor));
else
p.fillRect(rect, QBrush(cellColor));
@ -2624,7 +2664,8 @@ void CellArea::drawSoundTextColumn(QPainter &p, int r0, int r1, int col) {
// Paint the cell edge-to-edge, we use LightLineColor with low opacity
// to pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(info.rect.adjusted(0, 0, 0, 1), QBrush(tmpCellColor));
p.fillRect(info.rect.adjusted(0, 0, 0, (nextCell.isEmpty() ? 0 : 1)),
QBrush(tmpCellColor));
else
p.fillRect(info.rect, QBrush(tmpCellColor));
@ -2872,7 +2913,8 @@ void CellArea::drawPaletteCell(QPainter &p, int row, int col,
// Paint the cell edge-to-edge, we use LightLineColor with low opacity to
// pick up the hue of the cell color to make the separator line more
// pleasing to the eye.
p.fillRect(rect.adjusted(0, 0, 0, 1), QBrush(cellColor));
p.fillRect(rect.adjusted(0, 0, 0, (nextCell.isEmpty() ? 0 : 1)),
QBrush(cellColor));
else
p.fillRect(rect, QBrush(cellColor));

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

@ -1881,7 +1881,6 @@ ColumnTransparencyPopup::ColumnTransparencyPopup(XsheetViewer *viewer,
m_slider->setMinimum(1);
m_slider->setMaximum(100);
m_slider->setFixedHeight(14);
m_slider->setFixedWidth(100);
m_value = new DVGui::IntLineEdit(this, 1, 1, 100);
/*m_value->setValidator(new QIntValidator (1, 100, m_value));

8
toonz/sources/toonzlib/mypaintbrushstyle.cpp
View file

@ -276,11 +276,15 @@ void TMyPaintBrushStyle::makeIcon(const TDimension &d) {
double sx = (double)d.lx / (double)m_preview->getLx();
double sy = (double)d.ly / (double)m_preview->getLy();
double scale = std::min(sx, sy);
TRop::quickPut(m_icon, m_preview, TScale(scale));
TRaster32P resamplePreview(m_preview->getLx(), m_preview->getLy());
TRop::resample(resamplePreview, m_preview, TScale(scale),
TRop::ResampleFilterType::Hamming3);
TRop::over(m_icon, resamplePreview);
}
// paint color marker
if (d.lx > 0 && d.ly > 0) {
// Only show color marker when the icon size is 22x22
if (d.lx == d.ly && d.lx <= 22) {
int size = std::min(1 + std::min(d.lx, d.ly) * 2 / 3,
1 + std::max(d.lx, d.ly) / 2);
TPixel32 color = getMainColor();

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

@ -1150,8 +1150,8 @@ void ColorSlider::paintEvent(QPaintEvent *event) {
int pos = QStyle::sliderPositionFromValue(0, maximum(), value(), h, true);
p.drawPixmap(width() - s_chandle_tall, pos, vHandlePixmap);
} else {
static QPixmap hHandlePixmap =
svgToPixmap(":Resources/h_chandle_arrow.svg");
static QPixmap hHandlePixmap =
svgToPixmap(":Resources/h_chandle_arrow.svg");
int pos = QStyle::sliderPositionFromValue(0, maximum(), value(), w, false);
p.drawPixmap(pos, height() - s_chandle_tall, hHandlePixmap);
}
@ -4101,8 +4101,8 @@ StyleEditor::StyleEditor(PaletteController *paletteController, QWidget *parent)
m_styleChooser = new QStackedWidget(this);
m_styleChooser->addWidget(plainArea);
m_styleChooser->addWidget(m_rasterOutsideArea);
m_styleChooser->addWidget(m_vectorOutsideArea);
m_styleChooser->addWidget(m_textureOutsideArea);
m_styleChooser->addWidget(m_vectorOutsideArea);
m_styleChooser->addWidget(settingsArea);
m_styleChooser->addWidget(makeChooserPageWithoutScrollBar(emptyPage));
m_styleChooser->setFocusPolicy(Qt::NoFocus);
@ -4260,7 +4260,7 @@ QFrame *StyleEditor::createBottomWidget() {
m_styleSetsButton->setPopupMode(QToolButton::InstantPopup);
m_styleSetsButton->setToolTip(tr("Show or hide style sets."));
// QToolBar *displayToolbar = new QToolBar(this);
// QToolBar *displayToolbar = new QToolBar(this);
m_toolBar->addWidget(m_styleSetsButton);
m_toolBar->addWidget(toolButton);
m_toolBar->setMaximumHeight(22);
@ -4278,9 +4278,9 @@ QFrame *StyleEditor::createBottomWidget() {
mainLayout->setSpacing(0);
{
mainLayout->addWidget(m_autoButton);
// mainLayout->addSpacing(4);
// mainLayout->addSpacing(4);
mainLayout->addWidget(m_applyButton);
// mainLayout->addSpacing(4);
// mainLayout->addSpacing(4);
QVBoxLayout *colorLay = new QVBoxLayout();
colorLay->setMargin(0);
@ -4322,10 +4322,10 @@ QFrame *StyleEditor::createBottomWidget() {
// SLOT(applyButtonClicked()));
ret = ret && connect(m_autoButton, SIGNAL(toggled(bool)), this,
SLOT(autoCheckChanged(bool)));
// ret = ret &&
// connect(m_oldColor, SIGNAL(clicked()), this, SLOT(onOldStyleClicked()));
// ret = ret &&
// connect(m_newColor, SIGNAL(clicked()), this, SLOT(onNewStyleClicked()));
// ret = ret &&
// connect(m_oldColor, SIGNAL(clicked()), this, SLOT(onOldStyleClicked()));
// ret = ret &&
// connect(m_newColor, SIGNAL(clicked()), this, SLOT(onNewStyleClicked()));
ret = ret && connect(m_wheelAction, SIGNAL(toggled(bool)),
m_plainColorPage->m_wheelFrame, SLOT(setVisible(bool)));
ret = ret && connect(m_hsvAction, SIGNAL(toggled(bool)),
@ -4498,8 +4498,8 @@ void StyleEditor::updateTabBar() {
if (m_enabled && !m_enabledOnlyFirstTab && !m_enabledFirstAndLastTab) {
m_styleBar->addSimpleTab(tr("Color"));
m_styleBar->addSimpleTab(tr("Raster"));
m_styleBar->addSimpleTab(tr("Vector"));
m_styleBar->addSimpleTab(tr("Texture"));
m_styleBar->addSimpleTab(tr("Vector"));
m_styleBar->addSimpleTab(tr("Settings"));
} else if (m_enabled && m_enabledOnlyFirstTab && !m_enabledFirstAndLastTab)
m_styleBar->addSimpleTab(tr("Color"));
@ -4614,7 +4614,6 @@ void StyleEditor::mousePressEvent(QMouseEvent *event) {
void StyleEditor::contextMenuEvent(QContextMenuEvent *event) {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
StyleChooserPage *page;
if (tab == StyleEditorTab::Texture) // Textures tab
@ -4623,6 +4622,8 @@ void StyleEditor::contextMenuEvent(QContextMenuEvent *event) {
page = new CustomStyleChooserPage(TFilePath(), QString(), this);
else if (tab == StyleEditorTab::Raster) // Raster tab
page = new MyPaintBrushStyleChooserPage(TFilePath(), QString(), this);
else
return;
page->processContextMenuEvent(event);
}
@ -4652,8 +4653,6 @@ void StyleEditor::clearSelection() {
bool StyleEditor::isSelecting() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture)
return false;
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture)
@ -4662,6 +4661,8 @@ bool StyleEditor::isSelecting() {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return false;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin(); it != pages->end(); it++) {
@ -4676,8 +4677,6 @@ bool StyleEditor::isSelecting() {
bool StyleEditor::isSelectingFavorites() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture)
return false;
if (tab == StyleEditorTab::Texture)
return (m_texturePages[0]->getSelection().size() > 0);
@ -4686,15 +4685,13 @@ bool StyleEditor::isSelectingFavorites() {
else if (tab == StyleEditorTab::Raster)
return (m_rasterPages[0]->getSelection().size() > 0);
return true;
return false;
}
//-----------------------------------------------------------------------------
bool StyleEditor::isSelectingFavoritesOnly() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture)
return false;
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture) {
@ -4706,7 +4703,8 @@ bool StyleEditor::isSelectingFavoritesOnly() {
} else if (tab == StyleEditorTab::Raster) {
if (m_rasterPages[0]->getSelection().size() == 0) return false;
pages = &m_rasterPages;
}
} else
return false;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin() + 1; it != pages->end(); it++) {
@ -4721,8 +4719,6 @@ bool StyleEditor::isSelectingFavoritesOnly() {
bool StyleEditor::isSelectingNonFavoritesOnly() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture)
return false;
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture) {
@ -4734,7 +4730,8 @@ bool StyleEditor::isSelectingNonFavoritesOnly() {
} else if (tab == StyleEditorTab::Raster) {
if (m_rasterPages[0]->getSelection().size() >= 0) return false;
pages = &m_rasterPages;
}
} else
return false;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin() + 1; it != pages->end(); it++) {
@ -5390,6 +5387,8 @@ void StyleEditor::onHideMenu() {
//-----------------------------------------------------------------------------
void StyleEditor::onPageChanged(int index) {
bool updateFavorites = true;
m_styleSetsButton->setDisabled(false);
switch (index) {
case StyleEditorTab::Texture: // Texture
@ -5403,10 +5402,11 @@ void StyleEditor::onPageChanged(int index) {
break;
default:
m_styleSetsButton->setDisabled(true);
updateFavorites = false;
break;
}
if (index < StyleEditorTab::Raster || index > StyleEditorTab::Texture) return;
if (!updateFavorites) return;
onUpdateFavorites();
update();
@ -6180,9 +6180,7 @@ void StyleEditor::onExpandAllRasterSet() {
void StyleEditor::setUpdated(TFilePath setPath) {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture ||
setPath.isEmpty())
return;
if (setPath.isEmpty()) return;
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture)
@ -6191,6 +6189,8 @@ void StyleEditor::setUpdated(TFilePath setPath) {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin(); it != pages->end(); it++) {
@ -6206,7 +6206,6 @@ void StyleEditor::setUpdated(TFilePath setPath) {
void StyleEditor::onUpdateFavorites() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
int chipSize;
QPushButton *button;
@ -6233,7 +6232,8 @@ void StyleEditor::onUpdateFavorites() {
label = m_rasterLabels[0];
page = m_rasterPages[0];
menu = m_rasterMenu;
}
} else
return;
if (chipSize >= minChipCount || page->isLoading()) {
button->setDisabled(false);
@ -6262,7 +6262,6 @@ void StyleEditor::onUpdateFavorites() {
void StyleEditor::onRemoveSelectedStylesFromFavorites() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
StyleChooserPage *page;
if (tab == StyleEditorTab::Texture)
@ -6271,6 +6270,8 @@ void StyleEditor::onRemoveSelectedStylesFromFavorites() {
page = m_vectorPages[0];
else if (tab == StyleEditorTab::Raster)
page = m_rasterPages[0];
else
return;
page->removeSelectedStylesFromSet(page->getSelection());
clearSelection();
@ -6281,7 +6282,6 @@ void StyleEditor::onRemoveSelectedStylesFromFavorites() {
void StyleEditor::onAddSelectedStylesToFavorites() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
std::vector<StyleChooserPage *> *pages;
TFilePath setPath;
@ -6294,7 +6294,8 @@ void StyleEditor::onAddSelectedStylesToFavorites() {
} else if (tab == StyleEditorTab::Raster) {
pages = &m_rasterPages;
setPath = m_rasterPages[0]->getStylesFolder();
}
} else
return;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin() + 1; it != pages->end(); it++) {
@ -6310,7 +6311,6 @@ void StyleEditor::onAddSelectedStylesToFavorites() {
void StyleEditor::onAddSelectedStylesToPalette() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture)
@ -6319,6 +6319,8 @@ void StyleEditor::onAddSelectedStylesToPalette() {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin(); it != pages->end(); it++) {
@ -6333,7 +6335,6 @@ void StyleEditor::onAddSelectedStylesToPalette() {
void StyleEditor::onCopySelectedStylesToSet() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
QAction *action = dynamic_cast<QAction *>(sender());
QString setName = action->data().toString();
@ -6345,6 +6346,8 @@ void StyleEditor::onCopySelectedStylesToSet() {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return;
StyleChooserPage *dstPage = 0;
std::vector<StyleChooserPage *>::iterator it;
@ -6371,7 +6374,6 @@ void StyleEditor::onCopySelectedStylesToSet() {
void StyleEditor::onMoveSelectedStylesToSet() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
QAction *action = dynamic_cast<QAction *>(sender());
QString setName = action->data().toString();
@ -6383,6 +6385,8 @@ void StyleEditor::onMoveSelectedStylesToSet() {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return;
StyleChooserPage *dstPage = 0;
std::vector<StyleChooserPage *>::iterator it;
@ -6410,7 +6414,6 @@ void StyleEditor::onMoveSelectedStylesToSet() {
void StyleEditor::onRemoveSelectedStyleFromSet() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
if (!isSelectingFavoritesOnly()) {
int ret = DVGui::MsgBox(
@ -6428,6 +6431,8 @@ void StyleEditor::onRemoveSelectedStyleFromSet() {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return;
std::vector<StyleChooserPage *>::iterator it;
for (it = pages->begin(); it != pages->end(); it++) {
@ -6442,8 +6447,6 @@ void StyleEditor::onRemoveSelectedStyleFromSet() {
TFilePath StyleEditor::getSetStyleFolder(QString setName) {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture)
return TFilePath();
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture)
@ -6452,6 +6455,8 @@ TFilePath StyleEditor::getSetStyleFolder(QString setName) {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return TFilePath();
StyleChooserPage *dstPage = 0;
std::vector<StyleChooserPage *>::iterator it;
@ -6466,9 +6471,6 @@ TFilePath StyleEditor::getSetStyleFolder(QString setName) {
//-----------------------------------------------------------------------------
void StyleEditor::updatePage(int pageIndex) {
if (pageIndex < StyleEditorTab::Raster || pageIndex > StyleEditorTab::Texture)
return;
TFilePathSet fps;
std::vector<StyleChooserPage *> *pages;
if (pageIndex == StyleEditorTab::Texture) {
@ -6480,7 +6482,8 @@ void StyleEditor::updatePage(int pageIndex) {
} else if (pageIndex == StyleEditorTab::Raster) {
fps = TStyleManager::instance()->getBrushStyleFolders();
pages = &m_rasterPages;
}
} else
return;
// Remove pages that were deleted
std::vector<StyleChooserPage *>::reverse_iterator rit;
@ -6522,7 +6525,6 @@ void StyleEditor::updatePage(int pageIndex) {
void StyleEditor::onAddNewStyleSet() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
StylePageType pageType;
@ -6532,6 +6534,8 @@ void StyleEditor::onAddNewStyleSet() {
pageType = StylePageType::VectorCustom;
else if (tab == StyleEditorTab::Raster)
pageType = StylePageType::Raster;
else
return;
NewStyleSetPopup *popup = new NewStyleSetPopup(pageType, this);
popup->exec();
@ -6541,7 +6545,6 @@ void StyleEditor::onAddNewStyleSet() {
void StyleEditor::onScanStyleSetChanges() {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
TFilePath libPath = ToonzFolder::getLibraryFolder();
TFilePath favoritesLibPath =
@ -6572,7 +6575,8 @@ void StyleEditor::onScanStyleSetChanges() {
TFilePathSet dirs = TMyPaintBrushStyle::getBrushesDirs();
if (!dirs.empty()) fps.merge(dirs);
}
} else
return;
QString filters = getStylePageFilter(pageType);
@ -6695,7 +6699,6 @@ void StyleEditor::createNewStyleSet(StylePageType pageType, TFilePath pagePath,
void StyleEditor::removeStyleSet(StyleChooserPage *styleSetPage) {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
std::vector<StyleChooserPage *> *pages;
if (tab == StyleEditorTab::Texture)
@ -6704,6 +6707,8 @@ void StyleEditor::removeStyleSet(StyleChooserPage *styleSetPage) {
pages = &m_vectorPages;
else if (tab == StyleEditorTab::Raster)
pages = &m_rasterPages;
else
return;
int i = 1;
std::vector<StyleChooserPage *>::iterator it;
@ -6722,9 +6727,6 @@ void StyleEditor::removeStyleSet(StyleChooserPage *styleSetPage) {
//-----------------------------------------------------------------------------
void StyleEditor::removeStyleSetAtIndex(int index, int pageIndex) {
if (pageIndex < StyleEditorTab::Raster || pageIndex > StyleEditorTab::Texture)
return;
std::vector<StyleChooserPage *> *pages;
std::vector<ClickableLabel *> *labels;
std::vector<QPushButton *> *buttons;
@ -6749,7 +6751,8 @@ void StyleEditor::removeStyleSetAtIndex(int index, int pageIndex) {
buttons = &m_rasterButtons;
menu = m_rasterMenu;
outsideArea = m_rasterOutsideArea;
}
} else
return;
if (index >= pages->size()) return;
@ -6778,7 +6781,6 @@ void StyleEditor::removeStyleSetAtIndex(int index, int pageIndex) {
void StyleEditor::editStyleSetName(StyleChooserPage *styleSetPage) {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
std::vector<ClickableLabel *> *labels;
QScrollArea *scrollArea;
@ -6791,7 +6793,8 @@ void StyleEditor::editStyleSetName(StyleChooserPage *styleSetPage) {
} else if (tab == StyleEditorTab::Raster) {
labels = &m_rasterLabels;
scrollArea = m_rasterArea;
}
} else
return;
std::vector<ClickableLabel *>::iterator it;
ClickableLabel *label;
@ -6819,7 +6822,6 @@ void StyleEditor::editStyleSetName(StyleChooserPage *styleSetPage) {
void StyleEditor::renameStyleSet(StyleChooserPage *styleSetPage,
QString newName) {
int tab = m_styleBar->currentIndex();
if (tab < StyleEditorTab::Raster || tab > StyleEditorTab::Texture) return;
std::vector<ClickableLabel *> *labels;
QMenu *menu;
@ -6832,7 +6834,8 @@ void StyleEditor::renameStyleSet(StyleChooserPage *styleSetPage,
} else if (tab == StyleEditorTab::Raster) {
labels = &m_rasterLabels;
menu = m_rasterMenu;
}
} else
return;
std::vector<ClickableLabel *>::iterator it;
ClickableLabel *label;