Author: jghali
Date: Sun May  1 13:46:01 2016
New Revision: 21266

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21266
Log:
#14006: "Lock Guides" checkbox status is not correctly set when switching 
documents

Modified:
    branches/Version14x/Scribus/scribus/guidemanager.cpp

Modified: branches/Version14x/Scribus/scribus/guidemanager.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21266&path=/branches/Version14x/Scribus/scribus/guidemanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/guidemanager.cpp        (original)
+++ branches/Version14x/Scribus/scribus/guidemanager.cpp        Sun May  1 
13:46:01 2016
@@ -143,6 +143,8 @@
                        this, SLOT(horizontalAutoGapCheck_stateChanged(int)));
        disconnect(verticalAutoGapCheck, SIGNAL(stateChanged(int)),
                        this, SLOT(verticalAutoGapCheck_stateChanged(int)));
+       disconnect(lockCheck, SIGNAL(stateChanged(int)), 
+                       this, SLOT(lockCheck_stateChanged(int)));
 
        // restore values from new page
        clearRestoreHorizontalList();
@@ -177,10 +179,15 @@
        // allow the selection radio button?
        verticalSelectionAutoButton->setEnabled(!m_Doc->m_Selection->isEmpty());
 
+       // restore guide locking
+       lockCheck->setChecked(m_Doc->GuideLock);
+
        connect(horizontalAutoGapCheck, SIGNAL(stateChanged(int)),
                        this, SLOT(horizontalAutoGapCheck_stateChanged(int)));
        connect(verticalAutoGapCheck, SIGNAL(stateChanged(int)),
                        this, SLOT(verticalAutoGapCheck_stateChanged(int)));
+       connect(lockCheck, SIGNAL(stateChanged(int)), 
+                       this, SLOT(lockCheck_stateChanged(int)));
 
        m_drawGuides = true;
 //     drawGuides(); let Canvas::DrawPageMarks take care of it and avoid a 
costly ScribusView::DrawNew()


_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit

Reply via email to