Skip to content

Commit 361a308

Browse files
dacapdacap
committed
Merge branch 'new-workspace'
Conflicts: src/app/commands/cmd_open_file.cpp Fixes: src/app/ui/timeline.cpp
2 parents b8ed98b + 75ad955 commit 361a308

File tree

153 files changed

+3305
-2106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+3305
-2106
lines changed

‎data/gui.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
<key command="InvertMask" shortcut="Ctrl+Shift+I" mac="Cmd+Shift+I" />
9090
<!-- View -->
9191
<key command="Refresh" shortcut="F5" />
92-
<key command="MakeUniqueEditor" shortcut="Ctrl+1" mac="Cmd+1" />
93-
<key command="SplitEditorVertically" shortcut="Ctrl+2" mac="Cmd+2" />
94-
<key command="SplitEditorHorizontally" shortcut="Ctrl+3" mac="Cmd+3" />
9592
<key command="TogglePreview" shortcut="F7" />
9693
<key command="FullscreenPreview" shortcut="F8" />
9794
<key command="ShowGrid" shortcut="Shift+G" />
@@ -566,10 +563,6 @@
566563
<item command="SaveMask" text="&amp;Save to MSK file" />
567564
</menu>
568565
<menu text="&amp;View">
569-
<item command="MakeUniqueEditor" text="Make &amp;Unique" />
570-
<item command="SplitEditorVertically" text="Split &amp;Vertically" />
571-
<item command="SplitEditorHorizontally" text="Split &amp;Horizontally" />
572-
<separator />
573566
<item command="ShowPixelGrid" text="Show &amp;Pixel Grid" />
574567
<item command="ShowGrid" text="Show &amp;Grid" />
575568
<item command="SnapToGrid" text="&amp;Snap to Grid" />
@@ -583,6 +576,7 @@
583576
</item>
584577
<item command="TogglePreview" text="Previe&amp;w" />
585578
<item command="FullscreenPreview" text="&amp;Fullscreen Preview" />
579+
<item command="Home" text="&amp;Home" />
586580
<separator />
587581
<item command="Refresh" text="&amp;Refresh &amp;&amp; Reload Skin" />
588582
</menu>
@@ -622,6 +616,10 @@
622616
</menu>
623617
</menu>
624618

619+
<menu id="tab_popup">
620+
<item command="CloseFile" text="&amp;Close" />
621+
</menu>
622+
625623
<menu id="document_tab_popup">
626624
<item command="CloseFile" text="&amp;Close" />
627625
<separator />

‎data/pref.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747

4848
<global>
4949
<section id="general">
50+
<option id="visible_timeline" type="bool" default="false" />
5051
<option id="autoshow_timeline" type="bool" default="true" migrate="Options.AutoShowTimeline" />
5152
<option id="expand_menubar_on_mouseover" type="bool" default="false" migrate="Options.ExpandMenuBarOnMouseover" />
5253
</section>
@@ -71,6 +72,9 @@
7172
<option id="use_native_file_dialog" type="bool" default="false" />
7273
<option id="flash_layer" type="bool" default="false" migrate="Options.FlashLayer" />
7374
</section>
75+
<section id="news">
76+
<option id="cache_file" type="std::string" />
77+
</section>
7478
</global>
7579

7680
<tool>

‎data/skins/default/sheet.png‎

178 Bytes
Loading

‎data/skins/default/skin.xml‎

Lines changed: 226 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
author="Ilija Melentijevic &amp; David Capello"
44
url="http://ilkke.blogspot.com/">
55

6+
<dimensions>
7+
<dim id="tabs_width" value="80" />
8+
<dim id="tabs_height" value="17" />
9+
<dim id="tabs_empty_height" value="5" />
10+
<dim id="tabs_close_icon_width" value="14" />
11+
<dim id="tabs_close_icon_height" value="12" />
12+
<dim id="tabs_icon_width" value="10" />
13+
</dimensions>
14+
615
<colors>
716
<color id="text" value="#000000" />
817
<color id="disabled" value="#968275" />
@@ -15,7 +24,8 @@
1524
<color id="textbox_text" value="#000000" />
1625
<color id="textbox_face" value="#ffffff" />
1726
<color id="entry_suffix" value="#c6c6c6" />
18-
<color id="link_text" value="#0000ff" />
27+
<color id="link_text" value="#2c4c91" />
28+
<color id="link_hover" value="#ff5555" />
1929
<color id="button_normal_text" value="#000000" />
2030
<color id="button_normal_face" value="#c6c6c6" />
2131
<color id="button_hot_text" value="#000000" />
@@ -48,8 +58,8 @@
4858
<color id="slider_full_face" value="#7d929e" />
4959
<color id="tab_normal_text" value="#000000" />
5060
<color id="tab_normal_face" value="#c6c6c6" />
51-
<color id="tab_selected_text" value="#ffffff" />
52-
<color id="tab_selected_face" value="#7d929e" />
61+
<color id="tab_active_text" value="#ffffff" />
62+
<color id="tab_active_face" value="#7d929e" />
5363
<color id="splitter_normal_face" value="#7d929e" />
5464
<color id="scrollbar_bg_face" value="#7d929e" />
5565
<color id="scrollbar_thumb_face" value="#c6c6c6" />
@@ -64,6 +74,9 @@
6474
<color id="filelist_selected_row_face" value="#ff5555" />
6575
<color id="filelist_disabled_row_text" value="#ffc8c8" />
6676
<color id="workspace" value="#7d929e" />
77+
<color id="workspace_text" value="#655561" />
78+
<color id="workspace_link" value="#655561" />
79+
<color id="workspace_link_hover" value="#ffff7d" />
6780
<color id="timeline_normal" value="#c6c6c6" />
6881
<color id="timeline_normal_text" value="#000000" />
6982
<color id="timeline_hover" value="#d9d9d9" />
@@ -214,12 +227,20 @@
214227
<part id="toolbutton_last" x="96" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
215228
<part id="toolbutton_pushed" x="112" y="16" w1="3" w2="10" w3="3" h1="3" h2="9" h3="4" />
216229
<part id="tab_normal" x="2" y="112" w1="4" w2="5" w3="5" h1="4" h2="6" h3="2" />
217-
<part id="tab_selected" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
218-
<part id="tab_bottom_selected" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
230+
<part id="tab_active" x="16" y="112" w1="4" w2="7" w3="5" h1="4" h2="6" h3="2" />
231+
<part id="tab_bottom_active" x="16" y="124" w1="4" w2="7" w3="5" h1="2" h2="1" h3="2" />
219232
<part id="tab_bottom_normal" x="2" y="124" w="12" h="5" />
220233
<part id="tab_filler" x="0" y="112" w="2" h="12" />
221-
<part id="editor_normal" x="32" y="112" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
222-
<part id="editor_selected" x="48" y="112" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
234+
<part id="tab_modified_icon_normal" x="32" y="112" w="5" h="5" />
235+
<part id="tab_modified_icon_active" x="32" y="117" w="5" h="5" />
236+
<part id="tab_close_icon_normal" x="37" y="112" w="5" h="5" />
237+
<part id="tab_close_icon_active" x="37" y="117" w="5" h="5" />
238+
<part id="tab_icon_bg_clicked" x="42" y="112" w="14" h="12" />
239+
<part id="tab_icon_bg_hover" x="56" y="112" w="14" h="12" />
240+
<part id="tab_home_icon_normal" x="32" y="240" w="7" h="8" />
241+
<part id="tab_home_icon_active" x="40" y="240" w="7" h="8" />
242+
<part id="editor_normal" x="40" y="96" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
243+
<part id="editor_selected" x="56" y="96" w1="3" w2="10" w3="3" h1="3" h2="10" h3="3" />
223244
<part id="colorbar_0" x="0" y="192" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
224245
<part id="colorbar_1" x="16" y="192" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
225246
<part id="colorbar_2" x="0" y="208" w1="5" w2="6" w3="5" h1="5" h2="6" h3="5" />
@@ -307,15 +328,15 @@
307328
<part id="timeline_empty_frame_active" x="252" y="60" w="12" h="12" />
308329
<part id="timeline_keyframe_normal" x="240" y="72" w="12" h="12" />
309330
<part id="timeline_keyframe_active" x="252" y="72" w="12" h="12" />
310-
<part id="timeline_fromleft_normal" x="240" y="84" w="12" h="12" />
311-
<part id="timeline_fromleft_active" x="252" y="84" w="12" h="12" />
312-
<part id="timeline_fromright_normal" x="240" y="96" w="12" h="12" />
313-
<part id="timeline_fromright_active" x="252" y="96" w="12" h="12" />
314-
<part id="timeline_fromboth_normal" x="240" y="108" w="12" h="12" />
315-
<part id="timeline_fromboth_active" x="252" y="108" w="12" h="12" />
316-
<part id="timeline_leftlink_active" x="264" y="84" w="12" h="12" />
317-
<part id="timeline_bothlinks_active" x="264" y="96" w="12" h="12" />
318-
<part id="timeline_rightlink_active" x="264" y="108" w="12" h="12" />
331+
<part id="timeline_from_left_normal" x="240" y="84" w="12" h="12" />
332+
<part id="timeline_from_left_active" x="252" y="84" w="12" h="12" />
333+
<part id="timeline_from_right_normal" x="240" y="96" w="12" h="12" />
334+
<part id="timeline_from_right_active" x="252" y="96" w="12" h="12" />
335+
<part id="timeline_from_both_normal" x="240" y="108" w="12" h="12" />
336+
<part id="timeline_from_both_active" x="252" y="108" w="12" h="12" />
337+
<part id="timeline_left_link_active" x="264" y="84" w="12" h="12" />
338+
<part id="timeline_both_links_active" x="264" y="96" w="12" h="12" />
339+
<part id="timeline_right_link_active" x="264" y="108" w="12" h="12" />
319340
<part id="timeline_gear" x="264" y="12" w="12" h="12" />
320341
<part id="timeline_gear_active" x="264" y="24" w="12" h="12" />
321342
<part id="timeline_onionskin" x="264" y="36" w="12" h="12" />
@@ -355,6 +376,27 @@
355376

356377
<stylesheet>
357378

379+
<!-- label -->
380+
<style id="label">
381+
<text color="text" />
382+
</style>
383+
384+
<!-- link -->
385+
<style id="link">
386+
<text color="link_text" />
387+
</style>
388+
<style id="link:hover">
389+
<text color="link_hover" />
390+
</style>
391+
392+
<!-- view -->
393+
<style id="view">
394+
<background part="sunken_normal" />
395+
</style>
396+
<style id="view:active">
397+
<background part="sunken_focused" />
398+
</style>
399+
358400
<!-- window -->
359401
<style id="window">
360402
<background color="window_face" part="window" />
@@ -485,35 +527,35 @@
485527
<icon part="timeline_keyframe_active" />
486528
</style>
487529

488-
<style id="timeline_fromleft">
489-
<icon part="timeline_fromleft_normal" />
530+
<style id="timeline_from_left">
531+
<icon part="timeline_from_left_normal" />
490532
</style>
491-
<style id="timeline_fromleft:active">
492-
<icon part="timeline_fromleft_active" />
533+
<style id="timeline_from_left:active">
534+
<icon part="timeline_from_left_active" />
493535
</style>
494536

495-
<style id="timeline_fromright">
496-
<icon part="timeline_fromright_normal" />
537+
<style id="timeline_from_right">
538+
<icon part="timeline_from_right_normal" />
497539
</style>
498-
<style id="timeline_fromright:active">
499-
<icon part="timeline_fromright_active" />
540+
<style id="timeline_from_right:active">
541+
<icon part="timeline_from_right_active" />
500542
</style>
501543

502-
<style id="timeline_fromboth">
503-
<icon part="timeline_fromboth_normal" />
544+
<style id="timeline_from_both">
545+
<icon part="timeline_from_both_normal" />
504546
</style>
505-
<style id="timeline_fromboth:active">
506-
<icon part="timeline_fromboth_active" />
547+
<style id="timeline_from_both:active">
548+
<icon part="timeline_from_both_active" />
507549
</style>
508550

509-
<style id="timeline_leftlink">
510-
<icon part="timeline_leftlink_active" />
551+
<style id="timeline_left_link">
552+
<icon part="timeline_left_link_active" />
511553
</style>
512-
<style id="timeline_rightlink">
513-
<icon part="timeline_rightlink_active" />
554+
<style id="timeline_right_link">
555+
<icon part="timeline_right_link_active" />
514556
</style>
515-
<style id="timeline_bothlinks">
516-
<icon part="timeline_bothlinks_active" />
557+
<style id="timeline_both_links">
558+
<icon part="timeline_both_links_active" />
517559
</style>
518560

519561
<!-- timeline_gear -->
@@ -602,6 +644,156 @@
602644
<background color="hot_face" />
603645
</style>
604646

647+
<!-- tab -->
648+
<style id="tab">
649+
<background part="tab_normal" color="tab_normal_face" repeat="repeat-x" />
650+
<text color="tab_normal_text" align="left" valign="middle" padding-left="4" padding-top="2" />
651+
</style>
652+
<style id="tab:active">
653+
<background part="tab_active" color="tab_active_face" />
654+
<text color="tab_active_text" />
655+
</style>
656+
657+
<!-- tab_text -->
658+
<style id="tab_text">
659+
<text color="tab_normal_text" align="left" valign="middle" padding-left="4" padding-top="2" />
660+
</style>
661+
<style id="tab_text:active">
662+
<text color="tab_active_text" />
663+
</style>
664+
665+
<!-- tab_bottom -->
666+
<style id="tab_bottom">
667+
<background part="tab_bottom_normal" color="tab_normal_face" repeat="repeat-x" />
668+
</style>
669+
<style id="tab_bottom:active">
670+
<background part="tab_bottom_active" color="tab_active_face" />
671+
</style>
672+
673+
<!-- tab_filler -->
674+
<style id="tab_filler">
675+
<background part="tab_filler" color="window_face" repeat="repeat-x" />
676+
</style>
677+
678+
<!-- tab_icon -->
679+
<style id="tab_icon">
680+
<icon align="left" valign="middle" x="3" />
681+
</style>
682+
<style id="tab_icon:hover">
683+
<background part="tab_icon_bg_hover" />
684+
</style>
685+
<style id="tab_icon:clicked">
686+
<background part="tab_icon_bg_clicked" />
687+
</style>
688+
689+
<!-- tab_close_icon -->
690+
<style id="tab_close_icon" base="tab_icon">
691+
<icon part="tab_close_icon_normal" />
692+
</style>
693+
<style id="tab_close_icon:hover">
694+
<icon part="tab_close_icon_normal" />
695+
</style>
696+
<style id="tab_close_icon:active">
697+
<icon part="tab_close_icon_active" />
698+
</style>
699+
<style id="tab_close_icon:clicked">
700+
<icon part="tab_close_icon_normal" />
701+
</style>
702+
703+
<!-- tab_modified_icon -->
704+
<style id="tab_modified_icon" base="tab_icon">
705+
<icon part="tab_modified_icon_normal" />
706+
</style>
707+
<style id="tab_modified_icon:hover">
708+
<icon part="tab_modified_icon_normal" />
709+
</style>
710+
<style id="tab_modified_icon:active">
711+
<icon part="tab_modified_icon_active" />
712+
</style>
713+
<style id="tab_modified_icon:clicked">
714+
<icon part="tab_modified_icon_normal" />
715+
</style>
716+
717+
<!-- tab_home -->
718+
<style id="tab_home">
719+
<icon part="tab_home_icon_normal" align="left" valign="middle" x="4" y="1" />
720+
</style>
721+
<style id="tab_home:active">
722+
<icon part="tab_home_icon_active" />
723+
</style>
724+
725+
<!-- workspace_label -->
726+
<style id="workspace_label">
727+
<text color="workspace_text" />
728+
</style>
729+
730+
<!-- workspace_link -->
731+
<style id="workspace_link">
732+
<text color="workspace_link" valign="middle" />
733+
</style>
734+
<style id="workspace_link:hover">
735+
<text color="workspace_link_hover" />
736+
</style>
737+
738+
<!-- workspace_link -->
739+
<style id="workspace_update_link" base="workspace_link">
740+
<background part="button_normal" color="button_normal_face" />
741+
<icon part="warning_box" align="right" x="-4" y="4" />
742+
<text padding-left="4" />
743+
</style>
744+
<style id="workspace_update_link:hover">
745+
<background part="button_hot" color="button_hot_face" />
746+
<text color="button_hot_text" />
747+
</style>
748+
<style id="workspace_update_link:clicked">
749+
<background part="button_selected" color="button_selected_face" />
750+
<text color="button_selected_text" />
751+
</style>
752+
753+
<!-- workspace_view -->
754+
<style id="workspace_view">
755+
<background part="editor_normal" />
756+
</style>
757+
<style id="workspace_view:active">
758+
<background part="editor_selected" />
759+
</style>
760+
761+
<!-- recent_file -->
762+
<style id="recent_file">
763+
<background color="background" />
764+
<text color="text" valign="middle" padding-left="2" padding-right="2" padding-top="3" padding-bottom="1" />
765+
</style>
766+
<style id="recent_file:hover">
767+
<background color="menuitem_hot_face" />
768+
</style>
769+
<style id="recent_file:active">
770+
<background color="listitem_selected_face" />
771+
<text color="listitem_selected_text" />
772+
</style>
773+
774+
<!-- recent_file_detail -->
775+
<style id="recent_file_detail" base="recent_file">
776+
<text color="disabled" valign="top" wordwrap="true" />
777+
</style>
778+
779+
<!-- news_item -->
780+
<style id="news_item">
781+
<background color="background" />
782+
<text color="text" valign="middle" padding-left="2" padding-right="2" padding-top="3" padding-bottom="3" />
783+
</style>
784+
<style id="news_item:hover">
785+
<background color="menuitem_hot_face" />
786+
</style>
787+
<style id="news_item:active">
788+
<background color="listitem_selected_face" />
789+
<text color="listitem_selected_text" />
790+
</style>
791+
792+
<!-- news_item_detail -->
793+
<style id="news_item_detail" base="news_item">
794+
<text color="disabled" valign="top" wordwrap="true" padding-top="0" padding-bottom="0" />
795+
</style>
796+
605797
</stylesheet>
606798

607799
</skin>

0 commit comments

Comments
 (0)