Reorganized PDF import dialog, disabling unused options as appropriate.

(bzr r14170)

1 files changed, 10 insertions, 3 deletions

diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
index 866db5d82..6e36603c3 100644
--- a/src/extension/internal/pdfinput/pdf-input.h
+++ b/src/extension/internal/pdfinput/pdf-input.h
@@ -44,6 +44,7 @@ namespace Gtk {
 #else
   class HScale;
 #endif
+  class RadioButton;
   class VBox;
   class Label;
 }
@@ -71,7 +72,7 @@ public:
 
     bool showDialog();
     int getSelectedPage();
-    int getImportMethod();
+    bool getImportMethod();
     void getImportSettings(Inkscape::XML::Node *prefs);
 
 private:
@@ -86,7 +87,10 @@ private:
     void _onPageNumberChanged();
     void _onToggleCropping();
     void _onPrecisionChanged();
-
+#ifdef HAVE_POPPLER_CAIRO
+    void _onToggleImport();
+#endif
+    
     class Gtk::Button * cancelbutton;
     class Gtk::Button * okbutton;
     class Gtk::Label * _labelSelect;
@@ -101,7 +105,10 @@ private:
     class Gtk::Label * _labelPrecision;
     class Gtk::Label * _labelPrecisionWarning;
 #ifdef HAVE_POPPLER_CAIRO
-    class Gtk::CheckButton * _importviaPopplerCheck; // using poppler_cairo for importing
+    class Gtk::RadioButton * _importViaPoppler;  // Use poppler_cairo importing
+    class Gtk::Label * _labelViaPoppler;
+    class Gtk::RadioButton * _importViaInternal; // Use native (poppler based) importing
+    class Gtk::Label * _labelViaInternal;
 #endif
 #if WITH_GTKMM_3_0
     class Gtk::Scale * _fallbackPrecisionSlider;