r19506 by craig - Fix actions pointer when using OSG

[scribus-commit]

Author: craig
Date: Sun Sep 14 07:18:37 2014
New Revision: 19506

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19506
Log:
Fix actions pointer when using OSG

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=19506&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Sun Sep 14 07:18:37 2014
@@ -492,7 +492,7 @@
        (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(b2);
        (*a_scrActions)["toolsPDFAnnotLink"]->setEnabled(b2);
 #ifdef HAVE_OSG
-       (*scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
+       (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
        (*a_scrActions)["itemDelete"]->setEnabled(b2);
 }
@@ -537,7 +537,7 @@
        (*a_scrActions)["toolsPDFListBox"]->setEnabled(b2);
        (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(b2);
 #ifdef HAVE_OSG
-       (*scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
+       (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
 }
 
@@ -582,7 +582,7 @@
        (*a_scrActions)["toolsPDFListBox"]->setEnabled(b2);
        (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(b2);
 #ifdef HAVE_OSG
-       (*scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
+       (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
 }
 
@@ -627,9 +627,9 @@
        (*a_scrActions)["toolsPDFListBox"]->setEnabled(b2);
        (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(b2);
 #ifdef HAVE_OSG
-       (*scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
+       (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(b2);
 #endif
-       //(*scrActions)["viewPreviewMode"]->setEnabled(b2);
+       //(*a_scrActions)["viewPreviewMode"]->setEnabled(b2);
 }
 
 void AppModeHelper::changeLayer(ScribusDoc *doc, bool clipScrapHaveData)
@@ -740,7 +740,7 @@
        (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(true);
        (*a_scrActions)["toolsPDFAnnotLink"]->setEnabled(true);
 #ifdef HAVE_OSG
-       (*scrActions)["toolsPDFAnnot3D"]->setEnabled(true);
+       (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(true);
 #endif
        (*a_scrActions)["toolsPreflightVerifier"]->setEnabled(true);
        bool setter = doc->DocPages.count() > 1 ? true : false;
@@ -789,7 +789,7 @@
                (*a_scrActions)["toolsPDFListBox"]->setEnabled(false);
                (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(false);
 #ifdef HAVE_OSG
-               (*scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
+               (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
 #endif
        }
        else
@@ -826,7 +826,7 @@
                (*a_scrActions)["toolsPDFListBox"]->setEnabled(true);
                (*a_scrActions)["toolsPDFAnnotText"]->setEnabled(true);
 #ifdef HAVE_OSG
-               (*scrActions)["toolsPDFAnnot3D"]->setEnabled(true);
+               (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(true);
 #endif
        }
 
@@ -955,7 +955,7 @@
        (*a_scrActions)["viewSnapToGuides"]->setChecked(false);
 
 #ifdef HAVE_OSG
-       (*scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
+       (*a_scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
 #endif
        (*a_scrActions)["itemConvertToBezierCurve"]->setEnabled(false);
        (*a_scrActions)["itemConvertToImageFrame"]->setEnabled(false);


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit