From 313b915e63750af8a4c9bdec0b37711bdf344b88 Mon Sep 17 00:00:00 2001 From: David Capello Date: Fri, 16 Jul 2010 18:10:04 -0300 Subject: [PATCH] Implemented onionskin stuff in UISettingsImpl class. --- src/settings/ui_settings_impl.cpp | 17 +++++++++++++---- src/settings/ui_settings_impl.h | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/settings/ui_settings_impl.cpp b/src/settings/ui_settings_impl.cpp index b64828c4d..4d71d86f6 100644 --- a/src/settings/ui_settings_impl.cpp +++ b/src/settings/ui_settings_impl.cpp @@ -38,19 +38,21 @@ UISettingsImpl::UISettingsImpl() m_currentTool = NULL; m_tiledMode = (TiledMode)get_config_int("Tools", "Tiled", (int)TILED_NONE); m_tiledMode = (TiledMode)MID(0, (int)m_tiledMode, (int)TILED_BOTH); - m_use_onionskin = get_config_bool("Tools", "Onionskin", false); m_snapToGrid = get_config_bool("Grid", "SnapTo", false); m_gridVisible = get_config_bool("Grid", "Visible", false); m_gridColor = get_config_color("Grid", "Color", color_rgb(0, 0, 255)); m_gridBounds = get_config_rect("Grid", "Bounds", m_gridBounds); m_pixelGridVisible = get_config_bool("PixelGrid", "Visible", false); m_pixelGridColor = get_config_color("PixelGrid", "Color", color_rgb(200, 200, 200)); + + m_use_onionskin = get_config_bool("Onionskin", "Enabled", false); + m_prev_frames_onionskin = get_config_int("Onionskin", "PrevFrames", 1); + m_next_frames_onionskin = get_config_int("Onionskin", "NextFrames", 0); } UISettingsImpl::~UISettingsImpl() { set_config_int("Tools", "Tiled", m_tiledMode); - set_config_bool("Tools", "Onionskin", m_use_onionskin); set_config_bool("Grid", "SnapTo", m_snapToGrid); set_config_bool("Grid", "Visible", m_gridVisible); set_config_rect("Grid", "Bounds", m_gridBounds); @@ -58,6 +60,10 @@ UISettingsImpl::~UISettingsImpl() set_config_bool("PixelGrid", "Visible", m_pixelGridVisible); set_config_color("PixelGrid", "Color", m_pixelGridColor); + set_config_bool("Onionskin", "Enabled", m_use_onionskin); + set_config_int("Onionskin", "PrevFrames", m_prev_frames_onionskin); + set_config_int("Onionskin", "NextFrames", m_next_frames_onionskin); + // delete all tool settings std::map::iterator it; for (it = m_toolSettings.begin(); it != m_toolSettings.end(); ++it) @@ -195,24 +201,27 @@ bool UISettingsImpl::getUseOnionskin() int UISettingsImpl::getOnionskinPrevFrames() { - return 1; + return m_prev_frames_onionskin; } int UISettingsImpl::getOnionskinNextFrames() { - return 0; + return m_next_frames_onionskin; } void UISettingsImpl::setUseOnionskin(bool state) { + m_use_onionskin = state; } void UISettingsImpl::setOnionskinPrevFrames(int frames) { + m_prev_frames_onionskin = frames; } void UISettingsImpl::setOnionskinNextFrames(int frames) { + m_next_frames_onionskin = frames; } ////////////////////////////////////////////////////////////////////// diff --git a/src/settings/ui_settings_impl.h b/src/settings/ui_settings_impl.h index 52b484651..3da08ed64 100644 --- a/src/settings/ui_settings_impl.h +++ b/src/settings/ui_settings_impl.h @@ -79,6 +79,8 @@ private: TiledMode m_tiledMode; Tool* m_currentTool; bool m_use_onionskin; + int m_prev_frames_onionskin; + int m_next_frames_onionskin; bool m_snapToGrid; bool m_gridVisible; Rect m_gridBounds;