Adding initial system info listing.

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index a18cb69031a845cb8dfd0d85592b34098f9a94eb..32a97d059bb6008deaf3b9e734589c6f65c6e907 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1265,6 +1265,23 @@ void InkscapePreferences::initPageMisc()
     _page_misc.add_line( false, "", _misc_namedicon_delay, "",
                            _("When on, named icons will be rendered before displaying the ui. This is for working around bugs in GTK+ named icon notification"), true);
 
+
+    {
+        Glib::ustring tmp;
+        tmp += "User config: ";
+        tmp += Glib::get_user_config_dir();
+        tmp += "\n";
+
+        tmp += "User data: ";
+        tmp += Glib::get_user_data_dir();
+        tmp += "\n";
+
+        _misc_info.get_buffer()->insert(_misc_info.get_buffer()->end(), tmp);
+    }
+    _misc_info.set_editable(false);
+    _misc_info_scroll.add(_misc_info);
+    _page_misc.add_line( false, "", _misc_info_scroll, "", _("General system information"), 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 a68303ab9e99f26de6916855da9974ae649b5681..7bcbe7d498c9b7554278db642457d509fdfcf3ec 100644 (file)
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -30,6 +30,8 @@
 #include "ui/widget/preferences-widget.h"
 #include <sigc++/sigc++.h>
 #include <glibmm/i18n.h>
+#include <gtkmm/textview.h>
+#include <gtkmm/scrolledwindow.h>
 
 #include "ui/widget/panel.h"
 
@@ -127,8 +129,8 @@ protected:
     PrefSpinButton _scroll_wheel, _scroll_arrow_px, _scroll_arrow_acc, _scroll_auto_speed, _scroll_auto_thres;
     PrefCheckButton _scroll_space;
     PrefCheckButton _wheel_zoom;
-    
-    Gtk::HScale                *_slider_snapping_delay;
+
+    Gtk::HScale     *_slider_snapping_delay;
     PrefCheckButton _snap_indicator, _snap_closest_only;
 
     PrefCombo       _steps_rot_snap;
@@ -147,9 +149,9 @@ protected:
     PrefRadioButton _win_ontop_none, _win_ontop_normal, _win_ontop_agressive;
     PrefRadioButton _win_save_geom_off, _win_save_geom, _win_save_geom_prefs;
     PrefCheckButton _win_hide_task, _win_zoom_resize , _win_show_close;
-       PrefSpinButton _win_trans_focus; /**< The dialog transparency setting for when the dialog is focused. */
-       PrefSpinButton _win_trans_blur;  /**< The dialog transparency setting for when the dialog is out of focus. */
-       PrefSpinButton _win_trans_time;  /**< How much time to go from one transparency setting to another */
+    PrefSpinButton _win_trans_focus; /**< The dialog transparency setting for when the dialog is focused. */
+    PrefSpinButton _win_trans_blur;  /**< The dialog transparency setting for when the dialog is out of focus. */
+    PrefSpinButton _win_trans_time;  /**< How much time to go from one transparency setting to another */
 
     PrefCheckButton _pencil_average_all_sketches;
 
@@ -179,9 +181,12 @@ protected:
     PrefCheckButton _sel_layer_deselects;
 
     PrefSpinButton  _importexport_export, _misc_simpl;
-    PrefSlider         _snap_delay, _snap_weight;
+    PrefSlider      _snap_delay, _snap_weight;
     PrefSpinButton  _misc_latency_skew;
     PrefCheckButton _misc_comment, _misc_forkvectors, _misc_scripts, _misc_namedicon_delay;
+    Gtk::TextView   _misc_info;
+    Gtk::ScrolledWindow _misc_info_scroll;
+
 
     // UI page
     PrefCombo       _ui_languages;
@@ -198,7 +203,7 @@ protected:
     PrefCombo       _spell_language3;
     PrefCheckButton _spell_ignorenumbers;
     PrefCheckButton _spell_ignoreallcaps;
-    
+
     PrefCombo       _misc_overs_bitmap;
     PrefCombo       _misc_bitmap_editor;
     PrefCheckButton _misc_bitmap_autoreload;