Move AniControls widget to app/ui/timeline/ folder

This commit is contained in:
David Capello 2017-03-29 20:46:56 -03:00
parent f4c6c92dab
commit 6f750b1b50
4 changed files with 10 additions and 32 deletions

View File

@ -410,7 +410,6 @@ add_library(app-lib
tools/tool_loop_manager.cpp
transaction.cpp
transformation.cpp
ui/ani_controls.cpp
ui/app_menuitem.cpp
ui/backup_indicator.cpp
ui/browser_view.cpp
@ -481,6 +480,7 @@ add_library(app-lib
ui/slice_window.cpp
ui/status_bar.cpp
ui/tabs.cpp
ui/timeline/ani_controls.cpp
ui/timeline/timeline.cpp
ui/toolbar.cpp
ui/user_data_popup.cpp

View File

@ -8,37 +8,17 @@
#include "config.h"
#endif
#include "app/app.h"
#include "app/ui/timeline/ani_controls.h"
#include "app/commands/command.h"
#include "app/commands/commands.h"
#include "app/commands/params.h"
#include "app/context_access.h"
#include "app/document_access.h"
#include "app/document_range.h"
#include "app/modules/editors.h"
#include "app/modules/gfx.h"
#include "app/modules/gui.h"
#include "app/modules/palettes.h"
#include "app/tools/tool.h"
#include "app/ui/button_set.h"
#include "app/ui/color_button.h"
#include "app/ui/editor/editor.h"
#include "app/ui/keyboard_shortcuts.h"
#include "app/ui/main_window.h"
#include "app/ui/skin/skin_theme.h"
#include "app/ui/status_bar.h"
#include "app/ui/timeline/timeline.h"
#include "app/ui_context.h"
#include "app/util/range_utils.h"
#include "base/bind.h"
#include "doc/cel.h"
#include "doc/image.h"
#include "doc/layer.h"
#include "doc/sprite.h"
#include "gfx/size.h"
#include "she/font.h"
#include "she/surface.h"
#include "ui/ui.h"
#include "ui/tooltips.h"
#include <algorithm>
#include <cstdarg>
@ -48,9 +28,7 @@
namespace app {
using namespace app::skin;
using namespace gfx;
using namespace ui;
using namespace doc;
enum AniAction {
ACTION_FIRST,

View File

@ -1,11 +1,11 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2017 David Capello
//
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
#ifndef APP_UI_ANI_CONTROLS_H_INCLUDED
#define APP_UI_ANI_CONTROLS_H_INCLUDED
#ifndef APP_UI_TIMELINE_ANI_CONTROLS_H_INCLUDED
#define APP_UI_TIMELINE_ANI_CONTROLS_H_INCLUDED
#pragma once
#include "app/ui/button_set.h"

View File

@ -4,15 +4,15 @@
// This program is distributed under the terms of
// the End-User License Agreement for Aseprite.
#ifndef APP_UI_TIMELINE_H_INCLUDED
#define APP_UI_TIMELINE_H_INCLUDED
#ifndef APP_UI_TIMELINE_TIMELINE_H_INCLUDED
#define APP_UI_TIMELINE_TIMELINE_H_INCLUDED
#pragma once
#include "app/document_range.h"
#include "app/pref/preferences.h"
#include "app/ui/ani_controls.h"
#include "app/ui/editor/editor_observer.h"
#include "app/ui/input_chain_element.h"
#include "app/ui/timeline/ani_controls.h"
#include "doc/document_observer.h"
#include "doc/documents_observer.h"
#include "doc/frame.h"