github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add missing monitoring icon for disabled state 

Fix #15217, close #15218
pull/15224/head
ozone10 2024-05-29 16:01:57 +02:00 committed by Don Ho
parent b4b76ff770
commit 6c660a71b3
11 changed files with 105 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/Notepad_plus.cpp
View File

@ -104,7 +104,7 @@ ToolBarButtonUnit toolBarIcons[] = {
{IDM_VIEW_DOCLIST, IDI_VIEW_DOCLIST_ICON, IDI_VIEW_DOCLIST_ICON, IDI_VIEW_DOCLIST_ICON2, IDI_VIEW_DOCLIST_ICON2, IDI_VIEW_DOCLIST_ICON_DM, IDI_VIEW_DOCLIST_ICON_DM, IDI_VIEW_DOCLIST_ICON_DM2, IDI_VIEW_DOCLIST_ICON_DM2, IDR_DOCLIST},
{IDM_VIEW_FUNC_LIST, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON_DM, IDI_VIEW_FUNCLIST_ICON_DM, IDI_VIEW_FUNCLIST_ICON_DM2, IDI_VIEW_FUNCLIST_ICON_DM2, IDR_FUNC_LIST},
{IDM_VIEW_FILEBROWSER, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON_DM, IDI_VIEW_FILEBROWSER_ICON_DM, IDI_VIEW_FILEBROWSER_ICON_DM2, IDI_VIEW_FILEBROWSER_ICON_DM2, IDR_FILEBROWSER},
{IDM_VIEW_MONITORING, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_ICON_DM2, IDI_VIEW_MONITORING_ICON_DM2, IDR_FILEMONITORING},
{IDM_VIEW_MONITORING, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_DIS_ICON, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_DIS_ICON2, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_DIS_ICON_DM, IDI_VIEW_MONITORING_ICON_DM2, IDI_VIEW_MONITORING_DIS_ICON_DM2, IDR_FILEMONITORING},
//---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------//
{0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON},

7
PowerEditor/src/Notepad_plus.rc
View File

@ -113,6 +113,7 @@ IDI_VIEW_DOCLIST_ICON ICON "icons/light/toolbar/regular/docList_o
IDI_VIEW_FUNCLIST_ICON ICON "icons/light/toolbar/regular/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON ICON "icons/light/toolbar/regular/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON ICON "icons/light/toolbar/regular/monitoring_off.ico"
IDI_VIEW_MONITORING_DIS_ICON ICON "icons/light/toolbar/regular/monitoring_dis.ico"
//
// TOOLBAR ICO - set 2
@ -163,6 +164,7 @@ IDI_VIEW_DOCLIST_ICON2 ICON "icons/light/toolbar/filled/docList_of
IDI_VIEW_FUNCLIST_ICON2 ICON "icons/light/toolbar/filled/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON2 ICON "icons/light/toolbar/filled/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON2 ICON "icons/light/toolbar/filled/monitoring_off.ico"
IDI_VIEW_MONITORING_DIS_ICON2 ICON "icons/light/toolbar/filled/monitoring_dis.ico"
//
// TOOLBAR ICO - set 1 Dark Mode
@ -213,6 +215,7 @@ IDI_VIEW_DOCLIST_ICON_DM ICON "icons/dark/toolbar/regular/docList
IDI_VIEW_FUNCLIST_ICON_DM ICON "icons/dark/toolbar/regular/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON_DM ICON "icons/dark/toolbar/regular/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON_DM ICON "icons/dark/toolbar/regular/monitoring_off.ico"
IDI_VIEW_MONITORING_DIS_ICON_DM ICON "icons/dark/toolbar/regular/monitoring_dis.ico"
//
// TOOLBAR ICO - set 2 Dark Mode
@ -263,7 +266,7 @@ IDI_VIEW_DOCLIST_ICON_DM2 ICON "icons/dark/toolbar/filled/docList_
IDI_VIEW_FUNCLIST_ICON_DM2 ICON "icons/dark/toolbar/filled/funcList_off.ico"
IDI_VIEW_FILEBROWSER_ICON_DM2 ICON "icons/dark/toolbar/filled/fileBrowser_off.ico"
IDI_VIEW_MONITORING_ICON_DM2 ICON "icons/dark/toolbar/filled/monitoring_off.ico"
IDI_VIEW_MONITORING_DIS_ICON_DM2 ICON "icons/dark/toolbar/filled/monitoring_dis.ico"
@ -370,7 +373,7 @@ IDI_FB_SELECTCURRENTFILE_DM ICON "icons/dark/panels/toolbar/fb_select
IDI_FB_FOLDALL_DM ICON "icons/dark/panels/toolbar/fb_fold_all.ico"
IDI_FB_EXPANDALL_DM ICON "icons/dark/panels/toolbar/fb_expand_all.ico"
IDI_FUNCLIST_ROOT BITMAP "icons/standard/panels/treeview/project_file.bmp"
//IDI_FUNCLIST_ROOT BITMAP "icons/standard/panels/treeview/project_file.bmp" // same file as IDI_PROJECT_FILE
IDI_FUNCLIST_NODE BITMAP "icons/standard/panels/treeview/funcList_node.bmp"
IDI_FUNCLIST_LEAF BITMAP "icons/standard/panels/treeview/funcList_leaf.bmp"

BIN
PowerEditor/src/icons/dark/toolbar/filled/monitoring_dis.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
PowerEditor/src/icons/dark/toolbar/filled/monitoring_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
PowerEditor/src/icons/dark/toolbar/regular/monitoring_dis.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
PowerEditor/src/icons/dark/toolbar/regular/monitoring_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
PowerEditor/src/icons/light/toolbar/filled/monitoring_dis.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.3 KiB

BIN
PowerEditor/src/icons/light/toolbar/filled/monitoring_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
PowerEditor/src/icons/light/toolbar/regular/monitoring_dis.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
PowerEditor/src/icons/light/toolbar/regular/monitoring_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

194
PowerEditor/src/resource.h
View File

@ -93,57 +93,59 @@
#define IDI_VIEW_FILEBROWSER_ICON 243
#define IDI_VIEW_FUNCLIST_ICON 244
#define IDI_VIEW_MONITORING_ICON 245
#define IDI_VIEW_DOCLIST_ICON 392 //continuing from IDI_VIEW_DOCLIST_ICON_DM2's ID
#define IDI_VIEW_MONITORING_DIS_ICON 246
#define IDI_VIEW_DOCLIST_ICON 247
//
// TOOLBAR ICO - set 1, Dark Mode
//
#define IDI_NEW_ICON_DM 246
#define IDI_OPEN_ICON_DM 247
#define IDI_CLOSE_ICON_DM 248
#define IDI_CLOSEALL_ICON_DM 249
#define IDI_SAVE_ICON_DM 250
#define IDI_SAVEALL_ICON_DM 251
#define IDI_CUT_ICON_DM 252
#define IDI_COPY_ICON_DM 253
#define IDI_PASTE_ICON_DM 254
#define IDI_UNDO_ICON_DM 255
#define IDI_REDO_ICON_DM 256
#define IDI_FIND_ICON_DM 257
#define IDI_REPLACE_ICON_DM 258
#define IDI_ZOOMIN_ICON_DM 259
#define IDI_ZOOMOUT_ICON_DM 260
#define IDI_VIEW_UD_DLG_ICON_DM 261
#define IDI_PRINT_ICON_DM 262
#define IDI_STARTRECORD_ICON_DM 263
#define IDI_STARTRECORD_DISABLE_ICON_DM 264
#define IDI_STOPRECORD_ICON_DM 265
#define IDI_STOPRECORD_DISABLE_ICON_DM 266
#define IDI_PLAYRECORD_ICON_DM 267
#define IDI_PLAYRECORD_DISABLE_ICON_DM 268
#define IDI_SAVERECORD_ICON_DM 269
#define IDI_SAVERECORD_DISABLE_ICON_DM 270
#define IDI_MMPLAY_DIS_ICON_DM 271
#define IDI_MMPLAY_ICON_DM 272
#define IDI_VIEW_ALL_CHAR_ICON_DM 273
#define IDI_VIEW_INDENT_ICON_DM 274
#define IDI_VIEW_WRAP_ICON_DM 275
#define IDI_SAVE_DISABLE_ICON_DM 276
#define IDI_SAVEALL_DISABLE_ICON_DM 277
#define IDI_CUT_DISABLE_ICON_DM 278
#define IDI_COPY_DISABLE_ICON_DM 279
#define IDI_PASTE_DISABLE_ICON_DM 280
#define IDI_UNDO_DISABLE_ICON_DM 281
#define IDI_REDO_DISABLE_ICON_DM 282
#define IDI_SYNCV_ICON_DM 283
#define IDI_SYNCV_DISABLE_ICON_DM 284
#define IDI_SYNCH_ICON_DM 285
#define IDI_SYNCH_DISABLE_ICON_DM 286
#define IDI_VIEW_DOC_MAP_ICON_DM 287
#define IDI_VIEW_FILEBROWSER_ICON_DM 288
#define IDI_VIEW_FUNCLIST_ICON_DM 289
#define IDI_VIEW_MONITORING_ICON_DM 290
#define IDI_VIEW_DOCLIST_ICON_DM 393 //continuing from IDI_VIEW_DOCLIST_ICON's ID
#define IDI_NEW_ICON_DM 251
#define IDI_OPEN_ICON_DM 252
#define IDI_CLOSE_ICON_DM 253
#define IDI_CLOSEALL_ICON_DM 254
#define IDI_SAVE_ICON_DM 255
#define IDI_SAVEALL_ICON_DM 256
#define IDI_CUT_ICON_DM 257
#define IDI_COPY_ICON_DM 258
#define IDI_PASTE_ICON_DM 259
#define IDI_UNDO_ICON_DM 260
#define IDI_REDO_ICON_DM 261
#define IDI_FIND_ICON_DM 262
#define IDI_REPLACE_ICON_DM 263
#define IDI_ZOOMIN_ICON_DM 264
#define IDI_ZOOMOUT_ICON_DM 265
#define IDI_VIEW_UD_DLG_ICON_DM 266
#define IDI_PRINT_ICON_DM 267
#define IDI_STARTRECORD_ICON_DM 268
#define IDI_STARTRECORD_DISABLE_ICON_DM 269
#define IDI_STOPRECORD_ICON_DM 270
#define IDI_STOPRECORD_DISABLE_ICON_DM 271
#define IDI_PLAYRECORD_ICON_DM 272
#define IDI_PLAYRECORD_DISABLE_ICON_DM 273
#define IDI_SAVERECORD_ICON_DM 274
#define IDI_SAVERECORD_DISABLE_ICON_DM 275
#define IDI_MMPLAY_DIS_ICON_DM 276
#define IDI_MMPLAY_ICON_DM 277
#define IDI_VIEW_ALL_CHAR_ICON_DM 278
#define IDI_VIEW_INDENT_ICON_DM 279
#define IDI_VIEW_WRAP_ICON_DM 280
#define IDI_SAVE_DISABLE_ICON_DM 281
#define IDI_SAVEALL_DISABLE_ICON_DM 282
#define IDI_CUT_DISABLE_ICON_DM 283
#define IDI_COPY_DISABLE_ICON_DM 284
#define IDI_PASTE_DISABLE_ICON_DM 285
#define IDI_UNDO_DISABLE_ICON_DM 286
#define IDI_REDO_DISABLE_ICON_DM 287
#define IDI_SYNCV_ICON_DM 288
#define IDI_SYNCV_DISABLE_ICON_DM 289
#define IDI_SYNCH_ICON_DM 290
#define IDI_SYNCH_DISABLE_ICON_DM 291
#define IDI_VIEW_DOC_MAP_ICON_DM 292
#define IDI_VIEW_FILEBROWSER_ICON_DM 293
#define IDI_VIEW_FUNCLIST_ICON_DM 294
#define IDI_VIEW_MONITORING_ICON_DM 295
#define IDI_VIEW_MONITORING_DIS_ICON_DM 296
#define IDI_VIEW_DOCLIST_ICON_DM 297
//
// TOOLBAR ICO - set 2
@ -193,57 +195,59 @@
#define IDI_VIEW_FILEBROWSER_ICON2 343
#define IDI_VIEW_FUNCLIST_ICON2 344
#define IDI_VIEW_MONITORING_ICON2 345
#define IDI_VIEW_DOCLIST_ICON2 394 //continuing from IDI_VIEW_DOCLIST_ICON_DM's ID
#define IDI_VIEW_MONITORING_DIS_ICON2 346
#define IDI_VIEW_DOCLIST_ICON2 347
//
// TOOLBAR ICO - set 2, Dark Mode
//
#define IDI_NEW_ICON_DM2 346
#define IDI_OPEN_ICON_DM2 347
#define IDI_CLOSE_ICON_DM2 348
#define IDI_CLOSEALL_ICON_DM2 349
#define IDI_SAVE_ICON_DM2 350
#define IDI_SAVEALL_ICON_DM2 351
#define IDI_CUT_ICON_DM2 352
#define IDI_COPY_ICON_DM2 353
#define IDI_PASTE_ICON_DM2 354
#define IDI_UNDO_ICON_DM2 355
#define IDI_REDO_ICON_DM2 356
#define IDI_FIND_ICON_DM2 357
#define IDI_REPLACE_ICON_DM2 358
#define IDI_ZOOMIN_ICON_DM2 359
#define IDI_ZOOMOUT_ICON_DM2 360
#define IDI_VIEW_UD_DLG_ICON_DM2 361
#define IDI_PRINT_ICON_DM2 362
#define IDI_STARTRECORD_ICON_DM2 363
#define IDI_STARTRECORD_DISABLE_ICON_DM2 364
#define IDI_STOPRECORD_ICON_DM2 365
#define IDI_STOPRECORD_DISABLE_ICON_DM2 366
#define IDI_PLAYRECORD_ICON_DM2 367
#define IDI_PLAYRECORD_DISABLE_ICON_DM2 368
#define IDI_SAVERECORD_ICON_DM2 369
#define IDI_SAVERECORD_DISABLE_ICON_DM2 370
#define IDI_MMPLAY_DIS_ICON_DM2 371
#define IDI_MMPLAY_ICON_DM2 372
#define IDI_VIEW_ALL_CHAR_ICON_DM2 373
#define IDI_VIEW_INDENT_ICON_DM2 374
#define IDI_VIEW_WRAP_ICON_DM2 375
#define IDI_SAVE_DISABLE_ICON_DM2 376
#define IDI_SAVEALL_DISABLE_ICON_DM2 377
#define IDI_CUT_DISABLE_ICON_DM2 378
#define IDI_COPY_DISABLE_ICON_DM2 379
#define IDI_PASTE_DISABLE_ICON_DM2 380
#define IDI_UNDO_DISABLE_ICON_DM2 381
#define IDI_REDO_DISABLE_ICON_DM2 382
#define IDI_SYNCV_ICON_DM2 383
#define IDI_SYNCV_DISABLE_ICON_DM2 384
#define IDI_SYNCH_ICON_DM2 385
#define IDI_SYNCH_DISABLE_ICON_DM2 386
#define IDI_VIEW_DOC_MAP_ICON_DM2 387
#define IDI_VIEW_FILEBROWSER_ICON_DM2 388
#define IDI_VIEW_FUNCLIST_ICON_DM2 389
#define IDI_VIEW_MONITORING_ICON_DM2 390
#define IDI_VIEW_DOCLIST_ICON_DM2 391
#define IDI_NEW_ICON_DM2 351
#define IDI_OPEN_ICON_DM2 352
#define IDI_CLOSE_ICON_DM2 353
#define IDI_CLOSEALL_ICON_DM2 354
#define IDI_SAVE_ICON_DM2 355
#define IDI_SAVEALL_ICON_DM2 356
#define IDI_CUT_ICON_DM2 357
#define IDI_COPY_ICON_DM2 358
#define IDI_PASTE_ICON_DM2 359
#define IDI_UNDO_ICON_DM2 360
#define IDI_REDO_ICON_DM2 361
#define IDI_FIND_ICON_DM2 362
#define IDI_REPLACE_ICON_DM2 363
#define IDI_ZOOMIN_ICON_DM2 364
#define IDI_ZOOMOUT_ICON_DM2 365
#define IDI_VIEW_UD_DLG_ICON_DM2 366
#define IDI_PRINT_ICON_DM2 367
#define IDI_STARTRECORD_ICON_DM2 368
#define IDI_STARTRECORD_DISABLE_ICON_DM2 369
#define IDI_STOPRECORD_ICON_DM2 370
#define IDI_STOPRECORD_DISABLE_ICON_DM2 371
#define IDI_PLAYRECORD_ICON_DM2 372
#define IDI_PLAYRECORD_DISABLE_ICON_DM2 373
#define IDI_SAVERECORD_ICON_DM2 374
#define IDI_SAVERECORD_DISABLE_ICON_DM2 375
#define IDI_MMPLAY_DIS_ICON_DM2 376
#define IDI_MMPLAY_ICON_DM2 377
#define IDI_VIEW_ALL_CHAR_ICON_DM2 378
#define IDI_VIEW_INDENT_ICON_DM2 379
#define IDI_VIEW_WRAP_ICON_DM2 380
#define IDI_SAVE_DISABLE_ICON_DM2 381
#define IDI_SAVEALL_DISABLE_ICON_DM2 382
#define IDI_CUT_DISABLE_ICON_DM2 383
#define IDI_COPY_DISABLE_ICON_DM2 384
#define IDI_PASTE_DISABLE_ICON_DM2 385
#define IDI_UNDO_DISABLE_ICON_DM2 386
#define IDI_REDO_DISABLE_ICON_DM2 387
#define IDI_SYNCV_ICON_DM2 388
#define IDI_SYNCV_DISABLE_ICON_DM2 389
#define IDI_SYNCH_ICON_DM2 390
#define IDI_SYNCH_DISABLE_ICON_DM2 391
#define IDI_VIEW_DOC_MAP_ICON_DM2 392
#define IDI_VIEW_FILEBROWSER_ICON_DM2 393
#define IDI_VIEW_FUNCLIST_ICON_DM2 394
#define IDI_VIEW_MONITORING_ICON_DM2 395
#define IDI_VIEW_MONITORING_DIS_ICON_DM2 396
#define IDI_VIEW_DOCLIST_ICON_DM2 397
@ -278,7 +282,7 @@
#define IDI_FB_FOLDALL_DM 614
#define IDI_FB_EXPANDALL_DM 615
#define IDI_FUNCLIST_ROOT 620
#define IDI_FUNCLIST_ROOT IDI_PROJECT_FILE // using same file
#define IDI_FUNCLIST_NODE 621
#define IDI_FUNCLIST_LEAF 622