r16339@tres: ted | 2007-08-19 19:47:57 -0700

 Live preview toggling is working.  Pinning, not as much.  But getting
 there.

diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index b21d7a0f571eaf6e82d0b5718600403cea772331..adcd2a3d7fddf950a40af6b28743216283220a30 100644 (file)
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -36,6 +36,7 @@ ExecutionEnv::ExecutionEnv (Effect * effect, Inkscape::UI::View::View * doc, Gtk
     _humanWait(false),
     _canceled(false),
     _prefsChanged(false),
+    _livePreview(true),
     _doc(doc) {
 
     SPDesktop *desktop = (SPDesktop *)_doc;
@@ -204,7 +205,7 @@ void
 ExecutionEnv::run (void) {
     while (!_finished) {
         _canceled = false;
-        if (_humanWait) {
+        if (_humanWait || !_livePreview) {
             _mainloop->run();
         } else {
             _prefsChanged = false;
@@ -219,6 +220,18 @@ ExecutionEnv::run (void) {
     return;
 }
 
+void
+ExecutionEnv::livePreview (bool state) { 
+    _mainloop->quit();
+    if (_livePreview && !state) {
+        _canceled = true;
+    }
+    if (!_livePreview && state) {
+        _humanWait = false;
+    }
+    _livePreview = state;
+    return;
+}
 
 
 } }  /* namespace Inkscape, Extension */

diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h
index a20c0ba3df6a4e680b1d2c5afe2194950d9316b8..3c4b13198efc812411bfc8a271332ac97b07d951 100644 (file)
--- a/src/extension/execution-env.h
+++ b/src/extension/execution-env.h
@@ -31,6 +31,7 @@ private:
     bool _humanWait;
     bool _canceled;
     bool _prefsChanged;
+    bool _livePreview;
     Glib::RefPtr<Glib::MainLoop> _mainloop;
     Inkscape::UI::View::View * _doc;
     std::list<Glib::ustring> _selected;
@@ -43,6 +44,7 @@ public:
 
     void run (void);
     void preferencesChange (void);
+    void livePreview (bool state = true);
 
 private:
     void createPrefsDialog (Gtk::Widget * controls);

diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 66a04dc1def0fb7c9b4283aaaf7fff25254eefa6..eb6cbf6fa9a8844b5c65e6db20bae65b36894b29 100644 (file)
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -99,6 +99,7 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
         pinned_toggle();
         _signal_preview.connect(sigc::mem_fun(this, &PrefDialog::preview_toggle));
         _signal_pinned.connect(sigc::mem_fun(this, &PrefDialog::pinned_toggle));
+
     }
 
     GtkWidget *dlg = GTK_WIDGET(gobj());
@@ -152,9 +153,9 @@ PrefDialog::setPreviewState (Glib::ustring state) {
 void
 PrefDialog::preview_toggle (void) {
     if(_param_preview->get_bool(NULL, NULL) && !_param_pinned->get_bool(NULL, NULL)) {
-        //std::cout << "Live Preview" << std::endl;
+        _exEnv->livePreview(true);
     } else {
-        //std::cout << "No Preview" << std::endl;
+        _exEnv->livePreview(false);
     }
 }