diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3329d5f00..8962ecd90 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -373,7 +373,7 @@ add_library(aseprite-library widgets/menuitem2.cpp widgets/palette_view.cpp widgets/popup_frame_pin.cpp - widgets/statebar.cpp + widgets/status_bar.cpp widgets/tabs.cpp widgets/toolbar.cpp) diff --git a/src/app.cpp b/src/app.cpp index 4591bccde..aad6b09ec 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -58,7 +58,7 @@ #include "widgets/editor/editor.h" #include "widgets/editor/editor_view.h" #include "widgets/menuitem2.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include "widgets/tabs.h" #include "widgets/toolbar.h" diff --git a/src/app/check_update.cpp b/src/app/check_update.cpp index e53fb90e0..c347dfd0b 100644 --- a/src/app/check_update.cpp +++ b/src/app/check_update.cpp @@ -26,7 +26,7 @@ #include "base/bind.h" #include "ini_file.h" #include "modules/gui.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/commands/cmd_advanced_mode.cpp b/src/commands/cmd_advanced_mode.cpp index cbc0daff8..860f63c2a 100644 --- a/src/commands/cmd_advanced_mode.cpp +++ b/src/commands/cmd_advanced_mode.cpp @@ -26,7 +26,7 @@ #include "modules/gui.h" #include "ui/gui.h" #include "widgets/color_bar.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include "widgets/tabs.h" using namespace ui; diff --git a/src/commands/cmd_close_file.cpp b/src/commands/cmd_close_file.cpp index 95d1e258c..d3e08fa2f 100644 --- a/src/commands/cmd_close_file.cpp +++ b/src/commands/cmd_close_file.cpp @@ -29,7 +29,7 @@ #include "modules/editors.h" #include "raster/sprite.h" #include "ui_context.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/commands/cmd_configure_tools.cpp b/src/commands/cmd_configure_tools.cpp index e47dc7cee..5ef9f5032 100644 --- a/src/commands/cmd_configure_tools.cpp +++ b/src/commands/cmd_configure_tools.cpp @@ -45,7 +45,7 @@ #include "widgets/button_set.h" #include "widgets/color_button.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include diff --git a/src/commands/cmd_goto_layer.cpp b/src/commands/cmd_goto_layer.cpp index 5212091bf..61bd3434a 100644 --- a/src/commands/cmd_goto_layer.cpp +++ b/src/commands/cmd_goto_layer.cpp @@ -25,7 +25,7 @@ #include "raster/layer.h" #include "raster/sprite.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include "document_wrappers.h" ////////////////////////////////////////////////////////////////////// diff --git a/src/commands/cmd_grid.cpp b/src/commands/cmd_grid.cpp index 69061a843..2bba456ef 100644 --- a/src/commands/cmd_grid.cpp +++ b/src/commands/cmd_grid.cpp @@ -29,7 +29,7 @@ #include "settings/settings.h" #include "ui/frame.h" #include "ui_context.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; using namespace gfx; diff --git a/src/commands/cmd_new_frame.cpp b/src/commands/cmd_new_frame.cpp index c371ba4ec..0d9c17db6 100644 --- a/src/commands/cmd_new_frame.cpp +++ b/src/commands/cmd_new_frame.cpp @@ -30,7 +30,7 @@ #include "raster/sprite.h" #include "ui/gui.h" #include "undo_transaction.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include diff --git a/src/commands/cmd_new_layer.cpp b/src/commands/cmd_new_layer.cpp index f0799b747..2930511f7 100644 --- a/src/commands/cmd_new_layer.cpp +++ b/src/commands/cmd_new_layer.cpp @@ -29,7 +29,7 @@ #include "raster/sprite.h" #include "ui/gui.h" #include "undo_transaction.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/commands/cmd_open_file.cpp b/src/commands/cmd_open_file.cpp index 5fe04ce4d..6b20485a6 100644 --- a/src/commands/cmd_open_file.cpp +++ b/src/commands/cmd_open_file.cpp @@ -35,7 +35,7 @@ #include "recent_files.h" #include "ui/gui.h" #include "ui_context.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" ////////////////////////////////////////////////////////////////////// // open_file diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp index b1db81e15..11e7d2c85 100644 --- a/src/commands/cmd_palette_editor.cpp +++ b/src/commands/cmd_palette_editor.cpp @@ -53,7 +53,7 @@ #include "widgets/editor/editor.h" #include "widgets/hex_color_entry.h" #include "widgets/palette_view.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/commands/cmd_preview.cpp b/src/commands/cmd_preview.cpp index dc869c2b6..5301b87a2 100644 --- a/src/commands/cmd_preview.cpp +++ b/src/commands/cmd_preview.cpp @@ -35,7 +35,7 @@ #include "raster/sprite.h" #include "util/render.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/commands/cmd_redo.cpp b/src/commands/cmd_redo.cpp index 06184a1b3..a992440a9 100644 --- a/src/commands/cmd_redo.cpp +++ b/src/commands/cmd_redo.cpp @@ -24,7 +24,7 @@ #include "modules/gui.h" #include "raster/sprite.h" #include "undo/undo_history.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" class RedoCommand : public Command { diff --git a/src/commands/cmd_refresh.cpp b/src/commands/cmd_refresh.cpp index bd3821d72..36e10677a 100644 --- a/src/commands/cmd_refresh.cpp +++ b/src/commands/cmd_refresh.cpp @@ -24,7 +24,7 @@ #include "skin/skin_theme.h" #include "ui/system.h" #include "ui/theme.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include diff --git a/src/commands/cmd_remove_layer.cpp b/src/commands/cmd_remove_layer.cpp index ee0441c02..ff3881c9d 100644 --- a/src/commands/cmd_remove_layer.cpp +++ b/src/commands/cmd_remove_layer.cpp @@ -26,7 +26,7 @@ #include "raster/sprite.h" #include "ui/widget.h" #include "undo_transaction.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" ////////////////////////////////////////////////////////////////////// // remove_layer diff --git a/src/commands/cmd_save_file.cpp b/src/commands/cmd_save_file.cpp index de6651574..5c811edee 100644 --- a/src/commands/cmd_save_file.cpp +++ b/src/commands/cmd_save_file.cpp @@ -31,7 +31,7 @@ #include "raster/sprite.h" #include "recent_files.h" #include "ui/gui.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" struct SaveFileData { diff --git a/src/commands/cmd_undo.cpp b/src/commands/cmd_undo.cpp index 691e28134..ddb96d1ac 100644 --- a/src/commands/cmd_undo.cpp +++ b/src/commands/cmd_undo.cpp @@ -24,7 +24,7 @@ #include "modules/gui.h" #include "raster/sprite.h" #include "undo/undo_history.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" class UndoCommand : public Command { diff --git a/src/commands/filters/filter_worker.cpp b/src/commands/filters/filter_worker.cpp index 703db2f8c..20b134d1e 100644 --- a/src/commands/filters/filter_worker.cpp +++ b/src/commands/filters/filter_worker.cpp @@ -32,7 +32,7 @@ #include "raster/sprite.h" #include "ui/gui.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/console.cpp b/src/console.cpp index 19be58644..57b8e7904 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -29,7 +29,7 @@ #include "app.h" #include "console.h" #include "modules/gui.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/file/file.cpp b/src/file/file.cpp index a4b37a6d4..f0fbd9b7c 100644 --- a/src/file/file.cpp +++ b/src/file/file.cpp @@ -34,7 +34,7 @@ #include "raster/quantization.h" #include "raster/raster.h" #include "ui/alert.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/job.cpp b/src/job.cpp index 607502b24..c75071124 100644 --- a/src/job.cpp +++ b/src/job.cpp @@ -27,7 +27,7 @@ #include "ui/alert.h" #include "ui/frame.h" #include "ui/widget.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" Job::Job(const char* job_name) { diff --git a/src/modules/editors.cpp b/src/modules/editors.cpp index 667e01143..962865f84 100644 --- a/src/modules/editors.cpp +++ b/src/modules/editors.cpp @@ -35,7 +35,7 @@ #include "widgets/editor/editor_customization_delegate.h" #include "widgets/editor/editor_view.h" #include "widgets/popup_frame_pin.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp index a16b0a858..a7f81f64a 100644 --- a/src/modules/gui.cpp +++ b/src/modules/gui.cpp @@ -45,7 +45,7 @@ #include "ui/intern.h" #include "ui_context.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include "widgets/toolbar.h" #include diff --git a/src/util/clipboard.cpp b/src/util/clipboard.cpp index 929fece6c..f26a92525 100644 --- a/src/util/clipboard.cpp +++ b/src/util/clipboard.cpp @@ -48,7 +48,7 @@ #include "util/misc.h" #include "widgets/color_bar.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/util/misc.cpp b/src/util/misc.cpp index e2354bef9..2e2a7fee4 100644 --- a/src/util/misc.cpp +++ b/src/util/misc.cpp @@ -34,7 +34,7 @@ #include "ui/widget.h" #include "util/misc.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" Image* NewImageFromMask(const Document* srcDocument) { diff --git a/src/widgets/color_bar.cpp b/src/widgets/color_bar.cpp index 7ee090d71..b0f2bb7ac 100644 --- a/src/widgets/color_bar.cpp +++ b/src/widgets/color_bar.cpp @@ -33,7 +33,7 @@ #include "ui/message.h" #include "ui_context.h" #include "widgets/color_bar.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/widgets/color_button.cpp b/src/widgets/color_button.cpp index 4453980bb..6abc88e3e 100644 --- a/src/widgets/color_button.cpp +++ b/src/widgets/color_button.cpp @@ -33,7 +33,7 @@ #include "widgets/color_button.h" #include "widgets/color_selector.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/widgets/editor/editor.cpp b/src/widgets/editor/editor.cpp index 13c1baa84..8b0d2d9ed 100644 --- a/src/widgets/editor/editor.cpp +++ b/src/widgets/editor/editor.cpp @@ -51,7 +51,7 @@ #include "widgets/editor/moving_pixels_state.h" #include "widgets/editor/pixels_movement.h" #include "widgets/editor/standby_state.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include "widgets/toolbar.h" #include diff --git a/src/widgets/editor/moving_cel_state.cpp b/src/widgets/editor/moving_cel_state.cpp index fcca89125..a3af077c6 100644 --- a/src/widgets/editor/moving_cel_state.cpp +++ b/src/widgets/editor/moving_cel_state.cpp @@ -28,7 +28,7 @@ #include "ui/message.h" #include "undo_transaction.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/widgets/editor/moving_pixels_state.cpp b/src/widgets/editor/moving_pixels_state.cpp index 1e26cca61..ded60a045 100644 --- a/src/widgets/editor/moving_pixels_state.cpp +++ b/src/widgets/editor/moving_pixels_state.cpp @@ -45,7 +45,7 @@ #include "widgets/editor/pixels_movement.h" #include "widgets/editor/standby_state.h" #include "widgets/editor/transform_handles.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include diff --git a/src/widgets/editor/moving_pixels_state.h b/src/widgets/editor/moving_pixels_state.h index d6f9387f7..a9ff7f087 100644 --- a/src/widgets/editor/moving_pixels_state.h +++ b/src/widgets/editor/moving_pixels_state.h @@ -23,7 +23,7 @@ #include "context_listener.h" #include "widgets/editor/handle_type.h" #include "widgets/editor/standby_state.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" class Editor; class Image; diff --git a/src/widgets/editor/scrolling_state.cpp b/src/widgets/editor/scrolling_state.cpp index a3efd4409..bdc4b95fc 100644 --- a/src/widgets/editor/scrolling_state.cpp +++ b/src/widgets/editor/scrolling_state.cpp @@ -28,7 +28,7 @@ #include "ui/system.h" #include "ui/view.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/widgets/editor/standby_state.cpp b/src/widgets/editor/standby_state.cpp index ac3b6b104..49582ea22 100644 --- a/src/widgets/editor/standby_state.cpp +++ b/src/widgets/editor/standby_state.cpp @@ -48,7 +48,7 @@ #include "widgets/editor/scrolling_state.h" #include "widgets/editor/tool_loop_impl.h" #include "widgets/editor/transform_handles.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include diff --git a/src/widgets/editor/tool_loop_impl.cpp b/src/widgets/editor/tool_loop_impl.cpp index cff0c5bb8..d0fb0f818 100644 --- a/src/widgets/editor/tool_loop_impl.cpp +++ b/src/widgets/editor/tool_loop_impl.cpp @@ -39,7 +39,7 @@ #include "util/expand_cel_canvas.h" #include "widgets/color_bar.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include diff --git a/src/widgets/file_list.cpp b/src/widgets/file_list.cpp index 71ade33cb..73024103e 100644 --- a/src/widgets/file_list.cpp +++ b/src/widgets/file_list.cpp @@ -35,7 +35,7 @@ #include "raster/rotate.h" #include "raster/sprite.h" #include "ui/gui.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/widgets/palette_view.cpp b/src/widgets/palette_view.cpp index 3844ed0ca..50aa2303a 100644 --- a/src/widgets/palette_view.cpp +++ b/src/widgets/palette_view.cpp @@ -38,7 +38,7 @@ #include "ui/view.h" #include "ui/widget.h" #include "widgets/palette_view.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" using namespace ui; diff --git a/src/widgets/statebar.cpp b/src/widgets/status_bar.cpp similarity index 99% rename from src/widgets/statebar.cpp rename to src/widgets/status_bar.cpp index cd24e437e..904412c66 100644 --- a/src/widgets/statebar.cpp +++ b/src/widgets/status_bar.cpp @@ -40,7 +40,7 @@ #include "util/misc.h" #include "widgets/color_button.h" #include "widgets/editor/editor.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include diff --git a/src/widgets/statebar.h b/src/widgets/status_bar.h similarity index 98% rename from src/widgets/statebar.h rename to src/widgets/status_bar.h index f096e4033..9aef0d7d2 100644 --- a/src/widgets/statebar.h +++ b/src/widgets/status_bar.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef WIDGETS_STATEBAR_H_INCLUDED -#define WIDGETS_STATEBAR_H_INCLUDED +#ifndef WIDGETS_STATUS_BAR_H_INCLUDED +#define WIDGETS_STATUS_BAR_H_INCLUDED #include #include diff --git a/src/widgets/toolbar.cpp b/src/widgets/toolbar.cpp index e6b5f53f5..87852658c 100644 --- a/src/widgets/toolbar.cpp +++ b/src/widgets/toolbar.cpp @@ -34,7 +34,7 @@ #include "tools/tool_box.h" #include "ui/gui.h" #include "ui_context.h" -#include "widgets/statebar.h" +#include "widgets/status_bar.h" #include #include