added import/export preferences category

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 422d1c80405732176363ca50e305bf99efabe9ea..1453b37c74f1b82287ea1439d8a0f35aa612696f 100644 (file)
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -29,8 +29,10 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"FileImport\" />\n"
 "       <verb verb-id=\"FileExport\" />\n"
+#ifdef WITH_GNOME_VFS
 "       <verb verb-id=\"FileImportFromOCAL\" />\n"
 "       <verb verb-id=\"FileExportToOCAL\" />\n"
+#endif
 "       <separator/>\n"
 /* These are ugly, but what needs to happen here is allowing users
    to use the native PS support if they are using another print driver.

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 296abe45841394e536c05caecd22f2e69b6df994..744d4f5553bb7a320750fc53de7428b6ffad7be9 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -101,6 +101,7 @@ InkscapePreferences::InkscapePreferences()
     initPageTransforms();
     initPageFilters();
     initPageSelecting();
+    initPageImportExport();
     initPageMisc();
 
     //calculate the size request for this dialog
@@ -596,14 +597,29 @@ void InkscapePreferences::initPageSelecting()
 }
 
 
+void InkscapePreferences::initPageImportExport()
+{
+    _importexport_export.init("dialogs.export.defaultxdpi", "value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _page_importexport.add_line( false, _("Default export resolution:"), _importexport_export, _("dpi"),
+                            _("Default bitmap resolution (in dots per inch) in the Export dialog"), false);
+    _importexport_imp_bitmap.init( _("Import bitmap as <image>"), "options.importbitmapsasimages", "value", true);
+    _page_importexport.add_line( false, "", _importexport_imp_bitmap, "", 
+         _("When on, an imported bitmap creates an <image> element; otherwise it is a rectangle with bitmap fill"), true);
+    _importexport_ocal_url.init("options.ocalurl", "str", true, g_strdup_printf("openclipart.org"));
+    _page_importexport.add_line( false, _("Open Clip Art Library Server Name:"), _importexport_ocal_url, "", 
+        _("The server name of the Open Clip Art Library webdav server. It's used by the Import and Export to OCAL function."), true);
+    _importexport_ocal_username.init("options.ocalusername", "str", true);
+    _page_importexport.add_line( false, _("Open Clip Art Library Username:"), _importexport_ocal_username, "", 
+            _("The username used to log into Open Clip Art Library."), true);
+    _importexport_ocal_password.init("options.ocalpassword", "str", false);
+    _page_importexport.add_line( false, _("Open Clip Art Library Password:"), _importexport_ocal_password, "", 
+            _("The password used to log into Open Clip Art Library."), true);
+
+    this->AddPage(_page_importexport, _("Import/Export"), PREFS_PAGE_IMPORTEXPORT);
+}
+
 void InkscapePreferences::initPageMisc()
 {
-    _misc_export.init("dialogs.export.defaultxdpi", "value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
-    _page_misc.add_line( false, _("Default export resolution:"), _misc_export, _("dpi"), 
-                           _("Default bitmap resolution (in dots per inch) in the Export dialog"), false);
-    _misc_imp_bitmap.init( _("Import bitmap as <image>"), "options.importbitmapsasimages", "value", true);
-    _page_misc.add_line( false, "", _misc_imp_bitmap, "", 
-                           _("When on, an imported bitmap creates an <image> element; otherwise it is a rectangle with bitmap fill"), true);
     _misc_comment.init( _("Add label comments to printing output"), "printing.debug", "show-label-comments", false);
     _page_misc.add_line( false, "", _misc_comment, "", 
                            _("When on, a comment will be added to the raw print output, marking the rendered output for an object with its label"), true);
@@ -622,12 +638,6 @@ void InkscapePreferences::initPageMisc()
     _misc_overs_bitmap.set_size_request(_sb_width);
     _misc_overs_bitmap.init("options.bitmapoversample", "value", labels, values, num_items, 1);
     _page_misc.add_line( false, _("Oversample bitmaps:"), _misc_overs_bitmap, "", "", false);
-    _misc_ocal_url.init("options.ocalurl", "str", true, g_strdup_printf("openclipart.org"));
-    _page_misc.add_line( false, _("Open Clip Art Library Server Name:"), _misc_ocal_url, "", _("The server name of the Open Clip Art Library webdav server. It's used by the Import and Export to OCAL function."), true);
-    _misc_ocal_username.init("options.ocalusername", "str", true);
-    _page_misc.add_line( false, _("Open Clip Art Library Username:"), _misc_ocal_username, "", _("The username used to log into Open Clip Art Library."), true);
-    _misc_ocal_password.init("options.ocalpassword", "str", false);
-    _page_misc.add_line( false, _("Open Clip Art Library Password:"), _misc_ocal_password, "", _("The password used to log into Open Clip Art Library."), true);
 
     this->AddPage(_page_misc, _("Misc"), PREFS_PAGE_MISC);
 }

diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 8b355f28faa4aebf0421c3aa67b491fc2b312fc0..48cec934120b5155a3c73ffc28817053d63a28ce 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -62,6 +62,7 @@ enum {
     PREFS_PAGE_FILTERS,
     PREFS_PAGE_TRANSFORMS,
     PREFS_PAGE_SELECTING,
+    PREFS_PAGE_IMPORTEXPORT,
     PREFS_PAGE_MISC
 };
 
@@ -100,7 +101,8 @@ protected:
     Gtk::TreeModel::Path _path_shapes;
 
     DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows,
-        _page_clones, _page_mask, _page_transforms, _page_filters, _page_select, _page_misc;
+        _page_clones, _page_mask, _page_transforms, _page_filters, _page_select, 
+        _page_importexport, _page_misc;
     DialogPage _page_selector, _page_node, _page_zoom, _page_shapes, _page_pencil, _page_pen,
                _page_calligraphy, _page_text, _page_gradient, _page_connector, _page_dropper;
     DialogPage _page_rectangle, _page_3dbox, _page_ellipse, _page_star, _page_spiral, _page_paintbucket;
@@ -152,13 +154,13 @@ protected:
     PrefCheckButton _sel_hidden, _sel_locked;
     PrefCheckButton _sel_layer_deselects;
 
-    PrefSpinButton  _misc_export, _misc_recent, _misc_simpl;
-    PrefCheckButton _misc_imp_bitmap, _misc_comment, _misc_scripts;
+    PrefSpinButton  _importexport_export, _misc_recent, _misc_simpl;
+    PrefCheckButton _importexport_imp_bitmap, _misc_comment, _misc_scripts;
     PrefCheckButton _misc_small_toolbar;
     PrefCombo       _misc_overs_bitmap;
-    PrefEntryButtonHBox _misc_ocal_url;
-    PrefEntry       _misc_ocal_username;
-    PrefEntry       _misc_ocal_password;
+    PrefEntryButtonHBox _importexport_ocal_url;
+    PrefEntry       _importexport_ocal_username;
+    PrefEntry       _importexport_ocal_password;
 
     int _max_dialog_width;
     int _max_dialog_height;
@@ -185,6 +187,7 @@ protected:
     void initPageTransforms();
     void initPageFilters();
     void initPageSelecting();
+    void initPageImportExport();
     void initPageMisc();
 
 private: