[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] krita/ui
From: Sven Langkamp <sven.langkamp () gmail ! com>
Date: 2011-01-21 21:03:30
Message-ID: 20110121210330.326F1A6092 () git ! kde ! org
[Download RAW message or body]
Git commit a169dc86f7304d3d2e2b43bf9a5879de29fbdbdf by Sven Langkamp
Pushed by langkamp into branch master
split paintop box into two widget, so that the workspace chooser isn't disabled on shape layers
M +8 -3 krita/ui/kis_paintop_box.cc
M +1 -0 krita/ui/kis_paintop_box.h
http://commits.kde.org/47e7010d/a169dc86f7304d3d2e2b43bf9a5879de29fbdbdf
diff --git a/krita/ui/kis_paintop_box.cc b/krita/ui/kis_paintop_box.cc
index d1220e0..a308dfb 100644
--- a/krita/ui/kis_paintop_box.cc
+++ b/krita/ui/kis_paintop_box.cc
@@ -152,7 +152,11 @@ KisPaintopBox::KisPaintopBox(KisView2 * view, QWidget *parent, const char * name
m_workspaceWidget->setFixedSize(32, 32);
m_workspaceWidget->setPopupWidget(new KisWorkspaceChooser(view));
- m_layout = new QHBoxLayout(this);
+ QHBoxLayout* baseLayout = new QHBoxLayout(this);
+ m_paintopWidget = new QWidget(this);
+ baseLayout->addWidget(m_paintopWidget);
+
+ m_layout = new QHBoxLayout(m_paintopWidget);
m_layout->addWidget(m_cmbPaintops);
m_layout->addWidget(m_settingsWidget);
m_layout->addWidget(m_presetWidget);
@@ -161,7 +165,8 @@ KisPaintopBox::KisPaintopBox(KisView2 * view, QWidget *parent, const char * name
m_layout->addWidget(m_eraseModeButton);
m_layout->addWidget(m_paletteButton);
m_layout->addSpacerItem(new QSpacerItem(10, 1, QSizePolicy::Expanding, QSizePolicy::Minimum));
- m_layout->addWidget(m_workspaceWidget);
+
+ baseLayout->addWidget(m_workspaceWidget);
m_presetsPopup = new KisPaintOpPresetsPopup(m_resourceProvider);
m_settingsWidget->setPopupWidget(m_presetsPopup);
@@ -571,7 +576,7 @@ void KisPaintopBox::setCompositeOpInternal(const QString& id)
void KisPaintopBox::setEnabledInternal(bool value)
{
- setEnabled(value);
+ m_paintopWidget->setEnabled(value);
if(value) {
m_settingsWidget->setIcon(KIcon("paintop_settings_02"));
m_presetWidget->setIcon(KIcon("paintop_settings_01"));
diff --git a/krita/ui/kis_paintop_box.h b/krita/ui/kis_paintop_box.h
index 5bc8f23..25ce8d6 100644
--- a/krita/ui/kis_paintop_box.h
+++ b/krita/ui/kis_paintop_box.h
@@ -124,6 +124,7 @@ private:
KisCmbPaintop* m_cmbPaintops;
QHBoxLayout* m_layout;
+ QWidget* m_paintopWidget;
KisPaintOpSettingsWidget* m_optionWidget;
KisPopupButton* m_settingsWidget;
KisPopupButton* m_presetWidget;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic