Differential D498 Diff 1177 krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp
Changeset View
Changeset View
Standalone View
Standalone View
krita/plugins/extensions/dockers/advancedcolorselector/kis_color_selector_ng_docker_widget.cpp
| Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s) | 54 | { | |||
|---|---|---|---|---|---|
| 90 | connect(this, SIGNAL(settingsChanged()), m_colorSelectorContainer, SIGNAL(settingsChanged()), Qt::UniqueConnection); | 90 | connect(this, SIGNAL(settingsChanged()), m_colorSelectorContainer, SIGNAL(settingsChanged()), Qt::UniqueConnection); | ||
| 91 | connect(this, SIGNAL(settingsChanged()), this, SLOT(update()), Qt::UniqueConnection); | 91 | connect(this, SIGNAL(settingsChanged()), this, SLOT(update()), Qt::UniqueConnection); | ||
| 92 | 92 | | |||
| 93 | 93 | | |||
| 94 | emit settingsChanged(); | 94 | emit settingsChanged(); | ||
| 95 | 95 | | |||
| 96 | m_colorHistoryAction = new QAction("Show color history", this); | 96 | m_colorHistoryAction = new QAction("Show color history", this); | ||
| 97 | m_colorHistoryAction->setShortcut(QKeySequence(tr("H"))); | 97 | m_colorHistoryAction->setShortcut(QKeySequence(tr("H"))); | ||
| 98 | // m_colorHistoryAction = KisActionRegistry::instance()->makeQAction("show_color_history", this, "Color Selector"); | 98 | // m_colorHistoryAction = KisActionRegistry::instance()->makeQAction("show_color_history", this); | ||
| 99 | connect(m_colorHistoryAction, SIGNAL(triggered()), m_colorHistoryWidget, SLOT(showPopup()), Qt::UniqueConnection); | 99 | connect(m_colorHistoryAction, SIGNAL(triggered()), m_colorHistoryWidget, SLOT(showPopup()), Qt::UniqueConnection); | ||
| 100 | 100 | | |||
| 101 | 101 | | |||
| 102 | m_commonColorsAction = new QAction("Show common colors", this); | 102 | m_commonColorsAction = new QAction("Show common colors", this); | ||
| 103 | m_commonColorsAction->setShortcut(QKeySequence(tr("U"))); | 103 | m_commonColorsAction->setShortcut(QKeySequence(tr("U"))); | ||
| 104 | // m_colorHistoryAction = KisActionRegistry::instance()->makeQAction("show_common_colors", this, "Color Selector"); | 104 | // m_colorHistoryAction = KisActionRegistry::instance()->makeQAction("show_common_colors", this); | ||
| 105 | connect(m_commonColorsAction, SIGNAL(triggered()), m_commonColorsWidget, SLOT(showPopup()), Qt::UniqueConnection); | 105 | connect(m_commonColorsAction, SIGNAL(triggered()), m_commonColorsWidget, SLOT(showPopup()), Qt::UniqueConnection); | ||
| 106 | 106 | | |||
| 107 | } | 107 | } | ||
| 108 | 108 | | |||
| 109 | void KisColorSelectorNgDockerWidget::unsetCanvas() | 109 | void KisColorSelectorNgDockerWidget::unsetCanvas() | ||
| 110 | { | 110 | { | ||
| 111 | m_canvas = 0; | 111 | m_canvas = 0; | ||
| 112 | m_commonColorsWidget->unsetCanvas(); | 112 | m_commonColorsWidget->unsetCanvas(); | ||
| ▲ Show 20 Lines • Show All 112 Lines • Show Last 20 Lines | |||||