Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 07:40:23 +02:00
Code Issues Releases Wiki Activity

New mouse pointers and zoom icons

Browse Source 
* Add custom draw tool cursor
* Replace most old mouse cursors
* Increase consistency with toolbar icons
* Replace zoom icons in FreqWindow
* Increase consistency across themes
* Add custom selection adjustment cursor

(The Windows ones looked like they originated from the DOS era.)

Co-authored-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Signed-off-by: akleja <storspov@gmail.com>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
This commit is contained in:
akleja 2021-07-26 15:24:17 +02:00 committed by GitHub
parent a30f84e449
commit b0d9f805a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 589 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
images/Cursors.h
View File

@ -29,6 +29,9 @@
#include "Cursors32/StretchRightCursor.xpm"
#endif
#include "Cursors32/SubViewsCursor.xpm"
#include "Cursors32/ArrowLeftCursor.xpm"
#include "Cursors32/ArrowRightCursor.xpm"
#include "Cursors32/DrawToolSmoothing.xpm"
AUDACITY_DLL_API
std::unique_ptr<wxCursor> MakeCursor(int WXUNUSED(CursorId), const char * const pXpm[36], int HotX, int HotY);

39
images/Cursors32/ArrowLeftCursor.xpm Normal file
View File

@ -0,0 +1,39 @@
/* XPM */
static const char * const ArrowLeftCursorXpm[] = {
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #B4B4B4",
"@ c #FFFFFF",
" ",
" ",
" ",
" ",
" . ",
" .@. ",
" .@. ",
" .@. ",
" .@. .. ",
" .@. .+. ",
" .@. .+@. ",
" .@. .+@@. ",
" .@. .+@@@. ",
" .@. .+@@@@............ ",
" .@..+@@@@@@@@@@@@@@@@. ",
" .@.+@@@@@@@@@@@@@@@@@. ",
" .@.@@@@@@@@@@@@@@@@@@. ",
" .@.+@@@@@@@@@@@@@@@@@. ",
" .@..+@@@@@@@@@@@@@@@@. ",
" .@. .+@@@@............ ",
" .@. .+@@@. ",
" .@. .+@@. ",
" .@. .+@. ",
" .@. .+. ",
" .@. .. ",
" .@. ",
" .@. ",
" .@. ",
" . ",
" ",
" ",
" "};

39
images/Cursors32/ArrowRightCursor.xpm Normal file
View File

@ -0,0 +1,39 @@
/* XPM */
static const char * const ArrowRightCursorXpm[] = {
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #B4B4B4",
"@ c #FFFFFF",
" ",
" ",
" ",
" ",
" . ",
" .@. ",
" .@. ",
" .@. ",
" .. .@. ",
" .+. .@. ",
" .@+. .@. ",
" .@@+. .@. ",
" .@@@+. .@. ",
" ...........@@@@+. .@. ",
" .@@@@@@@@@@@@@@@+..@. ",
" .@@@@@@@@@@@@@@@@+.@. ",
" .@@@@@@@@@@@@@@@@@.@. ",
" .@@@@@@@@@@@@@@@@+.@. ",
" .@@@@@@@@@@@@@@@+..@. ",
" ...........@@@@+. .@. ",
" .@@@+. .@. ",
" .@@+. .@. ",
" .@+. .@. ",
" .+. .@. ",
" .. .@. ",
" .@. ",
" .@. ",
" .@. ",
" . ",
" ",
" ",
" "};

29
images/Cursors32/BandWidthCursor.xpm
View File

@ -1,10 +1,10 @@
/* XPM */
static const char * const BandWidthCursorXpm[] = {
"32 32 3 1",
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #FFFFFF",
" ",
"+ c #D4D4D4",
"@ c #FFFFFF",
" ",
" ",
" ",
@ -12,27 +12,28 @@ static const char * const BandWidthCursorXpm[] = {
" ",
" . ",
" .+. ",
" .+++. ",
" .+++++. ",
" .+++++++. ",
" .+++++++. ",
" ....... ",
" .+@+. ",
" .+@@@+. ",
" .+@@@@@+. ",
" .+@@@@@@@+. ",
" .+@@@@@@@+. ",
" ......... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ....... ",
" .+++++++. ",
" .+++++++. ",
" .+++++. ",
" .+++. ",
" ......... ",
" .+@@@@@@@+. ",
" .+@@@@@@@+. ",
" .+@@@@@+. ",
" .+@@@+. ",
" .+@+. ",
" .+. ",
" . ",
" ",
" ",
" ",
" ",
" ",
" "};

15
images/Cursors32/BottomFrequencyCursor.xpm
View File

@ -1,9 +1,10 @@
/* XPM */
static const char * const BottomFrequencyCursorXpm[] = {
"32 32 3 1",
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #FFFFFF",
"+ c #D4D4D4",
"@ c #FFFFFF",
" ",
" ",
" ",
@ -23,11 +24,11 @@ static const char * const BottomFrequencyCursorXpm[] = {
" ",
" ",
" ......... ",
" .+++++++++. ",
" .+++++++++. ",
" .+++++++. ",
" .+++++. ",
" .+++. ",
" .+@@@@@@@+. ",
" .+@@@@@@@+. ",
" .+@@@@@+. ",
" .+@@@+. ",
" .+@+. ",
" .+. ",
" . ",
" ",

83
images/Cursors32/DisabledCursor.xpm
View File

@ -1,39 +1,48 @@
/* XPM */
static const char * const DisabledCursorXpm[] = {
"32 32 3 1",
". c #FF0000", // mask color = RGB:255,0,0
"# c #000000",
"+ c #FFFFFF",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
".............######.............",
"...........##++++++##...........",
"..........#++++++++++#..........",
".........#++++####++++#.........",
".........#+++#...#++++#.........",
"........#+++#...#++++++#........",
"........#++#...#+++##++#........",
"........#++#..#+++#.#++#........",
"........#++#.#+++#..#++#........",
"........#++##+++#...#++#........",
"........#++++++#...#+++#........",
".........#++++#...#+++#.........",
".........#++++####++++#.........",
"..........#++++++++++#..........",
"...........##++++++##...........",
".............######.............",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
"32 32 13 1",
" c #FF0000",
". c #000000",
"+ c #848484",
"@ c #CECECE",
"# c #F4F4F4",
"$ c #515151",
"% c #FFFFFF",
"& c #D4D4D4",
"* c #6C6C6C",
"= c #9D9D9D",
"- c #A3A3A3",
"; c #ECECEC",
"> c #494949",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ...... ",
" ..+@##@+.. ",
" .$#%%%%%%#$. ",
" .$%%&...*%%%$. ",
" .#%=. .*%%%#. ",
" .+%&. .*%%%#%+. ",
" .&%. .*%%%**%@. ",
" .#%. .*%%%*..%#. ",
" .#%..*%%%*. .%#. ",
" .#%**%%%*. .%@. ",
" .@%%%%%*. .&%+. ",
" .#%%%*. .-%;. ",
" .$%%#*...&%%>. ",
" .$#%%%%%%;>. ",
" ..+@##@+.. ",
" ...... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

85
images/Cursors32/DrawCursor.xpm
View File

@ -1,40 +1,49 @@
/* XPM */
//Image of a pencil.
static const char * const DrawCursorXpm[] = {
"32 32 3 1",
". c #FF0000", // mask color = RGB:255,0,0
"# c #000000",
"+ c #FFFFFF",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
".................+++............",
"................+###+...........",
"...............+#+###+..........",
"..............+#+####+..........",
"..............+#####+...........",
".............+#++###+...........",
".............+#+###+............",
"............+#++###+............",
"............+#+###+.............",
"...........+#++###+.............",
"...........+#+###+..............",
"...........+#####+..............",
"...........+####+...............",
"...........+###+................",
"...........+##+.................",
"...........+#+..................",
"............+...................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
"32 32 14 1",
" c #FF0000",
". c #000000",
"+ c #ADADAD",
"@ c #414141",
"# c #A3A3A3",
"$ c #FFFFFF",
"% c #F4F4F4",
"& c #515151",
"* c #D4D4D4",
"= c #CECECE",
"- c #6C6C6C",
"; c #9D9D9D",
"> c #C4C4C4",
", c #939393",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .. ",
" .+@. ",
" .#$%@. ",
" .&.*$+. ",
" .=$-.;. ",
" .=$$$&. ",
" .=$$$=. ",
" .=$$$=. ",
" .=$$$=. ",
" .=$$$=. ",
" .>$$$=. ",
" .$$$=. ",
" .,$$>. ",
" .=,.. ",
" ... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

41
images/Cursors32/DrawToolSmoothing.xpm Normal file
View File

@ -0,0 +1,41 @@
/* XPM */
static const char * const DrawToolSmoothingXpm[] = {
"32 32 6 1",
" c #FF0000",
". c #000000",
"+ c #BEBEBE",
"@ c #E4E4E4",
"# c #FFFFFF",
"$ c #909090",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..+@#@+.. ",
" .$#######$. ",
" .$#@.....@#$. ",
" .#@. .@#. ",
" .+#. .#+. ",
" .@#. .#@. ",
" .##. .##. ",
" .@#. .#@. ",
" .+#. .#+. ",
" .#@. .@#. ",
" .$#@.....@#$. ",
" .$#######$. ",
" ..+@#@+.. ",
" ..... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

29
images/Cursors32/EnvCursor.xpm
View File

@ -1,19 +1,20 @@
/* XPM */
static const char * const EnvCursorXpm[] = {
"32 32 3 1",
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #FFFFFF",
"+ c #D4D4D4",
"@ c #FFFFFF",
" ",
" ",
" ",
" ",
" ",
" ....... ",
" .+++++++. ",
" .+++++++. ",
" .+++++. ",
" .+++. ",
" ......... ",
" .+@@@@@@@+. ",
" .+@@@@@@@+. ",
" .+@@@@@+. ",
" .+@@@+. ",
" .+@+. ",
" .+. ",
" . ",
" ",
@ -26,12 +27,12 @@ static const char * const EnvCursorXpm[] = {
" ",
" . ",
" .+. ",
" .+++. ",
" .+++++. ",
" .+++++++. ",
" .+++++++. ",
" ....... ",
" ",
" .+@+. ",
" .+@@@+. ",
" .+@@@@@+. ",
" .+@@@@@@@+. ",
" .+@@@@@@@+. ",
" ......... ",
" ",
" ",
" ",

40
images/Cursors32/IBeamCursor.xpm
View File

@ -1,9 +1,11 @@
/* XPM */
static const char * const IBeamCursorXpm[] = {
"32 32 3 1",
"32 32 5 1",
" c #FF0000",
". c #FFFFFF",
"+ c #000000",
". c #000000",
"+ c #C9C9C9",
"@ c #FFFFFF",
"# c #525252",
" ",
" ",
" ",
@ -12,22 +14,22 @@ static const char * const IBeamCursorXpm[] = {
" ",
" ",
" .......... ",
" .++++++++. ",
" ...++... ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" .++. ",
" ...++... ",
" .++++++++. ",
" .+@@@@@@+. ",
" ..#@@#.. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" .@@. ",
" ..#@@#.. ",
" .+@@@@@@+. ",
" .......... ",
" ",
" ",

76
images/Cursors32/LabelCursorLeft.xpm
View File

@ -1,39 +1,41 @@
/* XPM */
static const char * const LabelCursorLeftXpm[] = {
"32 32 4 1",
" c None",
". c #FF0000",
"+ c #000000",
"@ c #FFFFFF",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"..........++....................",
"..........+@+...................",
"..........+@@+..................",
"........+++@@+..................",
".......++@@+@@+.................",
".......+@@@@+@@+................",
".......+@@@@+@@+................",
".......+@@@@+@@+................",
".......+@@@@+@@+................",
".......++@@+@@+.................",
"........+++@@+..................",
"..........+@@+..................",
"..........+@+...................",
"..........++....................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
"32 32 6 1",
" c #FF0000",
". c #000000",
"+ c #646464",
"@ c #909090",
"# c #FFFFFF",
"$ c #CDCDCD",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .. ",
" .+@. ",
" .@#@. ",
" .+##@. ",
" ...@##@. ",
" .$#$.@##@. ",
" .$###$.@##. ",
" .#####.@##. ",
" .$###$.@##. ",
" .$#$.@##@. ",
" ...@##@. ",
" .+##@. ",
" .@#@. ",
" .+@. ",
" .. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

76
images/Cursors32/LabelCursorRight.xpm
View File

@ -1,39 +1,41 @@
/* XPM */
static const char * const LabelCursorRightXpm[] = {
"32 32 4 1",
" c None",
". c #FF0000",
"+ c #000000",
"@ c #FFFFFF",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"....................++..........",
"...................+@+..........",
"..................+@@+..........",
"..................+@@+++........",
".................+@@+@@++.......",
"................+@@+@@@@+.......",
"................+@@+@@@@+.......",
"................+@@+@@@@+.......",
"................+@@+@@@@+.......",
".................+@@+@@++.......",
"..................+@@+++........",
"..................+@@+..........",
"...................+@+..........",
"....................++..........",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
"32 32 6 1",
" c #FF0000",
". c #000000",
"+ c #909090",
"@ c #646464",
"# c #FFFFFF",
"$ c #CDCDCD",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .. ",
" .+@. ",
" .+#+. ",
" .+##@. ",
" .+##+... ",
" .+##+.$#$. ",
" .##+.$###$. ",
" .##+.#####. ",
" .##+.$###$. ",
" .+##+.$#$. ",
" .+##+... ",
" .+##@. ",
" .+#+. ",
" .+@. ",
" .. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};

49
images/Cursors32/RearrangeCursor.xpm
View File

@ -1,37 +1,38 @@
/* XPM */
static const char * const RearrangeCursorXpm[] = {
"32 32 3 1",
" c #FF0000", // mask color = RGB:255,0,0
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #FFFFFF",
"@ c #BCBCBC",
" ",
" ",
" ",
" ",
" ... ",
" .++... ",
" ...++.++... ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" .. .+++++++++++. ",
" .++..+++++++++++. ",
" .++..+++++++++++. ",
" .++.+++++++++++. ",
" .++++++++++++++. ",
" .++++++++++++++. ",
" .+++++++++++++. ",
" .+++++++++++++. ",
" .+++++++++++. ",
" .++++++++++. ",
" .++++++++. ",
" ..++++.. ",
" .... ",
" ",
" ",
" . ",
" .+. ",
" .+++. ",
" .+++++. ",
" ..+.. ",
" .+. ",
" ..... ",
" . .@+++@. . ",
" .+. .@+@.@+@. .+. ",
" .++...+@. .@+...++. ",
" .+++++.+. .+.+++++. ",
" .++...+@. .@+...++. ",
" .+. .@+@.@+@. .+. ",
" . .@+++@. . ",
" ..... ",
" .+. ",
" ..+.. ",
" .+++++. ",
" .+++. ",
" .+. ",
" . ",
" ",
" ",
" ",
" ",

47
images/Cursors32/RearrangingCursor.xpm
View File

@ -1,36 +1,37 @@
/* XPM */
static const char * const RearrangingCursorXpm[] = {
"32 32 3 1",
" c #FF0000", // mask color = RGB:255,0,0
"32 32 4 1",
" c #FF0000",
". c #000000",
"+ c #FFFFFF",
"@ c #8A8A8A",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ... ",
" .++... ",
" ...++.++... ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" .++.++.++.++. ",
" ...+++++++++++. ",
" .++.+++++++++++. ",
" .++.+++++++++++. ",
" .++.+++++++++++. ",
" .++++++++++++++. ",
" .++++++++++++++. ",
" .+++++++++++++. ",
" .+++++++++++++. ",
" .+++++++++++. ",
" .++++++++++. ",
" .++++++++. ",
" ..++++.. ",
" .... ",
" ",
" . ",
" .+. ",
" .+++. ",
" .+++++. ",
" ..+.. ",
" .+. ",
" ..... ",
" . .@+++@. . ",
" .+. .@+++++@. .+. ",
" .++...+++++++...++. ",
" .+++++.+++++++.+++++. ",
" .++...+++++++...++. ",
" .+. .@+++++@. .+. ",
" . .@+++@. . ",
" ..... ",
" .+. ",
" ..+.. ",
" .+++++. ",
" .+++. ",
" .+. ",
" . ",
" ",
" ",
" ",

31
images/Cursors32/SubViewsCursor.xpm
View File

@ -1,10 +1,12 @@
/* XPM */
static const char * const SubViewsCursorXpm[] = {
"32 32 3 1",
"32 32 6 1",
" c #FF0000",
". c #FFFFFF",
"+ c #000000",
" ",
"+ c #565656",
"@ c #000000",
"# c #2A2A2A",
"$ c #FCFCFC",
" ",
" ",
" ",
@ -12,27 +14,28 @@ static const char * const SubViewsCursorXpm[] = {
" ",
" . ",
" .+. ",
" .+++. ",
" .+++++. ",
" .+++++++. ",
" .+++++++. ",
" ....... ",
" .+@+. ",
" .+@@@+. ",
" .+@@@@@+. ",
" .+#@@@@@#+. ",
" .+#@@@@@#+. ",
" ......... ",
" ",
" ",
" ",
" ",
" ",
" ",
" ....... ",
" .+++++++. ",
" .+++++++. ",
" .+++++. ",
" .+++. ",
" ......... ",
" .+#@@@@@#+. ",
" .+#@@@@@#+. ",
" .+@@@@@+. ",
" .+@@@+$ ",
" .+@+. ",
" .+. ",
" . ",
" ",
" ",
" ",
" ",
" ",
" "};

32
images/Cursors32/TimeCursor.xpm
View File

@ -1,9 +1,13 @@
/* XPM */
static const char * const TimeCursorXpm[] = {
"32 32 3 1",
"32 32 7 1",
" c #FF0000",
". c #FFFFFF",
"+ c #000000",
". c #000000",
"+ c #D4D4D4",
"@ c #FFFFFF",
"# c #050505",
"$ c #F5F5F5",
"% c #040404",
" ",
" ",
" ",
@ -15,17 +19,17 @@ static const char * const TimeCursorXpm[] = {
" ",
" ",
" ",
" ",
" .. .. ",
" .+. .+. ",
" .++.........++. ",
" .+++++++++++++++. ",
" .+++++++++++++++++. ",
" .+++++++++++++++. ",
" .++.........++. ",
" .+. .+. ",
" .. .. ",
" ",
" .. .. ",
" .+@. .@+. ",
" .+@@. .@@+. ",
" .+@@@........#@@@+. ",
" .+@@@@+++++++++@@@@+. ",
" .+$@@@@@@@@@@@@@@@@@@+. ",
" .+@@@@+++++++++@@@@+. ",
" .+@@@........%@@@+. ",
" .+@@. .@@+. ",
" .+@. .@+. ",
" .. .. ",
" ",
" ",
" ",

17
images/Cursors32/TopFrequencyCursor.xpm
View File

@ -1,10 +1,11 @@
/* XPM */
static const char * const TopFrequencyCursorXpm[] = {
"32 32 4 1",
"32 32 5 1",
" c #FF0000",
". c #000000",
"+ c #FFFFFF",
"@ c #FE0000",
"+ c #D4D4D4",
"@ c #FFFFFF",
"# c #FE0000",
" ",
" ",
" ",
@ -13,11 +14,11 @@ static const char * const TopFrequencyCursorXpm[] = {
" ",
" . ",
" .+. ",
" .+++. ",
" .+++++. ",
" .+++++++. ",
" .+++++++++. ",
" @.+++++++++.@ ",
" .+@+. ",
" .+@@@+. ",
" .+@@@@@+. ",
" .+@@@@@@@+. ",
" #.+@@@@@@@+.# ",
" ......... ",
" ",
" ",

85
images/Cursors32/ZoomInCursor.xpm
View File

@ -1,38 +1,51 @@
/* XPM */
static const char * const ZoomInCursorXpm[] = {
"32 32 3 1",
"+ c #FFFFFF",
". c #FF0000", // mask color = RGB:255,0,0
"# c #000000",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................++++............",
"...............+####+...........",
"..............+##...#+..........",
".............+#..##..#+.........",
"............+##..##..##+........",
"............+#.######.#+........",
"............+#.######.#+........",
"............+##..##..##+........",
".............+#..##..#+.........",
"............+####..##+..........",
"...........+###+####+...........",
"..........+###+.++++............",
".........+###+..................",
"........+###+...................",
".......+###+....................",
"........+#+.....................",
".........+......................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
"32 32 16 1",
" c #FF0000",
". c #000000",
"+ c #A3A3A3",
"@ c #D4D4D4",
"# c #8A8A8A",
"$ c #FFFFFF",
"% c #848484",
"& c #6C6C6C",
"* c #C4C4C4",
"= c #DEDEDE",
"- c #494949",
"; c #5C5C5C",
"> c #E6E6E6",
", c #727272",
"' c #939393",
") c #9D9D9D",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ... ",
" ..+@+.. ",
" .#$$$$$%. ",
" .&$*...*$&. ",
" .$=. .=$. ",
" .&$&.....&$&. ",
" .+$-;$$$;-$+. ",
" .&$&.....&$&. ",
" .$=. .>$. ",
" .&$*...*$,. ",
" .%$$$$$$$'. ",
" ..+@+.-$$). ",
" ... .+$$+. ",
" .+$$+. ",
" .)$$+. ",
" .)$*. ",
" .,. ",
" . ",
" ",
" ",
" ",
" "};

84
images/Cursors32/ZoomOutCursor.xpm
View File

@ -1,38 +1,50 @@
/* XPM */
static const char * const ZoomOutCursorXpm[] = {
"32 32 3 1",
". c #FF0000", // mask color = RGB:255,0,0
"# c #000000",
"+ c #FFFFFF",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................++++............",
"...............+####+...........",
"..............+##...#+..........",
".............+#......#+.........",
"............+##......##+........",
"............+#.######.#+........",
"............+#.######.#+........",
"............+##......##+........",
".............+#......#+.........",
"............+####..##+..........",
"...........+###+####+...........",
"..........+###+.++++............",
".........+###+..................",
"........+###+...................",
".......+###+....................",
"........+#+.....................",
".........+......................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"};
"32 32 15 1",
" c #FF0000",
". c #000000",
"+ c #A3A3A3",
"@ c #D4D4D4",
"# c #8A8A8A",
"$ c #FFFFFF",
"% c #848484",
"& c #6C6C6C",
"* c #C4C4C4",
"= c #494949",
"- c #DEDEDE",
"; c #E6E6E6",
"> c #727272",
", c #939393",
"' c #9D9D9D",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ... ",
" ..+@+.. ",
" .#$$$$$%. ",
" .&$*&=&*$&. ",
" .$-..$..-$. ",
" .&$&..$..&$&. ",
" .+$=$$$$$=$+. ",
" .&$&..$..&$&. ",
" .$-..$..;$. ",
" .&$*&=&*$>. ",
" .%$$$$$$$,. ",
" ..+@+.=$$'. ",
" ... .+$$+. ",
" .+$$+. ",
" .'$$+. ",
" .'$*. ",
" .>. ",
" . ",
" ",
" ",
" ",
" "};

83
src/FreqWindow.cpp
View File

@ -116,55 +116,48 @@ enum {
static const char * ZoomIn[] = {
"16 16 6 1",
"16 16 3 1",
" c None",
"+ c #1C1C1C",
"@ c #AEAEAE",
"# c #F7F7F7",
"$ c #CFCECC",
"* c #1C1CA0",
" ++++ ",
" @+# @$+@ ",
" + @** +@ ",
" +#@ ** #+ ",
" +@****** +@",
" + ****** +@",
" +# ** #+@",
" + ** +@@",
" +++# #+@@ ",
" +++@++++@@ ",
" +++@@ @@@@ ",
" +++@@ ",
" +++@@ ",
"+++@@ ",
"@+@@ ",
" @@ "};
"+ c #000000",
"# c #CCCCCC",
" ",
" ",
" ",
" ",
" ++++ ",
" +##+ ",
" +##+ ",
" ++++##++++ ",
" +########+ ",
" +########+ ",
" ++++##++++ ",
" +##+ ",
" +##+ ",
" ++++ ",
" ",
" "};
static const char * ZoomOut[] = {
"16 16 6 1",
"16 16 3 1",
" c None",
"+ c #1C1C1C",
"@ c #AEAEAE",
"# c #F7F7F7",
"$ c #CFCECC",
"* c #1C1CA0",
" ++++ ",
" @+# $+@ ",
" + @@ +@ ",
" +# @ #+ ",
" +@****** +@",
" + ****** +@",
" +# #+@",
" + +@@",
" +++# #+@@ ",
" +++@++++@@ ",
" +++@@ @@@@ ",
" +++@@ ",
" +++@@ ",
"+++@@ ",
"@+@@ ",
" @@ "};
"+ c #000000",
"# c #CCCCCC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ++++++++++ ",
" +########+ ",
" +########+ ",
" ++++++++++ ",
" ",
" ",
" ",
" ",
" "};
// FrequencyPlotDialog

5
src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp
View File

@ -51,7 +51,8 @@ HitTestPreview SampleHandle::HitPreview
{
static auto disabledCursor =
::MakeCursor(wxCURSOR_NO_ENTRY, DisabledCursorXpm, 16, 16);
static wxCursor smoothCursor{ wxCURSOR_SPRAYCAN };
static auto smoothCursor =
::MakeCursor(wxCURSOR_SPRAYCAN, DrawToolSmoothingXpm, 16, 16);
static auto pencilCursor =
::MakeCursor(wxCURSOR_PENCIL, DrawCursorXpm, 12, 22);
@ -64,7 +65,7 @@ HitTestPreview SampleHandle::HitPreview
(unsafe
? &*disabledCursor
: (state.AltDown()
? &smoothCursor
? &*smoothCursor
: &*pencilCursor))
};
}

10
src/tracks/ui/SelectHandle.cpp
View File

@ -296,8 +296,10 @@ namespace
(SelectionBoundary boundary, bool frequencySnapping,
TranslatableString &tip, wxCursor *&pCursor)
{
static wxCursor adjustLeftSelectionCursor{ wxCURSOR_POINT_LEFT };
static wxCursor adjustRightSelectionCursor{ wxCURSOR_POINT_RIGHT };
static auto adjustLeftSelectionCursor =
::MakeCursor(wxCURSOR_POINT_LEFT, ArrowLeftCursorXpm, 6, 16);
static auto adjustRightSelectionCursor =
::MakeCursor(wxCURSOR_POINT_RIGHT, ArrowRightCursorXpm, 27, 16);
static auto bottomFrequencyCursor =
::MakeCursor(wxCURSOR_ARROW, BottomFrequencyCursorXpm, 16, 16);
@ -312,11 +314,11 @@ namespace
break;
case SBLeft:
tip = XO("Click and drag to move left selection boundary.");
pCursor = &adjustLeftSelectionCursor;
pCursor = &*adjustLeftSelectionCursor;
break;
case SBRight:
tip = XO("Click and drag to move right selection boundary.");
pCursor = &adjustRightSelectionCursor;
pCursor = &*adjustRightSelectionCursor;
break;
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
case SBBottom: