index 269bce7f03ddac29fce44c1a7cb8ea8ed4acc31f..00b415b668c7471004f097cc76a0fa15a7013552 100644 (file)
#include "dialog.h"
#include "dialog.h"
+// UPDATE THIS IF YOU'RE ADDING PREFS PAGES.
+// Otherwise the commands that open the dialog with the new page will fail.
+
+enum {
+ PREFS_PAGE_MOUSE,
+ PREFS_PAGE_SCROLLING,
+ PREFS_PAGE_STEPS,
+ PREFS_PAGE_TOOLS,
+ PREFS_PAGE_TOOLS_SELECTOR,
+ PREFS_PAGE_TOOLS_NODE,
+ PREFS_PAGE_TOOLS_ZOOM,
+ PREFS_PAGE_TOOLS_SHAPES,
+ PREFS_PAGE_TOOLS_SHAPES_RECT,
+ PREFS_PAGE_TOOLS_SHAPES_ELLIPSE,
+ PREFS_PAGE_TOOLS_SHAPES_STAR,
+ PREFS_PAGE_TOOLS_SHAPES_SPIRAL,
+ PREFS_PAGE_TOOLS_PENCIL,
+ PREFS_PAGE_TOOLS_PEN,
+ PREFS_PAGE_TOOLS_CALLIGRAPHY,
+ PREFS_PAGE_TOOLS_TEXT,
+ PREFS_PAGE_TOOLS_GRADIENT,
+ PREFS_PAGE_TOOLS_CONNECTOR,
+ PREFS_PAGE_TOOLS_DROPPER,
+ PREFS_PAGE_WINDOWS,
+ PREFS_PAGE_CLONES,
+ PREFS_PAGE_TRANSFORMS,
+ PREFS_PAGE_SELECTING,
+ PREFS_PAGE_MISC
+};
+
using namespace Inkscape::UI::Widget;
namespace Inkscape {
using namespace Inkscape::UI::Widget;
namespace Inkscape {
virtual ~InkscapePreferences();
static InkscapePreferences *create() {return new InkscapePreferences(); }
virtual ~InkscapePreferences();
static InkscapePreferences *create() {return new InkscapePreferences(); }
+ void present();
protected:
Gtk::Frame _page_frame;
protected:
Gtk::Frame _page_frame;
{
public:
PageListModelColumns()
{
public:
PageListModelColumns()
- { Gtk::TreeModelColumnRecord::add(_col_id); Gtk::TreeModelColumnRecord::add(_col_page); }
- Gtk::TreeModelColumn<Glib::ustring> _col_id;
+ { Gtk::TreeModelColumnRecord::add(_col_name); Gtk::TreeModelColumnRecord::add(_col_page); Gtk::TreeModelColumnRecord::add(_col_id); }
+ Gtk::TreeModelColumn<Glib::ustring> _col_name;
+ Gtk::TreeModelColumn<int> _col_id;
Gtk::TreeModelColumn<DialogPage*> _col_page;
};
PageListModelColumns _page_list_columns;
Gtk::TreeModelColumn<DialogPage*> _col_page;
};
PageListModelColumns _page_list_columns;
+ Gtk::TreeModel::Path _path_tools;
+ Gtk::TreeModel::Path _path_shapes;
+
DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows,
_page_clones, _page_transforms, _page_select, _page_misc;
DialogPage _page_selector, _page_node, _page_zoom, _page_shapes, _page_pencil, _page_pen,
DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows,
_page_clones, _page_transforms, _page_select, _page_misc;
DialogPage _page_selector, _page_node, _page_zoom, _page_shapes, _page_pencil, _page_pen,
PrefSpinButton _t_pencil_tolerance;
PrefRadioButton _win_ontop_none, _win_ontop_normal, _win_ontop_agressive;
PrefSpinButton _t_pencil_tolerance;
PrefRadioButton _win_ontop_none, _win_ontop_normal, _win_ontop_agressive;
- PrefCheckButton _win_save_geom, _win_hide_task, _win_zoom_resize;
+ PrefCheckButton _win_save_geom, _win_hide_task, _win_zoom_resize , _win_show_close;
+
+ PrefCheckButton _calligrapy_use_abs_size;
+ PrefCheckButton _calligrapy_keep_selected;
+ PrefCheckButton _connector_ignore_text;
+
PrefRadioButton _clone_option_parallel, _clone_option_stay, _clone_option_transform,
_clone_option_unlink, _clone_option_delete;
PrefCheckButton _trans_scale_stroke, _trans_scale_corner, _trans_gradient,_trans_pattern;
PrefRadioButton _trans_optimized, _trans_preserved;
PrefRadioButton _clone_option_parallel, _clone_option_stay, _clone_option_transform,
_clone_option_unlink, _clone_option_delete;
PrefCheckButton _trans_scale_stroke, _trans_scale_corner, _trans_gradient,_trans_pattern;
PrefRadioButton _trans_optimized, _trans_preserved;
- PrefCheckButton _sel_current, _sel_hidden, _sel_locked;
+ PrefRadioButton _sel_all;
+ PrefRadioButton _sel_current;
+ PrefRadioButton _sel_recursive;
+ PrefCheckButton _sel_hidden, _sel_locked;
+ PrefCheckButton _sel_layer_deselects;
PrefSpinButton _misc_export, _misc_recent, _misc_simpl;
PrefCheckButton _misc_imp_bitmap, _misc_comment, _misc_scripts;
PrefCombo _misc_overs_bitmap;
PrefSpinButton _misc_export, _misc_recent, _misc_simpl;
PrefCheckButton _misc_imp_bitmap, _misc_comment, _misc_scripts;
PrefCombo _misc_overs_bitmap;
+ PrefCheckButton _misc_mask_on_top;
+ PrefCheckButton _misc_mask_remove;
int _max_dialog_width;
int _max_dialog_height;
int _sb_width;
DialogPage* _current_page;
int _max_dialog_width;
int _max_dialog_height;
int _sb_width;
DialogPage* _current_page;
- Gtk::TreeModel::iterator AddPage(DialogPage& p, Glib::ustring title);
- Gtk::TreeModel::iterator AddPage(DialogPage& p, Glib::ustring title, Gtk::TreeModel::iterator parent);
+ Gtk::TreeModel::iterator AddPage(DialogPage& p, Glib::ustring title, int id);
+ Gtk::TreeModel::iterator AddPage(DialogPage& p, Glib::ustring title, Gtk::TreeModel::iterator parent, int id);
bool SetMaxDialogSize(const Gtk::TreeModel::iterator& iter);
bool SetMaxDialogSize(const Gtk::TreeModel::iterator& iter);
+ bool PresentPage(const Gtk::TreeModel::iterator& iter);
static void AddSelcueCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
static void AddGradientCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
static void AddNewObjectsStyle(DialogPage& p, const std::string& prefs_path);
static void AddSelcueCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
static void AddGradientCheckbox(DialogPage& p, const std::string& prefs_path, bool def_value);
static void AddNewObjectsStyle(DialogPage& p, const std::string& prefs_path);
- static void StyleFromSelectionToTool(gchar const *prefs_path);
void on_pagelist_selection_changed();
void initPageMouse();
void on_pagelist_selection_changed();
void initPageMouse();