diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-07 23:40:41 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-07 23:40:41 +0000 |
| commit | ffca253daf7e55a0508c15393d672e01c65e2df0 (patch) | |
| tree | 433af1c703dab415442346ff4161586f87ad7315 /src/ui/dialog | |
| parent | Permanent show outline in BSpline mode (diff) | |
| parent | Fix deprecated Gtkmm symbols in preferences widget (diff) | |
| download | inkscape-ffca253daf7e55a0508c15393d672e01c65e2df0.tar.gz inkscape-ffca253daf7e55a0508c15393d672e01c65e2df0.zip | |
update to trunk
(bzr r11950.1.48)
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 14 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.h | 13 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index c162681e7..c63b78c70 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1477,7 +1477,15 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui scroller->add(_kb_tree); int row = 3; + +#if WITH_GTKMM_3_0 + scroller->set_hexpand(); + scroller->set_vexpand(); + _page_keyshortcuts.attach(*scroller, 0, row, 2, 1); +#else _page_keyshortcuts.attach(*scroller, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL); +#endif + row++; #if WITH_GTKMM_3_0 @@ -1488,7 +1496,13 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui box_buttons->set_layout(Gtk::BUTTONBOX_END); box_buttons->set_spacing(4); + +#if WITH_GTKMM_3_0 + box_buttons->set_hexpand(); + _page_keyshortcuts.attach(*box_buttons, 0, row, 3, 1); +#else _page_keyshortcuts.attach(*box_buttons, 0, 3, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK); +#endif UI::Widget::Button *kb_reset = manage(new UI::Widget::Button(_("Reset"), _("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above"))); box_buttons->pack_start(*kb_reset, true, true, 6); diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index b21ab0128..eaf1ffc3d 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -87,6 +87,14 @@ enum { }; +namespace Gtk { +#if WITH_GTKMM_3_0 +class Scale; +#else +class HScale; +#endif +} + namespace Inkscape { namespace UI { namespace Dialog { @@ -188,7 +196,12 @@ protected: UI::Widget::PrefCheckButton _scroll_space; UI::Widget::PrefCheckButton _wheel_zoom; +#if WITH_GTKMM_3_0 + Gtk::Scale *_slider_snapping_delay; +#else Gtk::HScale *_slider_snapping_delay; +#endif + UI::Widget::PrefCheckButton _snap_indicator; UI::Widget::PrefCheckButton _snap_closest_only; UI::Widget::PrefCheckButton _snap_mouse_pointer; |