Move src/gui/ to src/ui/

src/CMakeLists.txt

@@ -130,7 +130,7 @@ set(all_libs ${aseprite_libraries} ${libs3rdparty} ${sys_libs})
 add_subdirectory(base)
 add_subdirectory(filters)
 add_subdirectory(gfx)
-add_subdirectory(gui)
+add_subdirectory(ui)
 add_subdirectory(undo)
 
 add_library(aseprite-library
@@ -445,7 +445,7 @@ endfunction()
 
 find_unittests(base base-lib ${sys_libs})
 find_unittests(gfx gfx-lib base-lib ${sys_libs})
-find_unittests(gui ui-lib gfx-lib base-lib ${libs3rdparty} ${sys_libs})
+find_unittests(ui ui-lib gfx-lib base-lib ${libs3rdparty} ${sys_libs})
 find_unittests(file ${all_libs})
 find_unittests(app ${all_libs})
 find_unittests(. ${all_libs})

src/app.cpp

@@ -34,8 +34,6 @@
 #include "file/file.h"
 #include "file/file_formats_manager.h"
 #include "file_system.h"
-#include "gui/gui.h"
-#include "gui/intern.h"
 #include "gui_xml.h"
 #include "ini_file.h"
 #include "log.h"
@@ -51,6 +49,8 @@
 #include "raster/sprite.h"
 #include "recent_files.h"
 #include "tools/tool_box.h"
+#include "ui/gui.h"
+#include "ui/intern.h"
 #include "ui_context.h"
 #include "util/boundary.h"
 #include "util/render.h"

src/app.h

@@ -21,8 +21,8 @@
 
 #include "base/signal.h"
 #include "base/string.h"
-#include "gui/base.h"
 #include "raster/pixel_format.h"
+#include "ui/base.h"
 
 #include <vector>
 

src/app/widget_loader.cpp

@@ -24,9 +24,9 @@
 #include "app/widget_not_found.h"
 #include "base/bind.h"
 #include "base/memory.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "resource_finder.h"
+#include "ui/gui.h"
 #include "widgets/color_button.h"
 #include "xml_exception.h"
 

src/commands/cmd_about.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 
 #include "base/bind.h"
-#include "gui/gui.h"
+#include "ui/gui.h"
 
 #include "commands/command.h"
 #include "modules/gui.h"

src/commands/cmd_advanced_mode.cpp

@@ -22,9 +22,9 @@
 #include "app/find_widget.h"
 #include "app/load_widget.h"
 #include "commands/command.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/gui.h"
+#include "ui/gui.h"
 #include "widgets/color_bar.h"
 #include "widgets/statebar.h"
 #include "widgets/tabs.h"

src/commands/cmd_canvas_size.cpp

@@ -25,12 +25,12 @@
 #include "base/unique_ptr.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 #include "widgets/color_bar.h"
 #include "widgets/editor/editor.h"

src/commands/cmd_cel_properties.cpp

@@ -24,13 +24,13 @@
 #include "base/mem_utils.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/gui.h"
 #include "undo/undo_history.h"
 #include "undoers/set_cel_opacity.h"
 

src/commands/cmd_close_file.cpp

@@ -18,16 +18,16 @@
 
 #include "config.h"
 
-#include <memory>
+#include "ui/gui.h"
 #include <allegro.h>
-#include "gui/gui.h"
+#include <memory>
 
+#include "app.h"
 #include "commands/command.h"
 #include "commands/commands.h"
-#include "app.h"
+#include "document_wrappers.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
 #include "ui_context.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_configure_tools.cpp

@@ -27,7 +27,6 @@
 #include "console.h"
 #include "document_wrappers.h"
 #include "gfx/size.h"
-#include "gui/gui.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
@@ -41,6 +40,7 @@
 #include "tools/ink.h"
 #include "tools/point_shape.h"
 #include "tools/tool.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "widgets/button_set.h"
 #include "widgets/color_button.h"

src/commands/cmd_copy.cpp

@@ -19,11 +19,11 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "gui/base.h"
+#include "document_wrappers.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
+#include "ui/base.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
 

src/commands/cmd_copy_cel.cpp

@@ -20,8 +20,8 @@
 
 #include "commands/command.h"
 #include "dialogs/aniedit.h"
-#include "gui/base.h"
 #include "document_wrappers.h"
+#include "ui/base.h"
 #include "util/celmove.h"
 
 class CopyCelCommand : public Command

src/commands/cmd_cut.cpp

@@ -19,11 +19,11 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "gui/base.h"
+#include "document_wrappers.h"
 #include "raster/layer.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
+#include "ui/base.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
 

src/commands/cmd_developer_console.cpp

@@ -22,10 +22,10 @@
 #include "context.h"
 #include "document.h"
 #include "documents.h"
-#include "gui/box.h"
-#include "gui/button.h"
-#include "gui/combobox.h"
-#include "gui/frame.h"
+#include "ui/box.h"
+#include "ui/button.h"
+#include "ui/combobox.h"
+#include "ui/frame.h"
 
 using namespace ui;
 

src/commands/cmd_duplicate_layer.cpp

@@ -22,10 +22,10 @@
 #include "commands/command.h"
 #include "console.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo/undo_history.h"
 #include "undo_transaction.h"
 #include "undoers/add_layer.h"

src/commands/cmd_duplicate_sprite.cpp

@@ -25,10 +25,10 @@
 #include "app/load_widget.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 
 using namespace ui;

src/commands/cmd_exit.cpp

@@ -22,7 +22,7 @@
 #include "commands/command.h"
 #include "context.h"
 #include "document.h"
-#include "gui/alert.h"
+#include "ui/alert.h"
 
 //////////////////////////////////////////////////////////////////////
 // exit

src/commands/cmd_export_sprite_sheet.cpp

@@ -22,7 +22,6 @@
 #include "commands/command.h"
 #include "commands/commands.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
@@ -32,6 +31,7 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/gui.h"
 #include "undo/undo_history.h"
 #include "undo_transaction.h"
 

src/commands/cmd_eyedropper.cpp

@@ -20,14 +20,14 @@
 
 #include <allegro/unicode.h>
 
-#include "gui/gui.h"
+#include "ui/gui.h"
 
+#include "app.h"
 #include "commands/command.h"
 #include "commands/params.h"
-#include "app.h"
 #include "modules/editors.h"
-#include "raster/sprite.h"
 #include "raster/image.h"
+#include "raster/sprite.h"
 #include "widgets/color_bar.h"
 #include "widgets/editor/editor.h"
 

src/commands/cmd_film_editor.cpp

@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include "gui/gui.h"
+#include "ui/gui.h"
 
 #include "commands/command.h"
 #include "dialogs/aniedit.h"

src/commands/cmd_frame_properties.cpp

@@ -24,8 +24,8 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 
 using namespace ui;

src/commands/cmd_goto_frame.cpp

@@ -23,10 +23,10 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/frame.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
+#include "ui/frame.h"
 #include "widgets/editor/editor.h"
 
 #include <allegro/unicode.h>

src/commands/cmd_grid.cpp

@@ -25,9 +25,9 @@
 #include "app/load_widget.h"
 #include "commands/command.h"
 #include "context.h"
-#include "gui/frame.h"
 #include "modules/editors.h"
 #include "settings/settings.h"
+#include "ui/frame.h"
 #include "ui_context.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_import_sprite_sheet.cpp

@@ -23,7 +23,6 @@
 #include "commands/commands.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
@@ -34,6 +33,7 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 #include "widgets/drop_down_button.h"
 #include "widgets/editor/editor.h"

src/commands/cmd_layer_from_background.cpp

@@ -20,10 +20,10 @@
 
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_layer_properties.cpp

@@ -19,15 +19,15 @@
 #include "config.h"
 
 #include "base/bind.h"
-#include "gui/gui.h"
+#include "ui/gui.h"
 
 #include "app.h"
 #include "commands/command.h"
+#include "document_wrappers.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
-#include "document_wrappers.h"
 
 using namespace ui;
 

src/commands/cmd_load_mask.cpp

@@ -22,10 +22,10 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/alert.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/alert.h"
 #include "undo/undo_history.h"
 #include "undoers/set_mask.h"
 #include "util/msk_file.h"

src/commands/cmd_mask_by_color.cpp

@@ -20,8 +20,8 @@
 
 #include "commands/command.h"
 #include "dialogs/maskcol.h"
-#include "gui/base.h"
 #include "document_wrappers.h"
+#include "ui/base.h"
 
 //////////////////////////////////////////////////////////////////////
 // mask_by_color

src/commands/cmd_merge_down_layer.cpp

@@ -21,13 +21,13 @@
 #include "app.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/gui.h"
 #include "undo/undo_history.h"
 #include "undoers/add_cel.h"
 #include "undoers/add_image.h"

src/commands/cmd_move_cel.cpp

@@ -20,8 +20,8 @@
 
 #include "commands/command.h"
 #include "dialogs/aniedit.h"
-#include "gui/base.h"
 #include "document_wrappers.h"
+#include "ui/base.h"
 #include "util/celmove.h"
 
 class MoveCelCommand : public Command

src/commands/cmd_new_file.cpp

@@ -27,7 +27,6 @@
 #include "commands/command.h"
 #include "console.h"
 #include "document.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/palettes.h"
@@ -35,6 +34,7 @@
 #include "raster/layer.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "util/clipboard.h"
 #include "widgets/color_bar.h"

src/commands/cmd_new_frame.cpp

@@ -23,12 +23,12 @@
 #include "commands/command.h"
 #include "console.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
 #include "raster/image.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_new_layer.cpp

@@ -24,10 +24,10 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_new_layer_set.cpp

@@ -23,10 +23,10 @@
 #include "app/load_widget.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 
 using namespace ui;
 

src/commands/cmd_open_file.cpp

@@ -29,11 +29,11 @@
 #include "console.h"
 #include "document.h"
 #include "file/file.h"
-#include "gui/gui.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "recent_files.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_options.cpp

@@ -24,10 +24,10 @@
 #include "base/bind.h"
 #include "commands/command.h"
 #include "context.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "raster/image.h"
+#include "ui/gui.h"
 #include "util/render.h"
 #include "widgets/color_button.h"
 #include "widgets/editor/editor.h"

src/commands/cmd_palette_editor.cpp

@@ -31,8 +31,6 @@
 #include "gfx/hsv.h"
 #include "gfx/rgb.h"
 #include "gfx/size.h"
-#include "gui/graphics.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
@@ -43,6 +41,8 @@
 #include "raster/sprite.h"
 #include "raster/stock.h"
 #include "skin/skin_slider_property.h"
+#include "ui/graphics.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "undo/undo_history.h"
 #include "undoers/close_group.h"

src/commands/cmd_play_animation.cpp

@@ -20,9 +20,10 @@
 
 #include <allegro.h>
 
-#include "gui/gui.h"
+#include "ui/gui.h"
 
 #include "commands/command.h"
+#include "document_wrappers.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
@@ -30,7 +31,6 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "widgets/editor/editor.h"
-#include "document_wrappers.h"
 
 //////////////////////////////////////////////////////////////////////
 // play_animation

src/commands/cmd_preview.cpp

@@ -21,11 +21,12 @@
 
 #include <allegro.h>
 
-#include "gui/gui.h"
+#include "ui/gui.h"
 
+#include "app.h"
 #include "commands/command.h"
 #include "commands/commands.h"
-#include "app.h"
+#include "document_wrappers.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
@@ -35,7 +36,6 @@
 #include "util/render.h"
 #include "widgets/editor/editor.h"
 #include "widgets/statebar.h"
-#include "document_wrappers.h"
 
 using namespace ui;
 

src/commands/cmd_refresh.cpp

@@ -20,13 +20,14 @@
 
 #include "app.h"
 #include "commands/command.h"
-#include "gui/system.h"
-#include "gui/theme.h"
-#include "skin/skin_theme.h"
 #include "document_wrappers.h"
+#include "skin/skin_theme.h"
+#include "ui/system.h"
+#include "ui/theme.h"
 #include "widgets/statebar.h"
 
 #include <allegro.h>
+
 #if defined ALLEGRO_WINDOWS && defined DEBUGMODE
   #include <winalleg.h>
   #include <psapi.h>

src/commands/cmd_remove_frame.cpp

@@ -20,9 +20,9 @@
 
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_remove_layer.cpp

@@ -21,10 +21,10 @@
 #include "app.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/widget.h"
 #include "modules/gui.h"
 #include "raster/layer.h"
 #include "raster/sprite.h"
+#include "ui/widget.h"
 #include "undo_transaction.h"
 #include "widgets/statebar.h"
 

src/commands/cmd_rotate_canvas.cpp

@@ -22,7 +22,6 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "job.h"
 #include "modules/gui.h"
 #include "raster/cel.h"
@@ -30,6 +29,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/gui.h"
 #include "undo_transaction.h"
 #include "widgets/color_bar.h"
 

src/commands/cmd_save_file.cpp

@@ -27,10 +27,10 @@
 #include "console.h"
 #include "document_wrappers.h"
 #include "file/file.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "recent_files.h"
+#include "ui/gui.h"
 #include "widgets/statebar.h"
 
 struct SaveFileData

src/commands/cmd_save_mask.cpp

@@ -23,9 +23,9 @@
 #include "app/file_selector.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/alert.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/alert.h"
 #include "util/msk_file.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_scroll.cpp

@@ -21,9 +21,9 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/view.h"
 #include "modules/editors.h"
 #include "settings/settings.h"
+#include "ui/view.h"
 #include "widgets/editor/editor.h"
 
 //////////////////////////////////////////////////////////////////////

src/commands/cmd_select_file.cpp

@@ -22,8 +22,8 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/editors.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 
 #include <allegro/debug.h>

src/commands/cmd_sprite_editor.cpp

@@ -19,8 +19,8 @@
 #include "config.h"
 
 #include "commands/command.h"
-#include "gui/base.h"
 #include "modules/editors.h"
+#include "ui/base.h"
 
 //////////////////////////////////////////////////////////////////////
 // close_editor

src/commands/cmd_sprite_properties.cpp

@@ -25,11 +25,11 @@
 #include "base/mem_utils.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "widgets/color_button.h"
 
 #include <allegro/unicode.h>

src/commands/cmd_sprite_size.cpp

@@ -24,7 +24,6 @@
 #include "base/unique_ptr.h"
 #include "commands/command.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "job.h"
 #include "modules/gui.h"
@@ -34,6 +33,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "undo_transaction.h"
 

src/commands/cmd_switch_colors.cpp

@@ -22,7 +22,7 @@
 
 #include "app.h"
 #include "commands/command.h"
-#include "gui/base.h"
+#include "ui/base.h"
 #include "widgets/color_bar.h"
 
 class SwitchColorsCommand : public Command

src/commands/commands.cpp

@@ -19,15 +19,15 @@
 #include "config.h"
 
 /* #include <stdio.h> */
-#include <string.h>
 #include <allegro/unicode.h>
 #include <exception>
+#include <string.h>
 
-#include "gui/gui.h"
+#include "ui/gui.h"
 
-#include "console.h"
 #include "commands/command.h"
 #include "commands/commands.h"
+#include "console.h"
 
 #undef FOR_EACH_COMMAND
   #define FOR_EACH_COMMAND(Name) \

src/commands/commands.h

@@ -19,7 +19,7 @@
 #ifndef COMMANDS_COMMANDS_H_INCLUDED
 #define COMMANDS_COMMANDS_H_INCLUDED
 
-#include "gui/base.h"
+#include "ui/base.h"
 
 struct CommandId
 {

src/commands/filters/cmd_color_curve.cpp

@@ -28,11 +28,11 @@
 #include "document_wrappers.h"
 #include "filters/color_curve.h"
 #include "filters/color_curve_filter.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "widgets/color_button.h"
 
 static ColorCurve* the_curve = NULL;

src/commands/filters/cmd_convolution_matrix.cpp

@@ -31,17 +31,17 @@
 #include "document_wrappers.h"
 #include "filters/convolution_matrix.h"
 #include "filters/convolution_matrix_filter.h"
-#include "gui/button.h"
-#include "gui/frame.h"
-#include "gui/label.h"
-#include "gui/list.h"
-#include "gui/listbox.h"
-#include "gui/slider.h"
-#include "gui/view.h"
-#include "gui/widget.h"
 #include "ini_file.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/button.h"
+#include "ui/frame.h"
+#include "ui/label.h"
+#include "ui/list.h"
+#include "ui/listbox.h"
+#include "ui/slider.h"
+#include "ui/view.h"
+#include "ui/widget.h"
 
 static const char* ConfigSection = "ConvolutionMatrix";
 

src/commands/filters/cmd_despeckle.cpp

@@ -28,15 +28,15 @@
 #include "commands/filters/filter_window.h"
 #include "document_wrappers.h"
 #include "filters/median_filter.h"
-#include "gui/button.h"
-#include "gui/entry.h"
-#include "gui/frame.h"
-#include "gui/grid.h"
-#include "gui/widget.h"
 #include "ini_file.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "settings/settings.h"
+#include "ui/button.h"
+#include "ui/entry.h"
+#include "ui/frame.h"
+#include "ui/grid.h"
+#include "ui/widget.h"
 
 static const char* ConfigSection = "Despeckle";
 

src/commands/filters/cmd_invert_color.cpp

@@ -25,16 +25,16 @@
 #include "commands/filters/filter_window.h"
 #include "document_wrappers.h"
 #include "filters/invert_color_filter.h"
-#include "gui/button.h"
-#include "gui/frame.h"
-#include "gui/label.h"
-#include "gui/slider.h"
-#include "gui/widget.h"
 #include "ini_file.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/button.h"
+#include "ui/frame.h"
+#include "ui/label.h"
+#include "ui/slider.h"
+#include "ui/widget.h"
 #include "widgets/color_button.h"
 
 static const char* ConfigSection = "InvertColor";

src/commands/filters/cmd_replace_color.cpp

@@ -31,11 +31,11 @@
 #include "commands/filters/filter_window.h"
 #include "document_wrappers.h"
 #include "filters/replace_color_filter.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "widgets/color_bar.h"
 #include "widgets/color_button.h"
 

src/commands/filters/color_curve_editor.cpp

@@ -22,15 +22,15 @@
 #include "app/load_widget.h"
 #include "commands/filters/color_curve_editor.h"
 #include "filters/color_curve.h"
-#include "gui/alert.h"
-#include "gui/entry.h"
-#include "gui/frame.h"
-#include "gui/manager.h"
-#include "gui/message.h"
-#include "gui/rect.h"
-#include "gui/system.h"
-#include "gui/view.h"
-#include "gui/widget.h"
+#include "ui/alert.h"
+#include "ui/entry.h"
+#include "ui/frame.h"
+#include "ui/manager.h"
+#include "ui/message.h"
+#include "ui/rect.h"
+#include "ui/system.h"
+#include "ui/view.h"
+#include "ui/widget.h"
 
 #include <allegro.h>
 #include <cmath>

src/commands/filters/color_curve_editor.h

@@ -22,7 +22,7 @@
 #include "base/compiler_specific.h"
 #include "base/signal.h"
 #include "gfx/point.h"
-#include "gui/widget.h"
+#include "ui/widget.h"
 
 class ColorCurve;
 

src/commands/filters/filter_manager_impl.cpp

@@ -21,11 +21,6 @@
 #include "commands/filters/filter_manager_impl.h"
 
 #include "filters/filter.h"
-#include "gui/manager.h"
-#include "gui/rect.h"
-#include "gui/region.h"
-#include "gui/view.h"
-#include "gui/widget.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "raster/cel.h"
@@ -35,6 +30,11 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "raster/stock.h"
+#include "ui/manager.h"
+#include "ui/rect.h"
+#include "ui/region.h"
+#include "ui/view.h"
+#include "ui/widget.h"
 #include "undo/undo_history.h"
 #include "undoers/close_group.h"
 #include "undoers/image_area.h"

src/commands/filters/filter_preview.cpp

@@ -21,10 +21,10 @@
 #include "commands/filters/filter_preview.h"
 
 #include "commands/filters/filter_manager_impl.h"
-#include "gui/manager.h"
-#include "gui/message.h"
-#include "gui/widget.h"
 #include "raster/sprite.h"
+#include "ui/manager.h"
+#include "ui/message.h"
+#include "ui/widget.h"
 #include "util/render.h"
 
 using namespace ui;

src/commands/filters/filter_preview.h

@@ -20,8 +20,8 @@
 #define COMMANDS_FILTERS_FILTER_PREVIEW_H_INCLUDED
 
 #include "base/compiler_specific.h"
-#include "gui/timer.h"
-#include "gui/widget.h"
+#include "ui/timer.h"
+#include "ui/widget.h"
 
 class FilterManagerImpl;
 

src/commands/filters/filter_target_buttons.cpp

@@ -24,14 +24,14 @@
 #include <string.h>
 
 #include "base/bind.h"
-#include "gui/box.h"
-#include "gui/button.h"
-#include "gui/theme.h"
-#include "gui/widget.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "skin/skin_parts.h"
+#include "ui/box.h"
+#include "ui/button.h"
+#include "ui/theme.h"
+#include "ui/widget.h"
 
 using namespace ui;
 

src/commands/filters/filter_target_buttons.h

@@ -21,7 +21,7 @@
 
 #include "base/signal.h"
 #include "filters/target.h"
-#include "gui/box.h"
+#include "ui/box.h"
 
 namespace ui { class ButtonBase; }
 

src/commands/filters/filter_window.h

@@ -19,12 +19,12 @@
 #ifndef COMMANDS_FILTERS_FILTER_WINDOW_H_INCLUDED
 #define COMMANDS_FILTERS_FILTER_WINDOW_H_INCLUDED
 
-#include "gui/box.h"
-#include "gui/button.h"
-#include "gui/frame.h"
 #include "commands/filters/filter_preview.h"
 #include "commands/filters/filter_target_buttons.h"
 #include "filters/tiled_mode.h"
+#include "ui/box.h"
+#include "ui/button.h"
+#include "ui/frame.h"
 
 class FilterManagerImpl;
 

src/commands/filters/filter_worker.cpp

@@ -26,11 +26,11 @@
 #include "base/scoped_lock.h"
 #include "base/thread.h"
 #include "commands/filters/filter_manager_impl.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
+#include "ui/gui.h"
 #include "widgets/editor/editor.h"
 #include "widgets/statebar.h"
 

src/console.cpp

@@ -24,7 +24,7 @@
 
 #include "base/bind.h"
 #include "base/memory.h"
-#include "gui/gui.h"
+#include "ui/gui.h"
 
 #include "app.h"
 #include "console.h"

src/dialogs/aniedit.cpp

@@ -28,12 +28,12 @@
 #include "document_wrappers.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
-#include "gui/gui.h"
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "modules/rootmenu.h"
 #include "raster/raster.h"
 #include "skin/skin_theme.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "undo/undo_history.h"
 #include "undo_transaction.h"

src/dialogs/maskcol.cpp

@@ -25,18 +25,18 @@
 #include "base/unique_ptr.h"
 #include "document.h"
 #include "document_wrappers.h"
-#include "gui/box.h"
-#include "gui/button.h"
-#include "gui/frame.h"
-#include "gui/label.h"
-#include "gui/slider.h"
-#include "gui/widget.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gui.h"
 #include "raster/image.h"
 #include "raster/mask.h"
 #include "raster/sprite.h"
+#include "ui/box.h"
+#include "ui/button.h"
+#include "ui/frame.h"
+#include "ui/label.h"
+#include "ui/slider.h"
+#include "ui/widget.h"
 #include "undo/undo_history.h"
 #include "undoers/set_mask.h"
 #include "util/misc.h"

src/drop_files.cpp

@@ -26,8 +26,8 @@
 #include "base/scoped_lock.h"
 #include "commands/commands.h"
 #include "commands/params.h"
-#include "gui/frame.h"
-#include "gui/manager.h"
+#include "ui/frame.h"
+#include "ui/manager.h"
 #include "ui_context.h"
 
 #ifdef ALLEGRO_WINDOWS

src/file/ase_format.cpp

@@ -24,8 +24,8 @@
 #include "file/file_format.h"
 #include "file/file_handle.h"
 #include "file/format_options.h"
-#include "gui/list.h"
 #include "raster/raster.h"
+#include "ui/list.h"
 #include "zlib.h"
 
 #include <stdio.h>

src/file/file.cpp

@@ -29,11 +29,11 @@
 #include "file/file_format.h"
 #include "file/file_formats_manager.h"
 #include "file/format_options.h"
-#include "gui/alert.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/quantization.h"
 #include "raster/raster.h"
+#include "ui/alert.h"
 #include "widgets/statebar.h"
 
 #include <allegro.h>

src/file/gif_format.cpp

@@ -23,9 +23,9 @@
 #include "file/file.h"
 #include "file/file_format.h"
 #include "file/format_options.h"
-#include "gui/alert.h"
 #include "modules/gui.h"
 #include "raster/raster.h"
+#include "ui/alert.h"
 #include "util/autocrop.h"
 
 #include <gif_lib.h>

src/file/jpeg_format.cpp

@@ -28,9 +28,9 @@
 #include "file/file_format.h"
 #include "file/file_handle.h"
 #include "file/format_options.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "raster/raster.h"
+#include "ui/gui.h"
 
 #include <csetjmp>
 #include <cstdio>

src/gfxmode.cpp

@@ -20,15 +20,15 @@
 
 #include <allegro.h>
 
-#include "gui/manager.h"
-#include "gui/frame.h"
+#include "ui/frame.h"
+#include "ui/manager.h"
 
 #include "app.h"
-#include "gfxmode.h"
 #include "console.h"
+#include "document_wrappers.h"
+#include "gfxmode.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
-#include "document_wrappers.h"
 #include "ui_context.h"
 
 //////////////////////////////////////////////////////////////////////

src/gui/gui.h

@@ -1,56 +0,0 @@
-// ASEPRITE gui library
-// Copyright (C) 2001-2012  David Capello
-//
-// This source file is ditributed under a BSD-like license, please
-// read LICENSE.txt for more information.
-
-#ifndef GUI_GUI_H_INCLUDED
-#define GUI_GUI_H_INCLUDED
-
-#include "gui/accel.h"
-#include "gui/alert.h"
-#include "gui/base.h"
-#include "gui/box.h"
-#include "gui/button.h"
-#include "gui/clipboard.h"
-#include "gui/combobox.h"
-#include "gui/component.h"
-#include "gui/custom_label.h"
-#include "gui/draw.h"
-#include "gui/entry.h"
-#include "gui/event.h"
-#include "gui/font.h"
-#include "gui/frame.h"
-#include "gui/graphics.h"
-#include "gui/grid.h"
-#include "gui/hit_test_event.h"
-#include "gui/image_view.h"
-#include "gui/init_theme_event.h"
-#include "gui/label.h"
-#include "gui/link_label.h"
-#include "gui/list.h"
-#include "gui/listbox.h"
-#include "gui/manager.h"
-#include "gui/menu.h"
-#include "gui/message.h"
-#include "gui/paint_event.h"
-#include "gui/popup_frame.h"
-#include "gui/preferred_size_event.h"
-#include "gui/property.h"
-#include "gui/rect.h"
-#include "gui/region.h"
-#include "gui/scroll_bar.h"
-#include "gui/separator.h"
-#include "gui/slider.h"
-#include "gui/splitter.h"
-#include "gui/system.h"
-#include "gui/textbox.h"
-#include "gui/theme.h"
-#include "gui/timer.h"
-#include "gui/tooltips.h"
-#include "gui/view.h"
-#include "gui/viewport.h"
-#include "gui/widget.h"
-#include "gui/widgets_list.h"
-
-#endif

src/ini_file.cpp

@@ -20,8 +20,8 @@
 
 #include "ini_file.h"
 
-#include "gui/rect.h"
 #include "resource_finder.h"
+#include "ui/rect.h"
 
 #include <allegro/config.h>
 #include <allegro/file.h>

src/job.cpp

@@ -22,11 +22,11 @@
 #include "base/mutex.h"
 #include "base/scoped_lock.h"
 #include "base/thread.h"
-#include "gui/alert.h"
-#include "gui/frame.h"
-#include "gui/widget.h"
 #include "job.h"
 #include "modules/gui.h"
+#include "ui/alert.h"
+#include "ui/frame.h"
+#include "ui/widget.h"
 #include "widgets/statebar.h"
 
 Job::Job(const char* job_name)

src/job.h

@@ -19,7 +19,7 @@
 #ifndef JOB_H_INCLUDED
 #define JOB_H_INCLUDED
 
-#include "gui/alert.h"
+#include "ui/alert.h"
 
 namespace base { class thread; }
 

src/launcher.cpp

@@ -19,8 +19,8 @@
 #include "config.h"
 
 #include "base/exception.h"
-#include "gui/alert.h"
 #include "launcher.h"
+#include "ui/alert.h"
 
 #if defined ALLEGRO_WINDOWS
 #define BITMAP WINDOWS_BITMAP

src/log.cpp

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <string>
 
-#include "gui/base.h"
+#include "ui/base.h"
 
 #include "app.h"
 #include "log.h"

src/modules.h

@@ -19,7 +19,7 @@
 #ifndef MODULES_H_INCLUDED
 #define MODULES_H_INCLUDED
 
-#include "gui/base.h"
+#include "ui/base.h"
 
 #define REQUIRE_INTERFACE    1
 

src/modules/editors.cpp

@@ -22,19 +22,19 @@
 
 #include "app.h"
 #include "document_wrappers.h"
-#include "gui/gui.h"
 #include "ini_file.h"
 #include "modules/gui.h"
 #include "modules/palettes.h"
 #include "raster/image.h"
 #include "raster/sprite.h"
+#include "skin/skin_theme.h"
+#include "ui/gui.h"
 #include "ui_context.h"
 #include "util/misc.h"
 #include "widgets/editor/editor.h"
 #include "widgets/editor/editor_customization_delegate.h"
 #include "widgets/editor/editor_view.h"
 #include "widgets/popup_frame_pin.h"
-#include "skin/skin_theme.h"
 #include "widgets/statebar.h"
 
 #include <algorithm>

src/modules/gfx.cpp

@@ -21,10 +21,10 @@
 #include <allegro.h>
 #include <allegro/internal/aintern.h>
 
-#include "gui/intern.h"
-#include "gui/rect.h"
-#include "gui/system.h"
-#include "gui/theme.h"
+#include "ui/intern.h"
+#include "ui/rect.h"
+#include "ui/system.h"
+#include "ui/theme.h"
 
 #include "app.h"
 #include "app/color_utils.h"

src/modules/gfx.h

@@ -21,7 +21,7 @@
 
 #include "app/color.h"
 #include "gfx/rect.h"
-#include "gui/base.h"
+#include "ui/base.h"
 
 struct FONT;
 struct BITMAP;

src/modules/gui.cpp

@@ -29,8 +29,6 @@
 #include "document_wrappers.h"
 #include "drop_files.h"
 #include "gfxmode.h"
-#include "gui/gui.h"
-#include "gui/intern.h"
 #include "ini_file.h"
 #include "modules/editors.h"
 #include "modules/gfx.h"
@@ -43,6 +41,8 @@
 #include "skin/skin_theme.h"
 #include "tools/ink.h"
 #include "tools/tool_box.h"
+#include "ui/gui.h"
+#include "ui/intern.h"
 #include "ui_context.h"
 #include "widgets/editor/editor.h"
 #include "widgets/statebar.h"

src/modules/gui.h

@@ -19,12 +19,12 @@
 #ifndef MODULES_GUI_H_INCLUDED
 #define MODULES_GUI_H_INCLUDED
 
-#include <string>
-#include <list>
 #include "base/exception.h"
-#include "gui/base.h"
-#include "gui/accel.h"
 #include "skin/skin_property.h"
+#include "ui/accel.h"
+#include "ui/base.h"
+#include <list>
+#include <string>
 
 class Command;
 class Document;

src/modules/palettes.cpp

@@ -21,7 +21,7 @@
 #include <allegro.h>
 #include <string.h>
 
-#include "gui/list.h"
+#include "ui/list.h"
 
 #include "app.h"
 #include "modules/palettes.h"

src/modules/rootmenu.cpp

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "gui/gui.h"
+#include "ui/gui.h"
 
 #include "app.h"
 #include "commands/command.h"

src/modules/rootmenu.h

@@ -19,7 +19,7 @@
 #ifndef MODULES_ROOTMENU_H_INCLUDED
 #define MODULES_ROOTMENU_H_INCLUDED
 
-#include "gui/base.h"
+#include "ui/base.h"
 
 namespace ui {
   class Menu;

src/skin/button_icon_impl.h

@@ -19,7 +19,7 @@
 #ifndef BUTTON_ICON_IMPL_H_INCLUDED
 #define BUTTON_ICON_IMPL_H_INCLUDED
 
-#include "gui/button.h"
+#include "ui/button.h"
 
 class SkinTheme;
 

src/skin/skin_property.h

@@ -19,7 +19,7 @@
 #ifndef SKIN_PROPERTY_H_INCLUDED
 #define SKIN_PROPERTY_H_INCLUDED
 
-#include "gui/property.h"
+#include "ui/property.h"
 
 enum LookType {
   NormalLook,

src/skin/skin_theme.cpp

@@ -27,8 +27,6 @@
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "gfx/size.h"
-#include "gui/gui.h"
-#include "gui/intern.h"
 #include "loadpng.h"
 #include "modules/gui.h"
 #include "resource_finder.h"
@@ -36,6 +34,8 @@
 #include "skin/skin_property.h"
 #include "skin/skin_slider_property.h"
 #include "skin/skin_theme.h"
+#include "ui/gui.h"
+#include "ui/intern.h"
 #include "xml_exception.h"
 
 #include "tinyxml.h"

src/skin/skin_theme.h

@@ -24,9 +24,9 @@
 #include <string>
 
 #include "gfx/rect.h"
-#include "gui/rect.h"
-#include "gui/theme.h"
-#include "gui/system.h"
+#include "ui/rect.h"
+#include "ui/system.h"
+#include "ui/theme.h"
 
 #include "skin/skin_parts.h"
 

src/tests/test.h

@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <gtest/gtest.h>
 #include <allegro.h>
+#include <gtest/gtest.h>
 
 #ifdef TEST_GUI
-  #include "gui/gui.h"
+  #include "ui/gui.h"
 #endif
 
 #ifdef main

src/ui/accel.cpp

@@ -10,8 +10,8 @@
 #include <allegro/unicode.h>
 #include <ctype.h>
 
-#include "gui/accel.h"
-#include "gui/list.h"
+#include "ui/accel.h"
+#include "ui/list.h"
 
 /* #define REPORT_KEYS */
 #define PREPROCESS_KEYS

src/ui/accel.h

@@ -4,10 +4,10 @@
 // This source file is ditributed under a BSD-like license, please
 // read LICENSE.txt for more information.
 
-#ifndef GUI_ACCEL_H_INCLUDED
-#define GUI_ACCEL_H_INCLUDED
+#ifndef UI_ACCEL_H_INCLUDED
+#define UI_ACCEL_H_INCLUDED
 
-#include "gui/base.h"
+#include "ui/base.h"
 
 namespace ui {