Permalink
Browse files

Merge branch 'new-workspace'

Conflicts:
	src/app/commands/cmd_open_file.cpp

Fixes:
	src/app/ui/timeline.cpp
  • Loading branch information...
dacap committed Mar 5, 2015
2 parents b8ed98b + 75ad955 commit 361a3084fd28f17a3dd6b600f4229ed088c7abdb
Showing with 3,305 additions and 2,106 deletions.
  1. +5 −7 data/gui.xml
  2. +4 −0 data/pref.xml
  3. BIN data/skins/default/sheet.png
  4. +226 −34 data/skins/default/skin.xml
  5. +29 −0 data/widgets/home_view.xml
  6. +25 −23 data/widgets/main_window.xml
  7. +1 −1 src/allegro/include/allegro/debug.h
  8. +19 −7 src/app/CMakeLists.txt
  9. +3 −2 src/app/app.cpp
  10. +4 −0 src/app/app_menus.cpp
  11. +3 −0 src/app/app_menus.h
  12. +15 −20 src/app/check_update.cpp
  13. +4 −6 src/app/check_update.h
  14. +30 −0 src/app/check_update_delegate.h
  15. +20 −108 src/app/commands/cmd_close_file.cpp
  16. +1 −20 src/app/commands/cmd_developer_console.cpp
  17. +1 −1 src/app/commands/cmd_export_sprite_sheet.cpp
  18. +7 −5 src/app/commands/cmd_fullscreen_preview.cpp
  19. +50 −0 src/app/commands/cmd_home.cpp
  20. +4 −4 src/app/commands/cmd_keyboard_shortcuts.cpp
  21. +4 −3 src/app/commands/cmd_new_layer.cpp
  22. +10 −2 src/app/commands/cmd_open_file.cpp
  23. +1 −1 src/app/commands/cmd_options.cpp
  24. +0 −104 src/app/commands/cmd_sprite_editor.cpp
  25. +1 −3 src/app/commands/commands_list.h
  26. +1 −1 src/app/commands/filters/cmd_convolution_matrix.cpp
  27. +2 −3 src/app/recent_files.cpp
  28. +3 −0 src/app/recent_files.h
  29. +79 −0 src/app/res/http_loader.cpp
  30. +38 −0 src/app/res/http_loader.h
  31. +0 −5 src/app/res/resources_loader.cpp
  32. +0 −1 src/app/res/resources_loader.h
  33. +2 −2 src/app/ui/button_set.cpp
  34. +2 −2 src/app/ui/color_bar.cpp
  35. +1 −1 src/app/ui/color_button.cpp
  36. +2 −1 src/app/ui/color_selector.cpp
  37. +1 −1 src/app/ui/context_bar.cpp
  38. +31 −1 src/app/ui/devconsole_view.cpp
  39. +3 −0 src/app/ui/devconsole_view.h
  40. +87 −6 src/app/ui/document_view.cpp
  41. +3 −0 src/app/ui/document_view.h
  42. +5 −5 src/app/ui/editor/editor.cpp
  43. +9 −7 src/app/ui/editor/moving_pixels_state.cpp
  44. +8 −8 src/app/ui/file_list.cpp
  45. +148 −0 src/app/ui/home_view.cpp
  46. +71 −0 src/app/ui/home_view.h
  47. +135 −127 src/app/ui/main_window.cpp
  48. +27 −10 src/app/ui/main_window.h
  49. +309 −0 src/app/ui/news_listbox.cpp
  50. +39 −0 src/app/ui/news_listbox.h
  51. +1 −3 src/app/ui/notifications.cpp
  52. +157 −0 src/app/ui/recent_listbox.cpp
  53. +53 −0 src/app/ui/recent_listbox.h
  54. +4 −4 src/app/ui/resources_listbox.cpp
  55. +25 −0 src/app/ui/skin/background_repeat.h
  56. +5 −4 src/app/ui/skin/skin_part.h
  57. +0 −8 src/app/ui/skin/skin_parts.h
  58. +31 −0 src/app/ui/skin/skin_style_property.cpp
  59. +37 −0 src/app/ui/skin/skin_style_property.h
  60. +151 −173 src/app/ui/skin/skin_theme.cpp
  61. +12 −73 src/app/ui/skin/skin_theme.h
  62. +44 −9 src/app/ui/skin/style.cpp
  63. +14 −3 src/app/ui/skin/style.h
  64. +26 −0 src/app/ui/skin/style_sheet.cpp
  65. +8 −0 src/app/ui/skin/style_sheet.h
  66. +0 −54 src/app/ui/start_view.cpp
  67. +0 −39 src/app/ui/start_view.h
  68. +0 −38 src/app/ui/status_bar.cpp
  69. +0 −4 src/app/ui/status_bar.h
  70. +4 −2 src/app/ui/styled_button.cpp
  71. +1 −1 src/app/ui/styled_button.h
  72. +378 −411 src/app/ui/tabs.cpp
  73. +45 −27 src/app/ui/tabs.h
  74. +54 −96 src/app/ui/timeline.cpp
  75. +7 −30 src/app/ui/timeline.h
  76. +5 −5 src/app/ui/toolbar.cpp
  77. +26 −175 src/app/ui/workspace.cpp
  78. +12 −14 src/app/ui/workspace.h
  79. +0 −87 src/app/ui/workspace_part.cpp
  80. +0 −40 src/app/ui/workspace_part.h
  81. +7 −0 src/app/ui/workspace_view.h
  82. +3 −5 src/app/ui_context.cpp
  83. +37 −1 src/app/widget_loader.cpp
  84. +2 −1 src/base/CMakeLists.txt
  85. +13 −1 src/base/convert_to.cpp
  86. +4 −1 src/base/convert_to.h
  87. +4 −3 src/base/exception.cpp
  88. +5 −1 src/base/fs.h
  89. +16 −1 src/base/fs_unix.h
  90. +20 −1 src/base/fs_win32.h
  91. +2 −2 src/base/mem_utils.h
  92. +6 −4 src/base/memory.h
  93. +2 −2 src/base/observers.h
  94. +3 −3 src/base/program_options.cpp
  95. +5 −5 src/base/recent_items.h
  96. +2 −2 src/base/replace_string.cpp
  97. +1 −1 src/base/sha1.cpp
  98. +3 −3 src/base/split_string.cpp
  99. +2 −2 src/base/string.cpp
  100. +40 −0 src/base/time.cpp
  101. +53 −0 src/base/time.h
  102. +4 −4 src/base/version.h
  103. +1 −0 src/config.h
  104. +2 −2 src/doc/cel.cpp
  105. +1 −1 src/doc/cel.h
  106. +9 −9 src/doc/file/col_file.cpp
  107. +5 −4 src/doc/image_buffer.h
  108. +13 −10 src/doc/image_impl.h
  109. +6 −6 src/doc/image_tests.cpp
  110. +2 −2 src/doc/images_collector.h
  111. +4 −3 src/doc/palette.cpp
  112. +2 −2 src/doc/sprite.cpp
  113. +2 −2 src/filters/median_filter.h
  114. +2 −2 src/gen/CMakeLists.txt
  115. +2 −2 src/gen/common.h
  116. +5 −1 src/gen/gen.cpp
  117. +173 −0 src/gen/skin_class.cpp
  118. +16 −0 src/gen/skin_class.h
  119. +10 −3 src/gen/ui_class.cpp
  120. +2 −2 src/gfx/packing_rects.h
  121. +3 −3 src/gfx/region.cpp
  122. +2 −2 src/gfx/region.h
  123. +2 −2 src/gfx/transformation.cpp
  124. +2 −2 src/gfx/transformation.h
  125. +6 −2 src/net/http_request.cpp
  126. +1 −1 src/net/http_response.cpp
  127. +2 −2 src/net/http_response.h
  128. +8 −8 src/render/color_histogram.h
  129. +13 −13 src/render/median_cut.h
  130. +2 −2 src/ui/accelerator.cpp
  131. +2 −2 src/ui/accelerator.h
  132. +8 −12 src/ui/combobox.cpp
  133. +4 −4 src/ui/entry.cpp
  134. +3 −3 src/ui/entry.h
  135. +9 −4 src/ui/graphics.cpp
  136. +4 −4 src/ui/grid.cpp
  137. +1 −11 src/ui/label.cpp
  138. +2 −9 src/ui/label.h
  139. +36 −9 src/ui/link_label.cpp
  140. +2 −1 src/ui/link_label.h
  141. +14 −19 src/ui/listbox.cpp
  142. +4 −4 src/ui/listbox.h
  143. +7 −6 src/ui/manager.cpp
  144. +2 −2 src/ui/move_region.cpp
  145. +50 −29 src/ui/splitter.cpp
  146. +4 −1 src/ui/splitter.h
  147. +5 −3 src/ui/theme.cpp
  148. +3 −3 src/ui/view.cpp
  149. +20 −6 src/ui/widget.cpp
  150. +4 −2 src/ui/widget.h
  151. +10 −3 src/undo/undo_tests.cpp
  152. +4 −4 src/updater/check_update.cpp
  153. +2 −2 src/updater/check_update.h
View
@@ -89,9 +89,6 @@
<key command="InvertMask" shortcut="Ctrl+Shift+I" mac="Cmd+Shift+I" />
<!-- View -->
<key command="Refresh" shortcut="F5" />
<key command="MakeUniqueEditor" shortcut="Ctrl+1" mac="Cmd+1" />
<key command="SplitEditorVertically" shortcut="Ctrl+2" mac="Cmd+2" />
<key command="SplitEditorHorizontally" shortcut="Ctrl+3" mac="Cmd+3" />
<key command="TogglePreview" shortcut="F7" />
<key command="FullscreenPreview" shortcut="F8" />
<key command="ShowGrid" shortcut="Shift+G" />
@@ -566,10 +563,6 @@
<item command="SaveMask" text="&amp;Save to MSK file" />
</menu>
<menu text="&amp;View">
<item command="MakeUniqueEditor" text="Make &amp;Unique" />
<item command="SplitEditorVertically" text="Split &amp;Vertically" />
<item command="SplitEditorHorizontally" text="Split &amp;Horizontally" />
<separator />
<item command="ShowPixelGrid" text="Show &amp;Pixel Grid" />
<item command="ShowGrid" text="Show &amp;Grid" />
<item command="SnapToGrid" text="&amp;Snap to Grid" />
@@ -583,6 +576,7 @@
</item>
<item command="TogglePreview" text="Previe&amp;w" />
<item command="FullscreenPreview" text="&amp;Fullscreen Preview" />
<item command="Home" text="&amp;Home" />
<separator />
<item command="Refresh" text="&amp;Refresh &amp;&amp; Reload Skin" />
</menu>
@@ -622,6 +616,10 @@
</menu>
</menu>
<menu id="tab_popup">
<item command="CloseFile" text="&amp;Close" />
</menu>
<menu id="document_tab_popup">
<item command="CloseFile" text="&amp;Close" />
<separator />
View
@@ -47,6 +47,7 @@
<global>
<section id="general">
<option id="visible_timeline" type="bool" default="false" />
<option id="autoshow_timeline" type="bool" default="true" migrate="Options.AutoShowTimeline" />
<option id="expand_menubar_on_mouseover" type="bool" default="false" migrate="Options.ExpandMenuBarOnMouseover" />
</section>
@@ -71,6 +72,9 @@
<option id="use_native_file_dialog" type="bool" default="false" />
<option id="flash_layer" type="bool" default="false" migrate="Options.FlashLayer" />
</section>
<section id="news">
<option id="cache_file" type="std::string" />
</section>
</global>
<tool>
Binary file not shown.
View
@@ -3,6 +3,15 @@
author="Ilija Melentijevic &amp; David Capello"
url="http://ilkke.blogspot.com/">
<dimensions>
<dim id="tabs_width" value="80" />
<dim id="tabs_height" value="17" />
<dim id="tabs_empty_height" value="5" />
<dim id="tabs_close_icon_width" value="14" />
<dim id="tabs_close_icon_height" value="12" />
<dim id="tabs_icon_width" value="10" />
</dimensions>
<colors>
<color id="text" value="#000000" />
<color id="disabled" value="#968275" />
@@ -15,7 +24,8 @@
<color id="textbox_text" value="#000000" />
<color id="textbox_face" value="#ffffff" />
<color id="entry_suffix" value="#c6c6c6" />
<color id="link_text" value="#0000ff" />
<color id="link_text" value="#2c4c91" />
<color id="link_hover" value="#ff5555" />
<color id="button_normal_text" value="#000000" />
<color id="button_normal_face" value="#c6c6c6" />
<color id="button_hot_text" value="#000000" />
@@ -48,8 +58,8 @@
<color id="slider_full_face" value="#7d929e" />
<color id="tab_normal_text" value="#000000" />
<color id="tab_normal_face" value="#c6c6c6" />
<color id="tab_selected_text" value="#ffffff" />
<color id="tab_selected_face" value="#7d929e" />
<color id="tab_active_text" value="#ffffff" />
<color id="tab_active_face" value="#7d929e" />
<color id="splitter_normal_face" value="#7d929e" />
<color id="scrollbar_bg_face" value="#7d929e" />
<color id="scrollbar_thumb_face" value="#c6c6c6" />
@@ -64,6 +74,9 @@
<color id="filelist_selected_row_face" value="#ff5555" />
<color id="filelist_disabled_row_text" value="#ffc8c8" />
<color id="workspace" value="#7d929e" />
<color id="workspace_text" value="#655561" />
<color id="workspace_link" value="#655561" />
<color id="workspace_link_hover" value="#ffff7d" />
<color id="timeline_normal" value="#c6c6c6" />
<color id="timeline_normal_text" value="#000000" />
<color id="timeline_hover" value="#d9d9d9" />
@@ -214,12 +227,20 @@
<part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
<part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
<part id="tab_selected" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
<part id="tab_bottom_selected" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
<part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
<part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
<part id="tab_bottom_normal" x="2" y="124" w="12" h="5" />
<part id="tab_filler" x="0" y="112" w="2" h="12" />
<part id="editor_normal" x="32" y="112" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
<part id="editor_selected" x="48" y="112" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
<part id="tab_modified_icon_normal" x="32" y="112" w="5" h="5" />
<part id="tab_modified_icon_active" x="32" y="117" w="5" h="5" />
<part id="tab_close_icon_normal" x="37" y="112" w="5" h="5" />
<part id="tab_close_icon_active" x="37" y="117" w="5" h="5" />
<part id="tab_icon_bg_clicked" x="42" y="112" w="14" h="12" />
<part id="tab_icon_bg_hover" x="56" y="112" w="14" h="12" />
<part id="tab_home_icon_normal" x="32" y="240" w="7" h="8" />
<part id="tab_home_icon_active" x="40" y="240" w="7" h="8" />
<part id="editor_normal" x="40" y="96" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
<part id="editor_selected" x="56" y="96" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
<part id="colorbar_0" x="0" y="192" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
<part id="colorbar_1" x="16" y="192" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
<part id="colorbar_2" x="0" y="208" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
@@ -307,15 +328,15 @@
<part id="timeline_empty_frame_active" x="252" y="60" w="12" h="12" />
<part id="timeline_keyframe_normal" x="240" y="72" w="12" h="12" />
<part id="timeline_keyframe_active" x="252" y="72" w="12" h="12" />
<part id="timeline_fromleft_normal" x="240" y="84" w="12" h="12" />
<part id="timeline_fromleft_active" x="252" y="84" w="12" h="12" />
<part id="timeline_fromright_normal" x="240" y="96" w="12" h="12" />
<part id="timeline_fromright_active" x="252" y="96" w="12" h="12" />
<part id="timeline_fromboth_normal" x="240" y="108" w="12" h="12" />
<part id="timeline_fromboth_active" x="252" y="108" w="12" h="12" />
<part id="timeline_leftlink_active" x="264" y="84" w="12" h="12" />
<part id="timeline_bothlinks_active" x="264" y="96" w="12" h="12" />
<part id="timeline_rightlink_active" x="264" y="108" w="12" h="12" />
<part id="timeline_from_left_normal" x="240" y="84" w="12" h="12" />
<part id="timeline_from_left_active" x="252" y="84" w="12" h="12" />
<part id="timeline_from_right_normal" x="240" y="96" w="12" h="12" />
<part id="timeline_from_right_active" x="252" y="96" w="12" h="12" />
<part id="timeline_from_both_normal" x="240" y="108" w="12" h="12" />
<part id="timeline_from_both_active" x="252" y="108" w="12" h="12" />
<part id="timeline_left_link_active" x="264" y="84" w="12" h="12" />
<part id="timeline_both_links_active" x="264" y="96" w="12" h="12" />
<part id="timeline_right_link_active" x="264" y="108" w="12" h="12" />
<part id="timeline_gear" x="264" y="12" w="12" h="12" />
<part id="timeline_gear_active" x="264" y="24" w="12" h="12" />
<part id="timeline_onionskin" x="264" y="36" w="12" h="12" />
@@ -355,6 +376,27 @@
<stylesheet>
<!-- label -->
<style id="label">
<text color="text" />
</style>
<!-- link -->
<style id="link">
<text color="link_text" />
</style>
<style id="link:hover">
<text color="link_hover" />
</style>
<!-- view -->
<style id="view">
<background part="sunken_normal" />
</style>
<style id="view:active">
<background part="sunken_focused" />
</style>
<!-- window -->
<style id="window">
<background color="window_face" part="window" />
@@ -485,35 +527,35 @@
<icon part="timeline_keyframe_active" />
</style>
<style id="timeline_fromleft">
<icon part="timeline_fromleft_normal" />
<style id="timeline_from_left">
<icon part="timeline_from_left_normal" />
</style>
<style id="timeline_fromleft:active">
<icon part="timeline_fromleft_active" />
<style id="timeline_from_left:active">
<icon part="timeline_from_left_active" />
</style>
<style id="timeline_fromright">
<icon part="timeline_fromright_normal" />
<style id="timeline_from_right">
<icon part="timeline_from_right_normal" />
</style>
<style id="timeline_fromright:active">
<icon part="timeline_fromright_active" />
<style id="timeline_from_right:active">
<icon part="timeline_from_right_active" />
</style>
<style id="timeline_fromboth">
<icon part="timeline_fromboth_normal" />
<style id="timeline_from_both">
<icon part="timeline_from_both_normal" />
</style>
<style id="timeline_fromboth:active">
<icon part="timeline_fromboth_active" />
<style id="timeline_from_both:active">
<icon part="timeline_from_both_active" />
</style>
<style id="timeline_leftlink">
<icon part="timeline_leftlink_active" />
<style id="timeline_left_link">
<icon part="timeline_left_link_active" />
</style>
<style id="timeline_rightlink">
<icon part="timeline_rightlink_active" />
<style id="timeline_right_link">
<icon part="timeline_right_link_active" />
</style>
<style id="timeline_bothlinks">
<icon part="timeline_bothlinks_active" />
<style id="timeline_both_links">
<icon part="timeline_both_links_active" />
</style>
<!-- timeline_gear -->
@@ -602,6 +644,156 @@
<background color="hot_face" />
</style>
<!-- tab -->
<style id="tab">
<background part="tab_normal" color="tab_normal_face" repeat="repeat-x" />
<text color="tab_normal_text" align="left" valign="middle" padding-left="4" padding-top="2" />
</style>
<style id="tab:active">
<background part="tab_active" color="tab_active_face" />
<text color="tab_active_text" />
</style>
<!-- tab_text -->
<style id="tab_text">
<text color="tab_normal_text" align="left" valign="middle" padding-left="4" padding-top="2" />
</style>
<style id="tab_text:active">
<text color="tab_active_text" />
</style>
<!-- tab_bottom -->
<style id="tab_bottom">
<background part="tab_bottom_normal" color="tab_normal_face" repeat="repeat-x" />
</style>
<style id="tab_bottom:active">
<background part="tab_bottom_active" color="tab_active_face" />
</style>
<!-- tab_filler -->
<style id="tab_filler">
<background part="tab_filler" color="window_face" repeat="repeat-x" />
</style>
<!-- tab_icon -->
<style id="tab_icon">
<icon align="left" valign="middle" x="3" />
</style>
<style id="tab_icon:hover">
<background part="tab_icon_bg_hover" />
</style>
<style id="tab_icon:clicked">
<background part="tab_icon_bg_clicked" />
</style>
<!-- tab_close_icon -->
<style id="tab_close_icon" base="tab_icon">
<icon part="tab_close_icon_normal" />
</style>
<style id="tab_close_icon:hover">
<icon part="tab_close_icon_normal" />
</style>
<style id="tab_close_icon:active">
<icon part="tab_close_icon_active" />
</style>
<style id="tab_close_icon:clicked">
<icon part="tab_close_icon_normal" />
</style>
<!-- tab_modified_icon -->
<style id="tab_modified_icon" base="tab_icon">
<icon part="tab_modified_icon_normal" />
</style>
<style id="tab_modified_icon:hover">
<icon part="tab_modified_icon_normal" />
</style>
<style id="tab_modified_icon:active">
<icon part="tab_modified_icon_active" />
</style>
<style id="tab_modified_icon:clicked">
<icon part="tab_modified_icon_normal" />
</style>
<!-- tab_home -->
<style id="tab_home">
<icon part="tab_home_icon_normal" align="left" valign="middle" x="4" y="1" />
</style>
<style id="tab_home:active">
<icon part="tab_home_icon_active" />
</style>
<!-- workspace_label -->
<style id="workspace_label">
<text color="workspace_text" />
</style>
<!-- workspace_link -->
<style id="workspace_link">
<text color="workspace_link" valign="middle" />
</style>
<style id="workspace_link:hover">
<text color="workspace_link_hover" />
</style>
<!-- workspace_link -->
<style id="workspace_update_link" base="workspace_link">
<background part="button_normal" color="button_normal_face" />
<icon part="warning_box" align="right" x="-4" y="4" />
<text padding-left="4" />
</style>
<style id="workspace_update_link:hover">
<background part="button_hot" color="button_hot_face" />
<text color="button_hot_text" />
</style>
<style id="workspace_update_link:clicked">
<background part="button_selected" color="button_selected_face" />
<text color="button_selected_text" />
</style>
<!-- workspace_view -->
<style id="workspace_view">
<background part="editor_normal" />
</style>
<style id="workspace_view:active">
<background part="editor_selected" />
</style>
<!-- recent_file -->
<style id="recent_file">
<background color="background" />
<text color="text" valign="middle" padding-left="2" padding-right="2" padding-top="3" padding-bottom="1" />
</style>
<style id="recent_file:hover">
<background color="menuitem_hot_face" />
</style>
<style id="recent_file:active">
<background color="listitem_selected_face" />
<text color="listitem_selected_text" />
</style>
<!-- recent_file_detail -->
<style id="recent_file_detail" base="recent_file">
<text color="disabled" valign="top" wordwrap="true" />
</style>
<!-- news_item -->
<style id="news_item">
<background color="background" />
<text color="text" valign="middle" padding-left="2" padding-right="2" padding-top="3" padding-bottom="3" />
</style>
<style id="news_item:hover">
<background color="menuitem_hot_face" />
</style>
<style id="news_item:active">
<background color="listitem_selected_face" />
<text color="listitem_selected_text" />
</style>
<!-- news_item_detail -->
<style id="news_item_detail" base="news_item">
<text color="disabled" valign="top" wordwrap="true" padding-top="0" padding-bottom="0" />
</style>
</stylesheet>
</skin>
Oops, something went wrong.

0 comments on commit 361a308

Please sign in to comment.