diff --git a/plugins/dockers/griddocker/grid_config_widget.h b/plugins/dockers/griddocker/grid_config_widget.h --- a/plugins/dockers/griddocker/grid_config_widget.h +++ b/plugins/dockers/griddocker/grid_config_widget.h @@ -44,6 +44,8 @@ void setGridDivision(int w, int h); + Ui::GridConfigWidget* r(); + private Q_SLOTS: void slotGridGuiChanged(); void slotGuidesGuiChanged(); diff --git a/plugins/dockers/griddocker/grid_config_widget.cpp b/plugins/dockers/griddocker/grid_config_widget.cpp --- a/plugins/dockers/griddocker/grid_config_widget.cpp +++ b/plugins/dockers/griddocker/grid_config_widget.cpp @@ -322,6 +322,10 @@ slotGridGuiChanged(); } +Ui::GridConfigWidget* GridConfigWidget::r() +{ + return ui; +} diff --git a/plugins/dockers/griddocker/grid_config_widget.ui b/plugins/dockers/griddocker/grid_config_widget.ui --- a/plugins/dockers/griddocker/grid_config_widget.ui +++ b/plugins/dockers/griddocker/grid_config_widget.ui @@ -32,7 +32,7 @@ - 0 + 1 @@ -589,6 +589,13 @@ + + + + Show rulers + + + diff --git a/plugins/dockers/griddocker/griddocker_dock.h b/plugins/dockers/griddocker/griddocker_dock.h --- a/plugins/dockers/griddocker/griddocker_dock.h +++ b/plugins/dockers/griddocker/griddocker_dock.h @@ -29,6 +29,10 @@ class KisGridConfig; class KisGuidesConfig; +namespace Ui { +class GridConfigWidget; +} + class GridDockerDock : public QDockWidget, public KoCanvasObserverBase { Q_OBJECT public: @@ -37,6 +41,7 @@ QString observerName() { return "GridDockerDock"; } virtual void setCanvas(KoCanvasBase *canvas); virtual void unsetCanvas(); + Ui::GridConfigWidget *ui; public Q_SLOTS: void slotGuiGridConfigChanged(); diff --git a/plugins/dockers/griddocker/griddocker_dock.cpp b/plugins/dockers/griddocker/griddocker_dock.cpp --- a/plugins/dockers/griddocker/griddocker_dock.cpp +++ b/plugins/dockers/griddocker/griddocker_dock.cpp @@ -34,6 +34,8 @@ #include "kis_grid_config.h" #include "kis_guides_manager.h" #include "kis_guides_config.h" +#include "kis_action.h" +#include "ui_grid_config_widget.h" GridDockerDock::GridDockerDock( ) @@ -72,6 +74,13 @@ this, SLOT(slotGridConfigUpdateRequested(const KisGridConfig&))); + KisAction* action = m_canvas->viewManager()->actionManager()->actionByName("view_ruler"); + ui = m_configWidget->r(); + m_canvasConnections.addConnection(ui->chkShowRulers,SIGNAL(toggled(bool)), action , SIGNAL(toggled(bool))); + m_canvasConnections.addConnection(ui->chkShowRulers,SIGNAL(toggled(bool)), action , SLOT(setChecked(bool))); + m_canvasConnections.addConnection(action,SIGNAL(toggled(bool)),ui->chkShowRulers,SLOT(setChecked(bool))); + + m_canvasConnections.addConnection( m_canvas->viewManager()->guidesManager(), SIGNAL(sigRequestUpdateGuidesConfig(const KisGuidesConfig&)),