From ae099de0a892d06655ad7143c1443fec5ca517e2 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Wed, 20 Feb 2008 09:11:27 +0000 Subject: Decoupled swatch sizes from icon sizes (bzr r4790) --- src/ui/widget/panel.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/ui/widget/panel.cpp') diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 0b6527a5a..f6d975778 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -93,7 +93,7 @@ void Panel::_init() guint panel_size = 0; if (_prefs_path) { - panel_size = prefs_get_int_attribute_limited( _prefs_path, "panel_size", 1, 0, 10 ); + panel_size = prefs_get_int_attribute_limited( _prefs_path, "panel_size", 1, 0, static_cast(PREVIEW_SIZE_HUGE) ); } guint panel_mode = 0; @@ -295,7 +295,7 @@ void Panel::restorePanelPrefs() { guint panel_size = 0; if (_prefs_path) { - panel_size = prefs_get_int_attribute_limited(_prefs_path, "panel_size", 1, 0, 10); + panel_size = prefs_get_int_attribute_limited(_prefs_path, "panel_size", 1, 0, static_cast(PREVIEW_SIZE_HUGE)); } guint panel_mode = 0; if (_prefs_path) { @@ -335,27 +335,27 @@ void Panel::_bounceCall(int i, int j) switch (j) { case 0: { - _fillable->setStyle(Inkscape::ICON_SIZE_DECORATION, curr_type); + _fillable->setStyle(::PREVIEW_SIZE_TINY, curr_type); } break; case 1: { - _fillable->setStyle(Inkscape::ICON_SIZE_MENU, curr_type); + _fillable->setStyle(::PREVIEW_SIZE_SMALL, curr_type); } break; case 2: { - _fillable->setStyle(Inkscape::ICON_SIZE_SMALL_TOOLBAR, curr_type); + _fillable->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type); } break; case 3: { - _fillable->setStyle(Inkscape::ICON_SIZE_BUTTON, curr_type); + _fillable->setStyle(::PREVIEW_SIZE_BIG, curr_type); } break; case 4: { - _fillable->setStyle(Inkscape::ICON_SIZE_DIALOG, curr_type); + _fillable->setStyle(::PREVIEW_SIZE_HUGE, curr_type); } break; default: @@ -368,7 +368,7 @@ void Panel::_bounceCall(int i, int j) prefs_set_int_attribute (_prefs_path, "panel_mode", j); } if (_fillable) { - Inkscape::IconSize curr_size = _fillable->getPreviewSize(); + ::PreviewSize curr_size = _fillable->getPreviewSize(); switch (j) { case 0: { -- cgit v1.2.3