Differential D9465 Diff 24245 libs/ui/widgets/kis_paintop_presets_popup.cpp

Changeset View

Standalone View

View Options

libs/ui/widgets/kis_paintop_presets_popup.cpp

Context not available.
76 76​
77 bool detached; 77​ bool detached;
78 bool ignoreHideEvents; 78​ bool ignoreHideEvents;
79​ bool isCreatingBrushFromScratch = false;
79 QSize minimumSettingsWidgetSize; 80​ QSize minimumSettingsWidgetSize;
80 QRect detachedGeometry; 81​ QRect detachedGeometry;
81 82​
Context not available.
126 m_d->uiWdgPaintOpPresetSettings.renameBrushPresetButton->setToolTip(i18n("Rename the brush preset")); 127​ m_d->uiWdgPaintOpPresetSettings.renameBrushPresetButton->setToolTip(i18n("Rename the brush preset"));
127 128​
128 129​
130​ // creating a new preset from scratch. Part of the brush presets area
131​ // the menu options will get filled up later when we are generating all available paintops
132​ // in the filter drop-down
133​ newPresetBrushEnginesMenu = new QMenu();
134​
129 // overwrite existing preset and saving a new preset use the same dialog 135​ // overwrite existing preset and saving a new preset use the same dialog
130 saveDialog = savePresetWidget; 136​ saveDialog = savePresetWidget;
131 saveDialog->scratchPadSetup(resourceProvider); 137​ saveDialog->scratchPadSetup(resourceProvider);
Context not available.
180 m_d->uiWdgPaintOpPresetSettings.presetChangeViewToolButton->setPopupMode(QToolButton::InstantPopup); 186​ m_d->uiWdgPaintOpPresetSettings.presetChangeViewToolButton->setPopupMode(QToolButton::InstantPopup);
181 187​
182 188​
189​ // loading preset from scratch option
190​ m_d->uiWdgPaintOpPresetSettings.newPresetEngineButton->setIcon(KisIconUtils::loadIcon("addlayer"));
191​ m_d->uiWdgPaintOpPresetSettings.bnBlacklistPreset->setIcon(KisIconUtils::loadIcon("deletelayer"));
192​
183 // show/hide buttons 193​ // show/hide buttons
184 194​
185 KisConfig cfg; 195​ KisConfig cfg;
Context not available.
254 connect(m_d->uiWdgPaintOpPresetSettings.reloadPresetButton, SIGNAL(clicked()), 264​ connect(m_d->uiWdgPaintOpPresetSettings.reloadPresetButton, SIGNAL(clicked()),
255 this, SIGNAL(reloadPresetClicked())); 265​ this, SIGNAL(reloadPresetClicked()));
256 266​
257 connect(m_d->uiWdgPaintOpPresetSettings.bnDefaultPreset, SIGNAL(clicked()), ​
258 this, SIGNAL(defaultPresetClicked())); ​
259 ​
260 connect(m_d->uiWdgPaintOpPresetSettings.dirtyPresetCheckBox, SIGNAL(toggled(bool)), 267​ connect(m_d->uiWdgPaintOpPresetSettings.dirtyPresetCheckBox, SIGNAL(toggled(bool)),
261 this, SIGNAL(dirtyPresetToggled(bool))); 268​ this, SIGNAL(dirtyPresetToggled(bool)));
262 269​
Context not available.
269 276​
270 // preset widget connections 277​ // preset widget connections
271 connect(m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SIGNAL(resourceSelected(KoResource*)), 278​ connect(m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SIGNAL(resourceSelected(KoResource*)),
272 this, SIGNAL(signalResourceSelected(KoResource*))); 279​ this, SIGNAL(signalResourceSelected(KoResource*)));
273 280​
274 connect(m_d->uiWdgPaintOpPresetSettings.reloadPresetButton, SIGNAL(clicked()), 281​ connect(m_d->uiWdgPaintOpPresetSettings.reloadPresetButton, SIGNAL(clicked()),
275 m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SLOT(updateViewSettings())); 282​ m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser, SLOT(updateViewSettings()));
Context not available.
304 311​
305 connect(m_d->uiWdgPaintOpPresetSettings.brushEgineComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdatePaintOpFilter())); 312​ connect(m_d->uiWdgPaintOpPresetSettings.brushEgineComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdatePaintOpFilter()));
306 313​
314​
315​ connect(m_d->uiWdgPaintOpPresetSettings.bnBlacklistPreset, SIGNAL(clicked()), this, SLOT(slotBlackListCurrentPreset()));
316​
317​
307 // setup things like the scene construct images, layers, etc that is a one-time thing 318​ // setup things like the scene construct images, layers, etc that is a one-time thing
308 m_d->uiWdgPaintOpPresetSettings.liveBrushPreviewView->setup(); 319​ m_d->uiWdgPaintOpPresetSettings.liveBrushPreviewView->setup();
309 320​
310} 321​}
311 322​
323​void KisPaintOpPresetsPopup::slotBlackListCurrentPreset()
324​{
325​ KisPaintOpPresetResourceServer * rServer = KisResourceServerProvider::instance()->paintOpPresetServer();
326​ KisPaintOpPresetSP curPreset = m_d->resourceProvider->currentPreset();
327​
328​ if (rServer->resourceByName(curPreset->name())) {
329​ rServer->removeResourceAndBlacklist(curPreset);
330​ }
331​}
332​
312 333​
313void KisPaintOpPresetsPopup::slotRenameBrushActivated() 334​void KisPaintOpPresetsPopup::slotRenameBrushActivated()
314{ 335​{
Context not available.
341 // what happens if you try to change presets. maybe we should auto-hide (or disable) 362​ // what happens if you try to change presets. maybe we should auto-hide (or disable)
342 // the presets area in this case 363​ // the presets area in this case
343 if (m_d->uiWdgPaintOpPresetSettings.presetWidget->isVisible()) { 364​ if (m_d->uiWdgPaintOpPresetSettings.presetWidget->isVisible()) {
344 m_d->uiWdgPaintOpPresetSettings.bnDefaultPreset->setVisible(!isRenaming); 365​ m_d->uiWdgPaintOpPresetSettings.newPresetEngineButton->setVisible(!isRenaming);
366​ m_d->uiWdgPaintOpPresetSettings.bnBlacklistPreset->setVisible(!isRenaming);
345 } 367​ }
346 368​
347 ​
348} 369​}
349 370​
350void KisPaintOpPresetsPopup::slotSaveRenameCurrentBrush() 371​void KisPaintOpPresetsPopup::slotSaveRenameCurrentBrush()
Context not available.
396 slotUpdatePresetSettings(); // update visibility of dirty preset and icon 417​ slotUpdatePresetSettings(); // update visibility of dirty preset and icon
397} 418​}
398 419​
399 ​
400void KisPaintOpPresetsPopup::slotResourceChanged(int key, const QVariant &value) 420​void KisPaintOpPresetsPopup::slotResourceChanged(int key, const QVariant &value)
401{ 421​{
402 if (key == KisCanvasResourceProvider::LodAvailability) { 422​ if (key == KisCanvasResourceProvider::LodAvailability) {
Context not available.
418 m_d->settingsWidget = 0; 438​ m_d->settingsWidget = 0;
419 } 439​ }
420 delete m_d; 440​ delete m_d;
441​ delete newPresetBrushEnginesMenu;
421} 442​}
422 443​
423void KisPaintOpPresetsPopup::setPaintOpSettingsWidget(QWidget * widget) 444​void KisPaintOpPresetsPopup::setPaintOpSettingsWidget(QWidget * widget)
Context not available.
515 } 536​ }
516} 537​}
517 538​
539​void KisPaintOpPresetsPopup::setCreatingBrushFromScratch(bool enabled)
540​{
541​ m_d->isCreatingBrushFromScratch = enabled;
542​}
543​
544​
518void KisPaintOpPresetsPopup::resourceSelected(KoResource* resource) 545​void KisPaintOpPresetsPopup::resourceSelected(KoResource* resource)
519{ 546​{
520 // this gets called every time the brush editor window is opened 547​ // this gets called every time the brush editor window is opened
Context not available.
587 // add an "All" option at the front to show all presets 614​ // add an "All" option at the front to show all presets
588 QPixmap emptyPixmap = QPixmap(22,22); 615​ QPixmap emptyPixmap = QPixmap(22,22);
589 emptyPixmap.fill(palette().color(QPalette::Background)); 616​ emptyPixmap.fill(palette().color(QPalette::Background));
590 sortedBrushEnginesList.push_front(KisPaintOpInfo(QString("all_options"), i18n("All"), QString(""), emptyPixmap, 0 )); 617​
618​ // if we create a new brush from scratch, we need a full list of paintops to choose from
619​ // we don't want "All", so populate the list before that is added
620​ newPresetBrushEnginesMenu->actions().clear(); // clean out list in case we run this again
621​ newBrushEngineOptions.clear();
622​
623​ for (int j = 0; j < sortedBrushEnginesList.length(); j++) {
624​ KisAction * newEngineAction = static_cast<KisAction*>( newPresetBrushEnginesMenu->addAction(sortedBrushEnginesList[j].name));
625​ newEngineAction->setObjectName(sortedBrushEnginesList[j].id); // we need the ID for changing the paintop when action triggered
626​
627​ newBrushEngineOptions.append(newEngineAction);
628​ connect(newEngineAction, SIGNAL(triggered()), this, SLOT(slotCreateNewBrushPresetEngine()));
629​ }
630​ m_d->uiWdgPaintOpPresetSettings.newPresetEngineButton->setMenu(newPresetBrushEnginesMenu);
woltheravUnsubmitted
Not Done

Could you also add a line here or so to have the newPresetEngineButton's pop-up mode be instant?

It'd be QToolButton::InstantPopup on http://doc.qt.io/qt-5/qtoolbutton.html#popupMode-prop

woltherav: Could you also add a line here or so to have the newPresetEngineButton's pop-up mode be instant?
631​
591 632​
592 // fill the list into the brush combo box 633​ // fill the list into the brush combo box
634​ sortedBrushEnginesList.push_front(KisPaintOpInfo(QString("all_options"), i18n("All"), QString(""), emptyPixmap, 0 ));
593 for (int m = 0; m < sortedBrushEnginesList.length(); m++) { 635​ for (int m = 0; m < sortedBrushEnginesList.length(); m++) {
594 m_d->uiWdgPaintOpPresetSettings.brushEgineComboBox->addItem(sortedBrushEnginesList[m].icon, sortedBrushEnginesList[m].name, QVariant(sortedBrushEnginesList[m].id)); 636​ m_d->uiWdgPaintOpPresetSettings.brushEgineComboBox->addItem(sortedBrushEnginesList[m].icon, sortedBrushEnginesList[m].name, QVariant(sortedBrushEnginesList[m].id));
595 } 637​ }
Context not available.
679 m_d->uiWdgPaintOpPresetSettings.presetChangeViewToolButton->setVisible(visible); 721​ m_d->uiWdgPaintOpPresetSettings.presetChangeViewToolButton->setVisible(visible);
680 m_d->uiWdgPaintOpPresetSettings.brushEgineComboBox->setVisible(visible); 722​ m_d->uiWdgPaintOpPresetSettings.brushEgineComboBox->setVisible(visible);
681 m_d->uiWdgPaintOpPresetSettings.engineFilterLabel->setVisible(visible); 723​ m_d->uiWdgPaintOpPresetSettings.engineFilterLabel->setVisible(visible);
682 m_d->uiWdgPaintOpPresetSettings.bnDefaultPreset->setVisible(visible); ​
683 m_d->uiWdgPaintOpPresetSettings.presetsSidebarLabel->setVisible(visible); 724​ m_d->uiWdgPaintOpPresetSettings.presetsSidebarLabel->setVisible(visible);
725​ m_d->uiWdgPaintOpPresetSettings.newPresetEngineButton->setVisible(visible);
726​ m_d->uiWdgPaintOpPresetSettings.bnBlacklistPreset->setVisible(visible);
684 727​
685 728​
686 // we only want a spacer to work when the toggle icon is present. Otherwise the list of presets will shrink 729​ // we only want a spacer to work when the toggle icon is present. Otherwise the list of presets will shrink
Context not available.
725 saveDialog->showDialog(); 768​ saveDialog->showDialog();
726} 769​}
727 770​
771​void KisPaintOpPresetsPopup::slotCreateNewBrushPresetEngine()
772​{
773​ KisAction *actionThatWasSent = static_cast<KisAction*>(sender());// sender() gets what menu item was called
774​ emit createPresetFromScratch(actionThatWasSent->objectName());
775​
776​ actionThatWasSent->deleteLater();
777​}
778​
728void KisPaintOpPresetsPopup::updateViewSettings() 779​void KisPaintOpPresetsPopup::updateViewSettings()
729{ 780​{
730 m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser->updateViewSettings(); 781​ m_d->uiWdgPaintOpPresetSettings.presetWidget->smallPresetChooser->updateViewSettings();
Context not available.
746 m_d->uiWdgPaintOpPresetSettings.fillSolid->setIcon(KisIconUtils::loadIcon("krita_tool_color_fill")); 797​ m_d->uiWdgPaintOpPresetSettings.fillSolid->setIcon(KisIconUtils::loadIcon("krita_tool_color_fill"));
747 m_d->uiWdgPaintOpPresetSettings.eraseScratchPad->setIcon(KisIconUtils::loadIcon("edit-delete")); 798​ m_d->uiWdgPaintOpPresetSettings.eraseScratchPad->setIcon(KisIconUtils::loadIcon("edit-delete"));
748 m_d->uiWdgPaintOpPresetSettings.presetChangeViewToolButton->setIcon(KisIconUtils::loadIcon("view-choose")); 799​ m_d->uiWdgPaintOpPresetSettings.presetChangeViewToolButton->setIcon(KisIconUtils::loadIcon("view-choose"));
800​ m_d->uiWdgPaintOpPresetSettings.newPresetEngineButton->setIcon(KisIconUtils::loadIcon("addlayer"));
801​ m_d->uiWdgPaintOpPresetSettings.bnBlacklistPreset->setIcon(KisIconUtils::loadIcon("deletelayer"));
749} 802​}
750 803​
751void KisPaintOpPresetsPopup::slotUpdatePresetSettings() 804​void KisPaintOpPresetsPopup::slotUpdatePresetSettings()
Context not available.
757 return; 810​ return;
758 } 811​ }
759 812​
760 bool isPresetDirty = m_d->resourceProvider->currentPreset()->isPresetDirty(); 813​ // hide options on UI if we are creating a brush preset from scratch to prevent confusion
761 814​ if (m_d->isCreatingBrushFromScratch) {
762 // don't need to reload or overwrite a clean preset 815​ m_d->uiWdgPaintOpPresetSettings.dirtyPresetIndicatorButton->setVisible(false);
763 m_d->uiWdgPaintOpPresetSettings.dirtyPresetIndicatorButton->setVisible(isPresetDirty); 816​ m_d->uiWdgPaintOpPresetSettings.reloadPresetButton->setVisible(false);
764 m_d->uiWdgPaintOpPresetSettings.reloadPresetButton->setVisible(isPresetDirty); 817​ m_d->uiWdgPaintOpPresetSettings.saveBrushPresetButton->setVisible(false);
765 m_d->uiWdgPaintOpPresetSettings.saveBrushPresetButton->setEnabled(isPresetDirty); 818​ m_d->uiWdgPaintOpPresetSettings.renameBrushPresetButton->setVisible(false);
819​ } else {
820​ bool isPresetDirty = m_d->resourceProvider->currentPreset()->isPresetDirty();
766 821​
822​ // don't need to reload or overwrite a clean preset
823​ m_d->uiWdgPaintOpPresetSettings.dirtyPresetIndicatorButton->setVisible(isPresetDirty);
824​ m_d->uiWdgPaintOpPresetSettings.reloadPresetButton->setVisible(isPresetDirty);
825​ m_d->uiWdgPaintOpPresetSettings.saveBrushPresetButton->setEnabled(isPresetDirty);
826​ m_d->uiWdgPaintOpPresetSettings.renameBrushPresetButton->setVisible(true);
827​ }
767 828​
768 // update live preview area in here... 829​ // update live preview area in here...
769 // don't update the live preview if the widget is not visible. 830​ // don't update the live preview if the widget is not visible.
Context not available.