summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-12-03 20:51:29 +0000
committerjabiertxof <jabier.arraiza@marker.es>2015-12-03 20:51:29 +0000
commit1cab611c173b2903512268994343f58ef83883ec (patch)
tree5413ada6c47986cf86a22c8dc1d9d639b6b86c5d /src/ui
parentAdded no highlight and cross icon on locked guides (diff)
downloadinkscape-1cab611c173b2903512268994343f58ef83883ec.tar.gz
inkscape-1cab611c173b2903512268994343f58ef83883ec.zip
Add global lock guides to the rulers
(bzr r14500.1.5)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/guides.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp
index 4951cf39c..faba71615 100644
--- a/src/ui/dialog/guides.cpp
+++ b/src/ui/dialog/guides.cpp
@@ -300,7 +300,11 @@ void GuidelinePropertiesDialog::_setup() {
_relative_toggle.signal_toggled().connect(sigc::mem_fun(*this, &GuidelinePropertiesDialog::_modeChanged));
_relative_toggle.set_active(_relative_toggle_status);
- std::cout << _guide->getLocked() << "_guide->getLocked()\n";
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool global_guides_lock = prefs->getBool("/options/guides/guides_lock", false);
+ if(global_guides_lock){
+ _locked_toggle.set_sensitive(false);
+ }
_locked_toggle.set_active(_guide->getLocked());
// don't know what this exactly does, but it results in that the dialog closes when entering a value and pressing enter (see LP bug 484187)