Skip to content

Commit

Permalink
Moved all resources like cursors and bitmaps in separate folder, adde…
Browse files Browse the repository at this point in the history
…d a few more cursors (next commit will explain)
  • Loading branch information
Breeder committed Apr 16, 2015
1 parent f2e2c85 commit b76271a
Show file tree
Hide file tree
Showing 15 changed files with 75 additions and 33 deletions.
File renamed without changes.
File renamed without changes.
Binary file added Resources/Cursor/sws_env_pen_grid.cur
Binary file not shown.
Binary file added Resources/Cursor/sws_env_pt_adj_vert.cur
Binary file not shown.
Binary file added Resources/Cursor/sws_grid_warp.cur
Binary file not shown.
Binary file added Resources/Cursor/sws_misc_speaker.cur
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 9 additions & 5 deletions resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define IDD_MARKERLIST 102
#define IDD_SAVE 103
#define IDD_LOAD 104
#define IDC_ZOOMIN 104
#define IDC_ZOOM_IN 104
#define IDD_FORMAT 105
#define IDD_MACRODEBUG 106
#define IDD_COLOR 107
Expand Down Expand Up @@ -56,17 +56,17 @@
#define IDD_SNM_RESOURCES 150
#define IDD_ZOOMPREFS 151
#define IDD_SNM_NOTES 152
#define IDC_ZOOMOUT 152
#define IDC_ZOOM_OUT 152
#define IDD_SNM_WAIT 153
#define IDC_ZOOMUNDO 153
#define IDC_ZOOM_UNDO 153
#define IDD_SNM_FIND 154
#define IDD_SNM_LIVE_CONFIGS 155
#define IDD_AW_ITEM_SMOOTHING 156
#define IDD_GROOVEDIALOG 157
#define IDD_AUTORENDER_METADATA 158
#define IDD_RECINPUTCHECK 159
#define IDD_AUTORENDER_PREFERENCES 160
#define IDC_ZOOMDRAG 160
#define IDC_ZOOM_DRAG 160
#define IDD_SNM_CYCLACTION 161
#define IDD_SNM_IMAGE 162
#define IDD_IX_LABELDLG 163
Expand All @@ -89,6 +89,10 @@
#define IDD_BR_CONTEXTUAL_TOOLBARS 181
#define IDD_BR_CONTEXTUAL_TOOLBARS_POS 182
#define IDD_BR_ADJUST_PLAYRATE 183
#define IDC_ENV_PEN_GRID 184
#define IDC_GRID_WARP 185
#define IDC_ENV_PT_ADJ_VERT 186
#define IDC_MISC_SPEAKER 187
#define IDB_UP 500
#define IDB_DOWN 501
#define IDC_BUTTON1 1000
Expand Down Expand Up @@ -455,7 +459,7 @@
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 184
#define _APS_NEXT_RESOURCE_VALUE 188
#define _APS_NEXT_COMMAND_VALUE 40000
#define _APS_NEXT_CONTROL_VALUE 1358
#define _APS_NEXT_SYMED_VALUE 100
Expand Down
19 changes: 12 additions & 7 deletions sws_extension.rc
Original file line number Diff line number Diff line change
Expand Up @@ -2066,18 +2066,22 @@ END
// Bitmap
//

IDB_UP BITMAP "uparrow.bmp"
IDB_DOWN BITMAP "downarrow.bmp"
IDB_DOWN BITMAP "Resources\\Bitmap\\downarrow.bmp"
IDB_UP BITMAP "Resources\\Bitmap\\uparrow.bmp"

/////////////////////////////////////////////////////////////////////////////
//
// Cursor
//

IDC_ZOOMIN CURSOR "zoomin.cur"
IDC_ZOOMOUT CURSOR "zoomout.cur"
IDC_ZOOMUNDO CURSOR "zoomundo.cur"
IDC_ZOOMDRAG CURSOR "zoomdrag.cur"
IDC_ENV_PEN_GRID CURSOR "Resources\\Cursor\\sws_env_pen_grid.cur"
IDC_ENV_PT_ADJ_VERT CURSOR "Resources\\Cursor\\sws_env_pt_adj_vert.cur"
IDC_GRID_WARP CURSOR "Resources\\Cursor\\sws_grid_warp.cur"
IDC_MISC_SPEAKER CURSOR "Resources\\Cursor\\sws_misc_speaker.cur"
IDC_ZOOM_DRAG CURSOR "Resources\\Cursor\\sws_zoom_drag.cur"
IDC_ZOOM_IN CURSOR "Resources\\Cursor\\sws_zoom_in.cur"
IDC_ZOOM_OUT CURSOR "Resources\\Cursor\\sws_zoom_out.cur"
IDC_ZOOM_UNDO CURSOR "Resources\\Cursor\\sws_zoom_undo.cur"
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

Expand All @@ -2089,7 +2093,8 @@ IDC_ZOOMDRAG CURSOR "zoomdrag.cur"
// Generated from the TEXTINCLUDE 3 resource.
//
#include "version.h"
#include "version.rc2"
#include "version.rc2"

/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

35 changes: 26 additions & 9 deletions sws_extension.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -380,41 +380,58 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
RelativePath=".\downarrow.bmp"
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\resource.h"
RelativePath=".\sws_extension.rc"
>
</File>
<File
RelativePath=".\sws_extension.rc"
RelativePath=".\version.rc2"
>
</File>
<File
RelativePath=".\uparrow.bmp"
RelativePath=".\Resources\Bitmapdownarrow.bmp"
>
</File>
<File
RelativePath=".\version.rc2"
RelativePath=".\Resources\Bitmapuparrow.bmp"
>
</File>
<File
RelativePath=".\Resources\Cursor\sws_env_pen_grid.cur"
>
</File>
<File
RelativePath=".\Resources\Cursor\sws_env_pt_adj_vert.cur"
>
</File>
<File
RelativePath=".\Resources\Cursor\sws_grid_warp.cur"
>
</File>
<File
RelativePath=".\Resources\Cursor\sws_misc_speaker.cur"
>
</File>
<File
RelativePath=".\zoomdrag.cur"
RelativePath=".\Resources\Cursor\sws_zoom_drag.cur"
>
</File>
<File
RelativePath=".\zoomin.cur"
RelativePath=".\Resources\Cursor\sws_zoom_in.cur"
>
</File>
<File
RelativePath=".\zoomout.cur"
RelativePath=".\Resources\Cursor\sws_zoom_out.cur"
>
</File>
<File
RelativePath=".\zoomundo.cur"
RelativePath=".\Resources\Cursor\sws_zoom_undo.cur"
>
</File>

</Filter>
<Filter
Name="Xenakios"
Expand Down
16 changes: 10 additions & 6 deletions sws_extension.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -313,13 +313,17 @@ echo Copied to "$(REAPER64_DIR)\plugins\$(TargetFilename)"</Command>
</Bscmake>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="downarrow.bmp" />
<None Include="uparrow.bmp" />
<None Include="Resources\Bitmap\downarrow.bmp" />
<None Include="Resources\Bitmap\uparrow.bmp" />
<None Include="Resources\Cursor\sws_env_pen_grid.cur" />
<None Include="Resources\Cursor\sws_env_pt_adj_vert.cur" />
<None Include="Resources\Cursor\sws_grid_warp.cur" />
<None Include="Resources\Cursor\sws_misc_speaker.cur" />
<None Include="Resources\Cursor\sws_zoom_drag.cur" />
<None Include="Resources\Cursor\sws_zoom_in.cur" />
<None Include="Resources\Cursor\sws_zoom_out.cur" />
<None Include="Resources\Cursor\sws_zoom_undo.cur" />
<None Include="version.rc2" />
<None Include="zoomdrag.cur" />
<None Include="zoomin.cur" />
<None Include="zoomout.cur" />
<None Include="zoomundo.cur" />
<None Include="whatsnew.txt" />
</ItemGroup>
<ItemGroup>
Expand Down
24 changes: 18 additions & 6 deletions sws_extension.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -617,22 +617,34 @@
<None Include="version.rc2">
<Filter>Resource Files</Filter>
</None>
<None Include="zoomdrag.cur">
<None Include="Resources\Bitmap\downarrow.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="zoomin.cur">
<None Include="Resources\Bitmap\uparrow.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="zoomout.cur">
<None Include="Resources\Cursor\sws_env_pen_grid.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="zoomundo.cur">
<None Include="Resources\Cursor\sws_env_pt_adj_vert.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="downarrow.bmp">
<None Include="Resources\Cursor\sws_grid_warp.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="uparrow.bmp">
<None Include="Resources\Cursor\sws_misc_speaker.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="Resources\Cursor\sws_zoom_drag.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="Resources\Cursor\sws_zoom_in.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="Resources\Cursor\sws_zoom_out.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="Resources\Cursor\sws_zoom_undo.cur">
<Filter>Resource Files</Filter>
</None>
<None Include="whatsnew.txt" />
Expand Down

0 comments on commit b76271a

Please sign in to comment.