From cdf32d198b84927539fc0428e3fdbbf09fee85df Mon Sep 17 00:00:00 2001 From: ozone10 Date: Sat, 25 May 2024 18:44:22 +0200 Subject: [PATCH] Reorganize icons folder - remove unused delete icon and code related to it - remove notepadPlus.Resource.targets - fix dark mode edit control in preference file association subdialog ref https://github.com/notepad-plus-plus/notepad-plus-plus/issues/14959#issuecomment-2131289263 Close #15192 --- PowerEditor/src/MISC/RegExt/regExtDlg.cpp | 17 +- PowerEditor/src/MISC/RegExt/regExtDlg.rc | 4 +- PowerEditor/src/Notepad_plus.rc | 567 +++++++++--------- .../{darkMode => dark}/about/chameleon.ico | Bin .../{darkMode => dark}/panels/asciiPanel.ico | Bin .../panels/clipboardPanel.ico | Bin .../{darkMode => dark}/panels/docList.ico | Bin .../{darkMode => dark}/panels/docMap.ico | Bin .../panels/fb_expand_all.bmp | Bin .../{darkMode => dark}/panels/fb_fold_all.bmp | Bin .../panels/fb_select_current_file.bmp | Bin .../{darkMode => dark}/panels/fileBrowser.ico | Bin .../panels/funclstPreferences.bmp | Bin .../panels/funclstReload.bmp | Bin .../{darkMode => dark}/panels/funclstSort.bmp | Bin .../panels/functionList.ico | Bin .../panels/projectPanel.ico | Bin .../tabbar/closeTabButton.bmp | Bin .../tabbar/closeTabButton_hover.bmp | Bin .../tabbar/closeTabButton_inact.bmp | Bin .../tabbar/closeTabButton_push.bmp | Bin .../{darkMode => dark}/tabbar/monitoring.ico | Bin .../{darkMode => dark}/tabbar/readonly.ico | Bin .../icons/{darkMode => dark}/tabbar/saved.ico | Bin .../{darkMode => dark}/tabbar/unsaved.ico | Bin .../toolbar/filled}/allChars_off.ico | Bin .../toolbar/filled/close_off.ico} | Bin .../toolbar/filled/closeall_off.ico} | Bin .../toolbar/filled/copy_dis.ico} | Bin .../toolbar/filled/copy_off.ico} | Bin .../toolbar/filled}/cut_dis.ico | Bin .../toolbar/filled}/cut_off.ico | Bin .../toolbar/filled}/docList_off.ico | Bin .../toolbar/filled}/docMap_off.ico | Bin .../toolbar/filled}/fileBrowser_off.ico | Bin .../toolbar/filled}/find_off.ico | Bin .../toolbar/filled}/findrep_off.ico | Bin .../toolbar/filled}/funcList_off.ico | Bin .../toolbar/filled}/indentGuide_off.ico | Bin .../toolbar/filled}/monitoring_off.ico | Bin .../toolbar/filled}/new_off.ico | Bin .../toolbar/filled}/open_off.ico | Bin .../toolbar/filled}/paste_dis.ico | Bin .../toolbar/filled}/paste_off.ico | Bin .../toolbar/filled}/playrecord_dis.ico | Bin .../toolbar/filled}/playrecord_m_dis.ico | Bin .../toolbar/filled}/playrecord_m_off.ico | Bin .../toolbar/filled}/playrecord_off.ico | Bin .../toolbar/filled/print_off.ico} | Bin .../toolbar/filled}/redo_dis.ico | Bin .../toolbar/filled}/redo_off.ico | Bin .../toolbar/filled}/save_dis.ico | Bin .../toolbar/filled}/save_off.ico | Bin .../toolbar/filled}/saveall_dis.ico | Bin .../toolbar/filled}/saveall_off.ico | Bin .../toolbar/filled}/saverecord_dis.ico | Bin .../toolbar/filled}/saverecord_off.ico | Bin .../toolbar/filled}/startrecord_dis.ico | Bin .../toolbar/filled}/startrecord_off.ico | Bin .../toolbar/filled}/stoprecord_dis.ico | Bin .../toolbar/filled}/stoprecord_off.ico | Bin .../toolbar/filled}/syncH_dis.ico | Bin .../toolbar/filled}/syncH_off.ico | Bin .../toolbar/filled}/syncV_dis.ico | Bin .../toolbar/filled}/syncV_off.ico | Bin .../toolbar/filled/udl_off.ico} | Bin .../toolbar/filled}/undo_dis.ico | Bin .../toolbar/filled}/undo_off.ico | Bin .../toolbar/filled}/wrap_off.ico | Bin .../toolbar/filled}/zoomIn_off.ico | Bin .../toolbar/filled}/zoomOut_off.ico | Bin .../toolbar/regular}/allChars_off.ico | Bin .../toolbar/regular/close_off.ico} | Bin .../toolbar/regular/closeall_off.ico} | Bin .../toolbar/regular/copy_dis.ico} | Bin .../toolbar/regular/copy_off.ico} | Bin .../toolbar/regular}/cut_dis.ico | Bin .../toolbar/regular}/cut_off.ico | Bin .../toolbar/regular}/docList_off.ico | Bin .../toolbar/regular}/docMap_off.ico | Bin .../toolbar/regular}/fileBrowser_off.ico | Bin .../toolbar/regular}/find_off.ico | Bin .../toolbar/regular}/findrep_off.ico | Bin .../toolbar/regular}/funcList_off.ico | Bin .../toolbar/regular}/indentGuide_off.ico | Bin .../toolbar/regular}/monitoring_off.ico | Bin .../toolbar/regular}/new_off.ico | Bin .../toolbar/regular}/open_off.ico | Bin .../toolbar/regular}/paste_dis.ico | Bin .../toolbar/regular}/paste_off.ico | Bin .../toolbar/regular}/playrecord_dis.ico | Bin .../toolbar/regular}/playrecord_m_dis.ico | Bin .../toolbar/regular}/playrecord_m_off.ico | Bin .../toolbar/regular}/playrecord_off.ico | Bin .../toolbar/regular/print_off.ico} | Bin .../toolbar/regular}/redo_dis.ico | Bin .../toolbar/regular}/redo_off.ico | Bin .../toolbar/regular}/save_dis.ico | Bin .../toolbar/regular}/save_off.ico | Bin .../toolbar/regular}/saveall_dis.ico | Bin .../toolbar/regular}/saveall_off.ico | Bin .../toolbar/regular}/saverecord_dis.ico | Bin .../toolbar/regular}/saverecord_off.ico | Bin .../toolbar/regular}/startrecord_dis.ico | Bin .../toolbar/regular}/startrecord_off.ico | Bin .../toolbar/regular}/stoprecord_dis.ico | Bin .../toolbar/regular}/stoprecord_off.ico | Bin .../toolbar/regular}/syncH_dis.ico | Bin .../toolbar/regular}/syncH_off.ico | Bin .../toolbar/regular}/syncV_dis.ico | Bin .../toolbar/regular}/syncV_off.ico | Bin .../toolbar/regular/udl_off.ico} | Bin .../toolbar/regular}/undo_dis.ico | Bin .../toolbar/regular}/undo_off.ico | Bin .../toolbar/regular}/wrap_off.ico | Bin .../toolbar/regular}/zoomIn_off.ico | Bin .../toolbar/regular}/zoomOut_off.ico | Bin PowerEditor/src/icons/delete.ico | Bin 2998 -> 0 bytes .../panels/asciiPanel.ico} | Bin .../panels/clipboardPanel.ico} | Bin .../panels/docList.ico} | Bin .../{docMap2.ico => light/panels/docMap.ico} | Bin .../panels/fileBrowser.ico} | Bin .../panels/functionList.ico} | Bin .../panels/projectPanel.ico} | Bin .../toolbar/filled}/allChars_off.ico | Bin .../toolbar/filled/close_off.ico} | Bin .../toolbar/filled/closeall_off.ico} | Bin .../toolbar/filled/copy_dis.ico} | Bin .../toolbar/filled/copy_off.ico} | Bin .../toolbar/filled}/cut_dis.ico | Bin .../toolbar/filled}/cut_off.ico | Bin .../toolbar/filled}/docList_off.ico | Bin .../toolbar/filled}/docMap_off.ico | Bin .../toolbar/filled}/fileBrowser_off.ico | Bin .../toolbar/filled}/find_off.ico | Bin .../toolbar/filled}/findrep_off.ico | Bin .../toolbar/filled}/funcList_off.ico | Bin .../toolbar/filled}/indentGuide_off.ico | Bin .../toolbar/filled}/monitoring_off.ico | Bin .../toolbar/filled}/new_off.ico | Bin .../toolbar/filled}/open_off.ico | Bin .../toolbar/filled}/paste_dis.ico | Bin .../toolbar/filled}/paste_off.ico | Bin .../toolbar/filled}/playrecord_dis.ico | Bin .../toolbar/filled}/playrecord_m_dis.ico | Bin .../toolbar/filled}/playrecord_m_off.ico | Bin .../toolbar/filled}/playrecord_off.ico | Bin .../toolbar/filled/print_off.ico} | Bin .../toolbar/filled}/redo_dis.ico | Bin .../toolbar/filled}/redo_off.ico | Bin .../toolbar/filled}/save_dis.ico | Bin .../toolbar/filled}/save_off.ico | Bin .../toolbar/filled}/saveall_dis.ico | Bin .../toolbar/filled}/saveall_off.ico | Bin .../toolbar/filled}/saverecord_dis.ico | Bin .../toolbar/filled}/saverecord_off.ico | Bin .../toolbar/filled}/startrecord_dis.ico | Bin .../toolbar/filled}/startrecord_off.ico | Bin .../toolbar/filled}/stoprecord_dis.ico | Bin .../toolbar/filled}/stoprecord_off.ico | Bin .../toolbar/filled}/syncH_dis.ico | Bin .../toolbar/filled}/syncH_off.ico | Bin .../toolbar/filled}/syncV_dis.ico | Bin .../toolbar/filled}/syncV_off.ico | Bin .../toolbar/filled/udl_off.ico} | Bin .../toolbar/filled}/undo_dis.ico | Bin .../toolbar/filled}/undo_off.ico | Bin .../toolbar/filled}/wrap_off.ico | Bin .../toolbar/filled}/zoomIn_off.ico | Bin .../toolbar/filled}/zoomOut_off.ico | Bin .../toolbar/regular}/allChars_off.ico | Bin .../toolbar/regular/close_off.ico} | Bin .../toolbar/regular/closeall_off.ico} | Bin .../toolbar/regular/copy_dis.ico} | Bin .../toolbar/regular/copy_off.ico} | Bin .../{ => light/toolbar/regular}/cut_dis.ico | Bin .../{ => light/toolbar/regular}/cut_off.ico | Bin .../toolbar/regular}/docList_off.ico | Bin .../toolbar/regular}/docMap_off.ico | Bin .../toolbar/regular}/fileBrowser_off.ico | Bin .../{ => light/toolbar/regular}/find_off.ico | Bin .../toolbar/regular}/findrep_off.ico | Bin .../toolbar/regular}/funcList_off.ico | Bin .../toolbar/regular}/indentGuide_off.ico | Bin .../toolbar/regular}/monitoring_off.ico | Bin .../{ => light/toolbar/regular}/new_off.ico | Bin .../{ => light/toolbar/regular}/open_off.ico | Bin .../{ => light/toolbar/regular}/paste_dis.ico | Bin .../{ => light/toolbar/regular}/paste_off.ico | Bin .../toolbar/regular}/playrecord_dis.ico | Bin .../toolbar/regular}/playrecord_m_dis.ico | Bin .../toolbar/regular}/playrecord_m_off.ico | Bin .../toolbar/regular}/playrecord_off.ico | Bin .../toolbar/regular/print_off.ico} | Bin .../{ => light/toolbar/regular}/redo_dis.ico | Bin .../{ => light/toolbar/regular}/redo_off.ico | Bin .../{ => light/toolbar/regular}/save_dis.ico | Bin .../{ => light/toolbar/regular}/save_off.ico | Bin .../toolbar/regular}/saveall_dis.ico | Bin .../toolbar/regular}/saveall_off.ico | Bin .../toolbar/regular}/saverecord_dis.ico | Bin .../toolbar/regular}/saverecord_off.ico | Bin .../toolbar/regular}/startrecord_dis.ico | Bin .../toolbar/regular}/startrecord_off.ico | Bin .../toolbar/regular}/stoprecord_dis.ico | Bin .../toolbar/regular}/stoprecord_off.ico | Bin .../{ => light/toolbar/regular}/syncH_dis.ico | Bin .../{ => light/toolbar/regular}/syncH_off.ico | Bin .../{ => light/toolbar/regular}/syncV_dis.ico | Bin .../{ => light/toolbar/regular}/syncV_off.ico | Bin .../toolbar/regular/udl_off.ico} | Bin .../{ => light/toolbar/regular}/undo_dis.ico | Bin .../{ => light/toolbar/regular}/undo_off.ico | Bin .../{ => light/toolbar/regular}/wrap_off.ico | Bin .../toolbar/regular}/zoomIn_off.ico | Bin .../toolbar/regular}/zoomOut_off.ico | Bin .../icons/{ => standard/about}/chameleon.ico | Bin .../{ => standard/panels}/fb_expand_all.bmp | Bin .../{ => standard/panels}/fb_fold_all.bmp | Bin .../{ => standard/panels}/fb_root_close.bmp | Bin .../{ => standard/panels}/fb_root_open.bmp | Bin .../panels}/fb_select_current_file.bmp | Bin .../{ => standard/panels}/funcList_leaf.bmp | Bin .../{ => standard/panels}/funcList_node.bmp | Bin .../panels}/funclstPreferences.bmp | Bin .../{ => standard/panels}/funclstReload.bmp | Bin .../{ => standard/panels}/funclstSort.bmp | Bin .../{ => standard/panels}/project_file.bmp | Bin .../panels}/project_file_invalid.bmp | Bin .../panels}/project_folder_close.bmp | Bin .../panels}/project_folder_open.bmp | Bin .../{ => standard/panels}/project_root.bmp | Bin .../panels}/project_work_space.bmp | Bin .../panels}/project_work_space_dirty.bmp | Bin .../panels/tabbar}/asciiPanel.ico | Bin .../panels/tabbar}/clipboardPanel.ico | Bin .../{ => standard/panels/tabbar}/docList.ico | Bin .../{ => standard/panels/tabbar}/docMap.ico | Bin .../panels/tabbar}/fileBrowser.ico | Bin .../panels/tabbar}/functionList.ico | Bin .../panels/tabbar}/projectPanel.ico | Bin .../{ => standard/tabbar}/closeTabButton.bmp | Bin .../tabbar}/closeTabButton_hover.bmp | Bin .../tabbar}/closeTabButton_inact.bmp | Bin .../tabbar}/closeTabButton_push.bmp | Bin .../{ => standard/tabbar}/monitoring.ico | Bin .../icons/{ => standard/tabbar}/readonly.ico | Bin .../{ => standard/tabbar}/readonly_alt.ico | Bin .../src/icons/{ => standard/tabbar}/saved.ico | Bin .../icons/{ => standard/tabbar}/saved_alt.ico | Bin .../icons/{ => standard/tabbar}/unsaved.ico | Bin .../{ => standard/tabbar}/unsaved_alt.ico | Bin .../toolbar/allChars.bmp} | Bin .../icons/{ => standard/toolbar}/closeAll.bmp | Bin .../{ => standard/toolbar}/closeFile.bmp | Bin .../src/icons/{ => standard/toolbar}/copy.bmp | Bin .../src/icons/{ => standard/toolbar}/cut.bmp | Bin .../icons/{ => standard/toolbar}/docList.bmp | Bin .../icons/{ => standard/toolbar}/docMap.bmp | Bin .../{ => standard/toolbar}/fileBrowser.bmp | Bin .../src/icons/{ => standard/toolbar}/find.bmp | Bin .../{ => standard/toolbar}/findReplace.bmp | Bin .../toolbar/funcList.bmp} | Bin .../{ => standard/toolbar}/indentGuide.bmp | Bin .../toolbar/monitoring.bmp} | Bin .../icons/{ => standard/toolbar}/newFile.bmp | Bin .../icons/{ => standard/toolbar}/openFile.bmp | Bin .../icons/{ => standard/toolbar}/paste.bmp | Bin .../{ => standard/toolbar}/playRecord.bmp | Bin .../{ => standard/toolbar}/playRecord_m.bmp | Bin .../icons/{ => standard/toolbar}/print.bmp | Bin .../src/icons/{ => standard/toolbar}/redo.bmp | Bin .../icons/{ => standard/toolbar}/saveAll.bmp | Bin .../icons/{ => standard/toolbar}/saveFile.bmp | Bin .../{ => standard/toolbar}/saveRecord.bmp | Bin .../{ => standard/toolbar}/startRecord.bmp | Bin .../{ => standard/toolbar}/stopRecord.bmp | Bin .../icons/{ => standard/toolbar}/syncH.bmp | Bin .../icons/{ => standard/toolbar}/syncV.bmp | Bin .../toolbar/udl.bmp} | Bin .../src/icons/{ => standard/toolbar}/undo.bmp | Bin .../src/icons/{ => standard/toolbar}/wrap.bmp | Bin .../icons/{ => standard/toolbar}/zoomIn.bmp | Bin .../icons/{ => standard/toolbar}/zoomOut.bmp | Bin .../visual.net/notepadPlus.Resource.targets | 122 ---- PowerEditor/visual.net/notepadPlus.vcxproj | 1 - 287 files changed, 292 insertions(+), 419 deletions(-) rename PowerEditor/src/icons/{darkMode => dark}/about/chameleon.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/asciiPanel.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/clipboardPanel.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/docList.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/docMap.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/fb_expand_all.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/fb_fold_all.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/fb_select_current_file.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/fileBrowser.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/funclstPreferences.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/funclstReload.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/funclstSort.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/functionList.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/panels/projectPanel.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/closeTabButton.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/closeTabButton_hover.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/closeTabButton_inact.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/closeTabButton_push.bmp (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/monitoring.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/readonly.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/saved.ico (100%) rename PowerEditor/src/icons/{darkMode => dark}/tabbar/unsaved.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/allChars_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI/supp_off.ico => dark/toolbar/filled/close_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI/suppall_off.ico => dark/toolbar/filled/closeall_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI/dupli_dis.ico => dark/toolbar/filled/copy_dis.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI/dupli_off.ico => dark/toolbar/filled/copy_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/cut_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/cut_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/docList_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/docMap_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/fileBrowser_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/find_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/findrep_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/funcList_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/indentGuide_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/monitoring_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/new_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/open_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/paste_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/paste_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/playrecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/playrecord_m_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/playrecord_m_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/playrecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI/imprim_off.ico => dark/toolbar/filled/print_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/redo_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/redo_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/save_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/save_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/saveall_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/saveall_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/saverecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/saverecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/filled}/startrecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/startrecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/stoprecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/stoprecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/syncH_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/syncH_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/syncV_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/syncV_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico => dark/toolbar/filled/udl_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/undo_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/undo_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/wrap_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/zoomIn_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/filled}/zoomOut_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/allChars_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI/supp_off.ico => dark/toolbar/regular/close_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI/suppall_off.ico => dark/toolbar/regular/closeall_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI/dupli_dis.ico => dark/toolbar/regular/copy_dis.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI/dupli_off.ico => dark/toolbar/regular/copy_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/cut_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/cut_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/docList_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/docMap_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/fileBrowser_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/find_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/findrep_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/funcList_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/indentGuide_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/monitoring_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/new_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/open_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/paste_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/paste_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/playrecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/playrecord_m_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/playrecord_m_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/playrecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI/imprim_off.ico => dark/toolbar/regular/print_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/redo_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/redo_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/save_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/save_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/saveall_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/saveall_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/saverecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/saverecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/filledFluentUI => dark/toolbar/regular}/startrecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/startrecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/stoprecord_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/stoprecord_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/syncH_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/syncH_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/syncV_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/syncV_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI/userDefineDlg_off.ico => dark/toolbar/regular/udl_off.ico} (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/undo_dis.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/undo_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/wrap_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/zoomIn_off.ico (100%) rename PowerEditor/src/icons/{darkMode/toolbar/FluentUI => dark/toolbar/regular}/zoomOut_off.ico (100%) delete mode 100644 PowerEditor/src/icons/delete.ico rename PowerEditor/src/icons/{asciiPanel2.ico => light/panels/asciiPanel.ico} (100%) rename PowerEditor/src/icons/{clipboardPanel2.ico => light/panels/clipboardPanel.ico} (100%) rename PowerEditor/src/icons/{docList2.ico => light/panels/docList.ico} (100%) rename PowerEditor/src/icons/{docMap2.ico => light/panels/docMap.ico} (100%) rename PowerEditor/src/icons/{fileBrowser2.ico => light/panels/fileBrowser.ico} (100%) rename PowerEditor/src/icons/{functionList2.ico => light/panels/functionList.ico} (100%) rename PowerEditor/src/icons/{projectPanel2.ico => light/panels/projectPanel.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/allChars_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI/supp_off.ico => light/toolbar/filled/close_off.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI/suppall_off.ico => light/toolbar/filled/closeall_off.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI/dupli_dis.ico => light/toolbar/filled/copy_dis.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI/dupli_off.ico => light/toolbar/filled/copy_off.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/cut_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/cut_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/docList_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/docMap_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/fileBrowser_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/find_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/findrep_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/funcList_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/indentGuide_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/monitoring_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/new_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/open_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/paste_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/paste_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/playrecord_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/playrecord_m_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/playrecord_m_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/playrecord_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI/imprim_off.ico => light/toolbar/filled/print_off.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/redo_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/redo_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/save_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/save_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/saveall_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/saveall_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/saverecord_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/saverecord_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/startrecord_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/startrecord_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/stoprecord_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/stoprecord_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/syncH_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/syncH_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/syncV_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/syncV_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI/userDefineDlg_off.ico => light/toolbar/filled/udl_off.ico} (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/undo_dis.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/undo_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/wrap_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/zoomIn_off.ico (100%) rename PowerEditor/src/icons/{filledFluentUI => light/toolbar/filled}/zoomOut_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/allChars_off.ico (100%) rename PowerEditor/src/icons/{supp_off.ico => light/toolbar/regular/close_off.ico} (100%) rename PowerEditor/src/icons/{suppall_off.ico => light/toolbar/regular/closeall_off.ico} (100%) rename PowerEditor/src/icons/{dupli_dis.ico => light/toolbar/regular/copy_dis.ico} (100%) rename PowerEditor/src/icons/{dupli_off.ico => light/toolbar/regular/copy_off.ico} (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/cut_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/cut_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/docList_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/docMap_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/fileBrowser_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/find_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/findrep_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/funcList_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/indentGuide_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/monitoring_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/new_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/open_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/paste_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/paste_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/playrecord_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/playrecord_m_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/playrecord_m_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/playrecord_off.ico (100%) rename PowerEditor/src/icons/{imprim_off.ico => light/toolbar/regular/print_off.ico} (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/redo_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/redo_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/save_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/save_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/saveall_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/saveall_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/saverecord_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/saverecord_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/startrecord_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/startrecord_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/stoprecord_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/stoprecord_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/syncH_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/syncH_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/syncV_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/syncV_off.ico (100%) rename PowerEditor/src/icons/{userDefineDlg_off.ico => light/toolbar/regular/udl_off.ico} (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/undo_dis.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/undo_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/wrap_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/zoomIn_off.ico (100%) rename PowerEditor/src/icons/{ => light/toolbar/regular}/zoomOut_off.ico (100%) rename PowerEditor/src/icons/{ => standard/about}/chameleon.ico (100%) rename PowerEditor/src/icons/{ => standard/panels}/fb_expand_all.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/fb_fold_all.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/fb_root_close.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/fb_root_open.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/fb_select_current_file.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/funcList_leaf.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/funcList_node.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/funclstPreferences.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/funclstReload.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/funclstSort.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_file.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_file_invalid.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_folder_close.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_folder_open.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_root.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_work_space.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels}/project_work_space_dirty.bmp (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/asciiPanel.ico (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/clipboardPanel.ico (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/docList.ico (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/docMap.ico (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/fileBrowser.ico (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/functionList.ico (100%) rename PowerEditor/src/icons/{ => standard/panels/tabbar}/projectPanel.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/closeTabButton.bmp (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/closeTabButton_hover.bmp (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/closeTabButton_inact.bmp (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/closeTabButton_push.bmp (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/monitoring.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/readonly.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/readonly_alt.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/saved.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/saved_alt.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/unsaved.ico (100%) rename PowerEditor/src/icons/{ => standard/tabbar}/unsaved_alt.ico (100%) rename PowerEditor/src/icons/{invisibleChar.bmp => standard/toolbar/allChars.bmp} (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/closeAll.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/closeFile.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/copy.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/cut.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/docList.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/docMap.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/fileBrowser.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/find.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/findReplace.bmp (100%) rename PowerEditor/src/icons/{functionList.bmp => standard/toolbar/funcList.bmp} (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/indentGuide.bmp (100%) rename PowerEditor/src/icons/{fileMonitoring.bmp => standard/toolbar/monitoring.bmp} (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/newFile.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/openFile.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/paste.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/playRecord.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/playRecord_m.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/print.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/redo.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/saveAll.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/saveFile.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/saveRecord.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/startRecord.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/stopRecord.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/syncH.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/syncV.bmp (100%) rename PowerEditor/src/icons/{showPannel.bmp => standard/toolbar/udl.bmp} (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/undo.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/wrap.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/zoomIn.bmp (100%) rename PowerEditor/src/icons/{ => standard/toolbar}/zoomOut.bmp (100%) delete mode 100644 PowerEditor/visual.net/notepadPlus.Resource.targets diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp index a5ad86dc2..ffbe15421 100644 --- a/PowerEditor/src/MISC/RegExt/regExtDlg.cpp +++ b/PowerEditor/src/MISC/RegExt/regExtDlg.cpp @@ -86,7 +86,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa NppParameters& nppParam = NppParameters::getInstance(); switch (Message) { - case WM_INITDIALOG : + case WM_INITDIALOG: { getRegisteredExts(); getDefSupportedExts(); @@ -107,6 +107,11 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa return TRUE; } + case WM_CTLCOLOREDIT: + { + return NppDarkMode::onCtlColorSofter(reinterpret_cast(wParam)); + } + case WM_CTLCOLORLISTBOX: { return NppDarkMode::onCtlColorListbox(wParam, lParam); @@ -140,15 +145,7 @@ intptr_t CALLBACK RegExtDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPa break; } - case WM_DRAWITEM : - { - HICON hIcon = ::LoadIcon(_hInst, MAKEINTRESOURCE(IDI_DELETE_ICON)); - DRAWITEMSTRUCT *pdis = (DRAWITEMSTRUCT *)lParam; - ::DrawIcon(pdis->hDC, 0, 0, hIcon); - return TRUE; - } - - case WM_COMMAND : + case WM_COMMAND: { // Handle File association list extension if (LOWORD(wParam) == IDC_REGEXT_LANGEXT_LIST || LOWORD(wParam) == IDC_REGEXT_REGISTEREDEXTS_LIST) diff --git a/PowerEditor/src/MISC/RegExt/regExtDlg.rc b/PowerEditor/src/MISC/RegExt/regExtDlg.rc index 69f2d339d..fa44d4763 100644 --- a/PowerEditor/src/MISC/RegExt/regExtDlg.rc +++ b/PowerEditor/src/MISC/RegExt/regExtDlg.rc @@ -27,11 +27,9 @@ BEGIN LTEXT "Supported extensions:",IDC_SUPPORTEDEXTS_STATIC,70,18,80,8 LISTBOX IDC_REGEXT_LANG_LIST,70,30,100,125,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP LISTBOX IDC_REGEXT_LANGEXT_LIST,175,30,80,125,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP - EDITTEXT IDC_CUSTOMEXT_EDIT,175,75,80,14,ES_AUTOHSCROLL | NOT WS_VISIBLE + EDITTEXT IDC_CUSTOMEXT_EDIT,175,86,80,12,ES_AUTOHSCROLL | NOT WS_VISIBLE PUSHBUTTON "->",IDC_ADDFROMLANGEXT_BUTTON,265,76,25,14 PUSHBUTTON "<-",IDC_REMOVEEXT_BUTTON,265,96,25,14 LTEXT "Registered extensions:",IDC_REGISTEREDEXTS_STATIC,300,18,80,8 LISTBOX IDC_REGEXT_REGISTEREDEXTS_LIST,300,30,80,125,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END - - diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 119e9158a..6a235307a 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -57,8 +57,8 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_M30ICON ICON "icons/npp.ico" -IDI_CHAMELEON ICON "icons/chameleon.ico" -IDI_CHAMELEON_DM ICON "icons/darkMode/about/chameleon.ico" +IDI_CHAMELEON ICON "icons/standard/about/chameleon.ico" +IDI_CHAMELEON_DM ICON "icons/dark/about/chameleon.ico" //IDI_JESUISCHARLIE ICON "icons/Je_suis_Charlie.ico" //IDI_GILETJAUNE ICON "icons/giletJaune.ico" //IDI_SAMESEXMARRIAGE ICON "icons/same-sexMarriageTaiwan.ico" @@ -67,220 +67,220 @@ IDI_ICONABSENT ICON "icons/iconAbsent.ico" // // TOOLBAR ICO - set 1 // -IDI_NEW_ICON ICON "icons/new_off.ico" -IDI_OPEN_ICON ICON "icons/open_off.ico" -IDI_CLOSE_ICON ICON "icons/supp_off.ico" -IDI_CLOSEALL_ICON ICON "icons/suppall_off.ico" -IDI_SAVE_ICON ICON "icons/save_off.ico" -IDI_SAVEALL_ICON ICON "icons/saveall_off.ico" -IDI_CUT_ICON ICON "icons/cut_off.ico" -IDI_COPY_ICON ICON "icons/dupli_off.ico" -IDI_PASTE_ICON ICON "icons/paste_off.ico" -IDI_UNDO_ICON ICON "icons/undo_off.ico" -IDI_REDO_ICON ICON "icons/redo_off.ico" -IDI_FIND_ICON ICON "icons/find_off.ico" -IDI_REPLACE_ICON ICON "icons/findrep_off.ico" -IDI_ZOOMIN_ICON ICON "icons/zoomIn_off.ico" -IDI_ZOOMOUT_ICON ICON "icons/zoomOut_off.ico" -IDI_VIEW_UD_DLG_ICON ICON "icons/userDefineDlg_off.ico" -IDI_PRINT_ICON ICON "icons/imprim_off.ico" -IDI_STARTRECORD_ICON ICON "icons/startrecord_off.ico" -IDI_STARTRECORD_DISABLE_ICON ICON "icons/startrecord_dis.ico" -IDI_STOPRECORD_ICON ICON "icons/stoprecord_off.ico" -IDI_STOPRECORD_DISABLE_ICON ICON "icons/stoprecord_dis.ico" -IDI_PLAYRECORD_ICON ICON "icons/playrecord_off.ico" -IDI_PLAYRECORD_DISABLE_ICON ICON "icons/playrecord_dis.ico" -IDI_SAVERECORD_ICON ICON "icons/saverecord_off.ico" -IDI_SAVERECORD_DISABLE_ICON ICON "icons/saverecord_dis.ico" -IDI_MMPLAY_DIS_ICON ICON "icons/playrecord_m_dis.ico" -IDI_MMPLAY_ICON ICON "icons/playrecord_m_off.ico" -IDI_VIEW_ALL_CHAR_ICON ICON "icons/allChars_off.ico" -IDI_VIEW_INDENT_ICON ICON "icons/indentGuide_off.ico" -IDI_VIEW_WRAP_ICON ICON "icons/wrap_off.ico" -IDI_SAVE_DISABLE_ICON ICON "icons/save_dis.ico" -IDI_SAVEALL_DISABLE_ICON ICON "icons/saveall_dis.ico" -IDI_CUT_DISABLE_ICON ICON "icons/cut_dis.ico" -IDI_COPY_DISABLE_ICON ICON "icons/dupli_dis.ico" -IDI_PASTE_DISABLE_ICON ICON "icons/paste_dis.ico" -IDI_UNDO_DISABLE_ICON ICON "icons/undo_dis.ico" -IDI_REDO_DISABLE_ICON ICON "icons/redo_dis.ico" -IDI_SYNCV_ICON ICON "icons/syncV_off.ico" -IDI_SYNCV_DISABLE_ICON ICON "icons/syncV_dis.ico" -IDI_SYNCH_ICON ICON "icons/syncH_off.ico" -IDI_SYNCH_DISABLE_ICON ICON "icons/syncH_dis.ico" -IDI_VIEW_DOC_MAP_ICON ICON "icons/docMap_off.ico" -IDI_VIEW_DOCLIST_ICON ICON "icons/docList_off.ico" -IDI_VIEW_FUNCLIST_ICON ICON "icons/funcList_off.ico" -IDI_VIEW_FILEBROWSER_ICON ICON "icons/fileBrowser_off.ico" -IDI_VIEW_MONITORING_ICON ICON "icons/monitoring_off.ico" +IDI_NEW_ICON ICON "icons/light/toolbar/regular/new_off.ico" +IDI_OPEN_ICON ICON "icons/light/toolbar/regular/open_off.ico" +IDI_CLOSE_ICON ICON "icons/light/toolbar/regular/close_off.ico" +IDI_CLOSEALL_ICON ICON "icons/light/toolbar/regular/closeall_off.ico" +IDI_SAVE_ICON ICON "icons/light/toolbar/regular/save_off.ico" +IDI_SAVEALL_ICON ICON "icons/light/toolbar/regular/saveall_off.ico" +IDI_CUT_ICON ICON "icons/light/toolbar/regular/cut_off.ico" +IDI_COPY_ICON ICON "icons/light/toolbar/regular/copy_off.ico" +IDI_PASTE_ICON ICON "icons/light/toolbar/regular/paste_off.ico" +IDI_UNDO_ICON ICON "icons/light/toolbar/regular/undo_off.ico" +IDI_REDO_ICON ICON "icons/light/toolbar/regular/redo_off.ico" +IDI_FIND_ICON ICON "icons/light/toolbar/regular/find_off.ico" +IDI_REPLACE_ICON ICON "icons/light/toolbar/regular/findrep_off.ico" +IDI_ZOOMIN_ICON ICON "icons/light/toolbar/regular/zoomIn_off.ico" +IDI_ZOOMOUT_ICON ICON "icons/light/toolbar/regular/zoomOut_off.ico" +IDI_VIEW_UD_DLG_ICON ICON "icons/light/toolbar/regular/udl_off.ico" +IDI_PRINT_ICON ICON "icons/light/toolbar/regular/print_off.ico" +IDI_STARTRECORD_ICON ICON "icons/light/toolbar/regular/startrecord_off.ico" +IDI_STARTRECORD_DISABLE_ICON ICON "icons/light/toolbar/regular/startrecord_dis.ico" +IDI_STOPRECORD_ICON ICON "icons/light/toolbar/regular/stoprecord_off.ico" +IDI_STOPRECORD_DISABLE_ICON ICON "icons/light/toolbar/regular/stoprecord_dis.ico" +IDI_PLAYRECORD_ICON ICON "icons/light/toolbar/regular/playrecord_off.ico" +IDI_PLAYRECORD_DISABLE_ICON ICON "icons/light/toolbar/regular/playrecord_dis.ico" +IDI_SAVERECORD_ICON ICON "icons/light/toolbar/regular/saverecord_off.ico" +IDI_SAVERECORD_DISABLE_ICON ICON "icons/light/toolbar/regular/saverecord_dis.ico" +IDI_MMPLAY_DIS_ICON ICON "icons/light/toolbar/regular/playrecord_m_dis.ico" +IDI_MMPLAY_ICON ICON "icons/light/toolbar/regular/playrecord_m_off.ico" +IDI_VIEW_ALL_CHAR_ICON ICON "icons/light/toolbar/regular/allChars_off.ico" +IDI_VIEW_INDENT_ICON ICON "icons/light/toolbar/regular/indentGuide_off.ico" +IDI_VIEW_WRAP_ICON ICON "icons/light/toolbar/regular/wrap_off.ico" +IDI_SAVE_DISABLE_ICON ICON "icons/light/toolbar/regular/save_dis.ico" +IDI_SAVEALL_DISABLE_ICON ICON "icons/light/toolbar/regular/saveall_dis.ico" +IDI_CUT_DISABLE_ICON ICON "icons/light/toolbar/regular/cut_dis.ico" +IDI_COPY_DISABLE_ICON ICON "icons/light/toolbar/regular/copy_dis.ico" +IDI_PASTE_DISABLE_ICON ICON "icons/light/toolbar/regular/paste_dis.ico" +IDI_UNDO_DISABLE_ICON ICON "icons/light/toolbar/regular/undo_dis.ico" +IDI_REDO_DISABLE_ICON ICON "icons/light/toolbar/regular/redo_dis.ico" +IDI_SYNCV_ICON ICON "icons/light/toolbar/regular/syncV_off.ico" +IDI_SYNCV_DISABLE_ICON ICON "icons/light/toolbar/regular/syncV_dis.ico" +IDI_SYNCH_ICON ICON "icons/light/toolbar/regular/syncH_off.ico" +IDI_SYNCH_DISABLE_ICON ICON "icons/light/toolbar/regular/syncH_dis.ico" +IDI_VIEW_DOC_MAP_ICON ICON "icons/light/toolbar/regular/docMap_off.ico" +IDI_VIEW_DOCLIST_ICON ICON "icons/light/toolbar/regular/docList_off.ico" +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" // // TOOLBAR ICO - set 2 // -IDI_NEW_ICON2 ICON "icons/filledFluentUI/new_off.ico" -IDI_OPEN_ICON2 ICON "icons/filledFluentUI/open_off.ico" -IDI_CLOSE_ICON2 ICON "icons/filledFluentUI/supp_off.ico" -IDI_CLOSEALL_ICON2 ICON "icons/filledFluentUI/suppall_off.ico" -IDI_SAVE_ICON2 ICON "icons/filledFluentUI/save_off.ico" -IDI_SAVEALL_ICON2 ICON "icons/filledFluentUI/saveall_off.ico" -IDI_CUT_ICON2 ICON "icons/filledFluentUI/cut_off.ico" -IDI_COPY_ICON2 ICON "icons/filledFluentUI/dupli_off.ico" -IDI_PASTE_ICON2 ICON "icons/filledFluentUI/paste_off.ico" -IDI_UNDO_ICON2 ICON "icons/filledFluentUI/undo_off.ico" -IDI_REDO_ICON2 ICON "icons/filledFluentUI/redo_off.ico" -IDI_FIND_ICON2 ICON "icons/filledFluentUI/find_off.ico" -IDI_REPLACE_ICON2 ICON "icons/filledFluentUI/findrep_off.ico" -IDI_ZOOMIN_ICON2 ICON "icons/filledFluentUI/zoomIn_off.ico" -IDI_ZOOMOUT_ICON2 ICON "icons/filledFluentUI/zoomOut_off.ico" -IDI_VIEW_UD_DLG_ICON2 ICON "icons/filledFluentUI/userDefineDlg_off.ico" -IDI_PRINT_ICON2 ICON "icons/filledFluentUI/imprim_off.ico" -IDI_STARTRECORD_ICON2 ICON "icons/filledFluentUI/startrecord_off.ico" -IDI_STARTRECORD_DISABLE_ICON2 ICON "icons/filledFluentUI/startrecord_dis.ico" -IDI_STOPRECORD_ICON2 ICON "icons/filledFluentUI/stoprecord_off.ico" -IDI_STOPRECORD_DISABLE_ICON2 ICON "icons/filledFluentUI/stoprecord_dis.ico" -IDI_PLAYRECORD_ICON2 ICON "icons/filledFluentUI/playrecord_off.ico" -IDI_PLAYRECORD_DISABLE_ICON2 ICON "icons/filledFluentUI/playrecord_dis.ico" -IDI_SAVERECORD_ICON2 ICON "icons/filledFluentUI/saverecord_off.ico" -IDI_SAVERECORD_DISABLE_ICON2 ICON "icons/filledFluentUI/saverecord_dis.ico" -IDI_MMPLAY_DIS_ICON2 ICON "icons/filledFluentUI/playrecord_m_dis.ico" -IDI_MMPLAY_ICON2 ICON "icons/filledFluentUI/playrecord_m_off.ico" -IDI_VIEW_ALL_CHAR_ICON2 ICON "icons/filledFluentUI/allChars_off.ico" -IDI_VIEW_INDENT_ICON2 ICON "icons/filledFluentUI/indentGuide_off.ico" -IDI_VIEW_WRAP_ICON2 ICON "icons/filledFluentUI/wrap_off.ico" -IDI_SAVE_DISABLE_ICON2 ICON "icons/filledFluentUI/save_dis.ico" -IDI_SAVEALL_DISABLE_ICON2 ICON "icons/filledFluentUI/saveall_dis.ico" -IDI_CUT_DISABLE_ICON2 ICON "icons/filledFluentUI/cut_dis.ico" -IDI_COPY_DISABLE_ICON2 ICON "icons/filledFluentUI/dupli_dis.ico" -IDI_PASTE_DISABLE_ICON2 ICON "icons/filledFluentUI/paste_dis.ico" -IDI_UNDO_DISABLE_ICON2 ICON "icons/filledFluentUI/undo_dis.ico" -IDI_REDO_DISABLE_ICON2 ICON "icons/filledFluentUI/redo_dis.ico" -IDI_SYNCV_ICON2 ICON "icons/filledFluentUI/syncV_off.ico" -IDI_SYNCV_DISABLE_ICON2 ICON "icons/filledFluentUI/syncV_dis.ico" -IDI_SYNCH_ICON2 ICON "icons/filledFluentUI/syncH_off.ico" -IDI_SYNCH_DISABLE_ICON2 ICON "icons/filledFluentUI/syncH_dis.ico" -IDI_VIEW_DOC_MAP_ICON2 ICON "icons/filledFluentUI/docMap_off.ico" -IDI_VIEW_DOCLIST_ICON2 ICON "icons/filledFluentUI/docList_off.ico" -IDI_VIEW_FUNCLIST_ICON2 ICON "icons/filledFluentUI/funcList_off.ico" -IDI_VIEW_FILEBROWSER_ICON2 ICON "icons/filledFluentUI/fileBrowser_off.ico" -IDI_VIEW_MONITORING_ICON2 ICON "icons/filledFluentUI/monitoring_off.ico" +IDI_NEW_ICON2 ICON "icons/light/toolbar/filled/new_off.ico" +IDI_OPEN_ICON2 ICON "icons/light/toolbar/filled/open_off.ico" +IDI_CLOSE_ICON2 ICON "icons/light/toolbar/filled/close_off.ico" +IDI_CLOSEALL_ICON2 ICON "icons/light/toolbar/filled/closeall_off.ico" +IDI_SAVE_ICON2 ICON "icons/light/toolbar/filled/save_off.ico" +IDI_SAVEALL_ICON2 ICON "icons/light/toolbar/filled/saveall_off.ico" +IDI_CUT_ICON2 ICON "icons/light/toolbar/filled/cut_off.ico" +IDI_COPY_ICON2 ICON "icons/light/toolbar/filled/copy_off.ico" +IDI_PASTE_ICON2 ICON "icons/light/toolbar/filled/paste_off.ico" +IDI_UNDO_ICON2 ICON "icons/light/toolbar/filled/undo_off.ico" +IDI_REDO_ICON2 ICON "icons/light/toolbar/filled/redo_off.ico" +IDI_FIND_ICON2 ICON "icons/light/toolbar/filled/find_off.ico" +IDI_REPLACE_ICON2 ICON "icons/light/toolbar/filled/findrep_off.ico" +IDI_ZOOMIN_ICON2 ICON "icons/light/toolbar/filled/zoomIn_off.ico" +IDI_ZOOMOUT_ICON2 ICON "icons/light/toolbar/filled/zoomOut_off.ico" +IDI_VIEW_UD_DLG_ICON2 ICON "icons/light/toolbar/filled/udl_off.ico" +IDI_PRINT_ICON2 ICON "icons/light/toolbar/filled/print_off.ico" +IDI_STARTRECORD_ICON2 ICON "icons/light/toolbar/filled/startrecord_off.ico" +IDI_STARTRECORD_DISABLE_ICON2 ICON "icons/light/toolbar/filled/startrecord_dis.ico" +IDI_STOPRECORD_ICON2 ICON "icons/light/toolbar/filled/stoprecord_off.ico" +IDI_STOPRECORD_DISABLE_ICON2 ICON "icons/light/toolbar/filled/stoprecord_dis.ico" +IDI_PLAYRECORD_ICON2 ICON "icons/light/toolbar/filled/playrecord_off.ico" +IDI_PLAYRECORD_DISABLE_ICON2 ICON "icons/light/toolbar/filled/playrecord_dis.ico" +IDI_SAVERECORD_ICON2 ICON "icons/light/toolbar/filled/saverecord_off.ico" +IDI_SAVERECORD_DISABLE_ICON2 ICON "icons/light/toolbar/filled/saverecord_dis.ico" +IDI_MMPLAY_DIS_ICON2 ICON "icons/light/toolbar/filled/playrecord_m_dis.ico" +IDI_MMPLAY_ICON2 ICON "icons/light/toolbar/filled/playrecord_m_off.ico" +IDI_VIEW_ALL_CHAR_ICON2 ICON "icons/light/toolbar/filled/allChars_off.ico" +IDI_VIEW_INDENT_ICON2 ICON "icons/light/toolbar/filled/indentGuide_off.ico" +IDI_VIEW_WRAP_ICON2 ICON "icons/light/toolbar/filled/wrap_off.ico" +IDI_SAVE_DISABLE_ICON2 ICON "icons/light/toolbar/filled/save_dis.ico" +IDI_SAVEALL_DISABLE_ICON2 ICON "icons/light/toolbar/filled/saveall_dis.ico" +IDI_CUT_DISABLE_ICON2 ICON "icons/light/toolbar/filled/cut_dis.ico" +IDI_COPY_DISABLE_ICON2 ICON "icons/light/toolbar/filled/copy_dis.ico" +IDI_PASTE_DISABLE_ICON2 ICON "icons/light/toolbar/filled/paste_dis.ico" +IDI_UNDO_DISABLE_ICON2 ICON "icons/light/toolbar/filled/undo_dis.ico" +IDI_REDO_DISABLE_ICON2 ICON "icons/light/toolbar/filled/redo_dis.ico" +IDI_SYNCV_ICON2 ICON "icons/light/toolbar/filled/syncV_off.ico" +IDI_SYNCV_DISABLE_ICON2 ICON "icons/light/toolbar/filled/syncV_dis.ico" +IDI_SYNCH_ICON2 ICON "icons/light/toolbar/filled/syncH_off.ico" +IDI_SYNCH_DISABLE_ICON2 ICON "icons/light/toolbar/filled/syncH_dis.ico" +IDI_VIEW_DOC_MAP_ICON2 ICON "icons/light/toolbar/filled/docMap_off.ico" +IDI_VIEW_DOCLIST_ICON2 ICON "icons/light/toolbar/filled/docList_off.ico" +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" // // TOOLBAR ICO - set 1 Dark Mode // -IDI_NEW_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/new_off.ico" -IDI_OPEN_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/open_off.ico" -IDI_CLOSE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/supp_off.ico" -IDI_CLOSEALL_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/suppall_off.ico" -IDI_SAVE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/save_off.ico" -IDI_SAVEALL_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/saveall_off.ico" -IDI_CUT_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/cut_off.ico" -IDI_COPY_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/dupli_off.ico" -IDI_PASTE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/paste_off.ico" -IDI_UNDO_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/undo_off.ico" -IDI_REDO_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/redo_off.ico" -IDI_FIND_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/find_off.ico" -IDI_REPLACE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/findrep_off.ico" -IDI_ZOOMIN_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/zoomIn_off.ico" -IDI_ZOOMOUT_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/zoomOut_off.ico" -IDI_VIEW_UD_DLG_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/userDefineDlg_off.ico" -IDI_PRINT_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/imprim_off.ico" -IDI_STARTRECORD_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/startrecord_off.ico" -IDI_STARTRECORD_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/startrecord_dis.ico" -IDI_STOPRECORD_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/stoprecord_off.ico" -IDI_STOPRECORD_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/stoprecord_dis.ico" -IDI_PLAYRECORD_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/playrecord_off.ico" -IDI_PLAYRECORD_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/playrecord_dis.ico" -IDI_SAVERECORD_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/saverecord_off.ico" -IDI_SAVERECORD_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/saverecord_dis.ico" -IDI_MMPLAY_DIS_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/playrecord_m_dis.ico" -IDI_MMPLAY_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/playrecord_m_off.ico" -IDI_VIEW_ALL_CHAR_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/allChars_off.ico" -IDI_VIEW_INDENT_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/indentGuide_off.ico" -IDI_VIEW_WRAP_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/wrap_off.ico" -IDI_SAVE_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/save_dis.ico" -IDI_SAVEALL_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/saveall_dis.ico" -IDI_CUT_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/cut_dis.ico" -IDI_COPY_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/dupli_dis.ico" -IDI_PASTE_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/paste_dis.ico" -IDI_UNDO_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/undo_dis.ico" -IDI_REDO_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/redo_dis.ico" -IDI_SYNCV_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/syncV_off.ico" -IDI_SYNCV_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/syncV_dis.ico" -IDI_SYNCH_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/syncH_off.ico" -IDI_SYNCH_DISABLE_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/syncH_dis.ico" -IDI_VIEW_DOC_MAP_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/docMap_off.ico" -IDI_VIEW_DOCLIST_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/docList_off.ico" -IDI_VIEW_FUNCLIST_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/funcList_off.ico" -IDI_VIEW_FILEBROWSER_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico" -IDI_VIEW_MONITORING_ICON_DM ICON "icons/darkMode/toolbar/FluentUI/monitoring_off.ico" +IDI_NEW_ICON_DM ICON "icons/dark/toolbar/regular/new_off.ico" +IDI_OPEN_ICON_DM ICON "icons/dark/toolbar/regular/open_off.ico" +IDI_CLOSE_ICON_DM ICON "icons/dark/toolbar/regular/close_off.ico" +IDI_CLOSEALL_ICON_DM ICON "icons/dark/toolbar/regular/closeall_off.ico" +IDI_SAVE_ICON_DM ICON "icons/dark/toolbar/regular/save_off.ico" +IDI_SAVEALL_ICON_DM ICON "icons/dark/toolbar/regular/saveall_off.ico" +IDI_CUT_ICON_DM ICON "icons/dark/toolbar/regular/cut_off.ico" +IDI_COPY_ICON_DM ICON "icons/dark/toolbar/regular/copy_off.ico" +IDI_PASTE_ICON_DM ICON "icons/dark/toolbar/regular/paste_off.ico" +IDI_UNDO_ICON_DM ICON "icons/dark/toolbar/regular/undo_off.ico" +IDI_REDO_ICON_DM ICON "icons/dark/toolbar/regular/redo_off.ico" +IDI_FIND_ICON_DM ICON "icons/dark/toolbar/regular/find_off.ico" +IDI_REPLACE_ICON_DM ICON "icons/dark/toolbar/regular/findrep_off.ico" +IDI_ZOOMIN_ICON_DM ICON "icons/dark/toolbar/regular/zoomIn_off.ico" +IDI_ZOOMOUT_ICON_DM ICON "icons/dark/toolbar/regular/zoomOut_off.ico" +IDI_VIEW_UD_DLG_ICON_DM ICON "icons/dark/toolbar/regular/udl_off.ico" +IDI_PRINT_ICON_DM ICON "icons/dark/toolbar/regular/print_off.ico" +IDI_STARTRECORD_ICON_DM ICON "icons/dark/toolbar/regular/startrecord_off.ico" +IDI_STARTRECORD_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/startrecord_dis.ico" +IDI_STOPRECORD_ICON_DM ICON "icons/dark/toolbar/regular/stoprecord_off.ico" +IDI_STOPRECORD_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/stoprecord_dis.ico" +IDI_PLAYRECORD_ICON_DM ICON "icons/dark/toolbar/regular/playrecord_off.ico" +IDI_PLAYRECORD_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/playrecord_dis.ico" +IDI_SAVERECORD_ICON_DM ICON "icons/dark/toolbar/regular/saverecord_off.ico" +IDI_SAVERECORD_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/saverecord_dis.ico" +IDI_MMPLAY_DIS_ICON_DM ICON "icons/dark/toolbar/regular/playrecord_m_dis.ico" +IDI_MMPLAY_ICON_DM ICON "icons/dark/toolbar/regular/playrecord_m_off.ico" +IDI_VIEW_ALL_CHAR_ICON_DM ICON "icons/dark/toolbar/regular/allChars_off.ico" +IDI_VIEW_INDENT_ICON_DM ICON "icons/dark/toolbar/regular/indentGuide_off.ico" +IDI_VIEW_WRAP_ICON_DM ICON "icons/dark/toolbar/regular/wrap_off.ico" +IDI_SAVE_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/save_dis.ico" +IDI_SAVEALL_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/saveall_dis.ico" +IDI_CUT_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/cut_dis.ico" +IDI_COPY_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/copy_dis.ico" +IDI_PASTE_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/paste_dis.ico" +IDI_UNDO_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/undo_dis.ico" +IDI_REDO_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/redo_dis.ico" +IDI_SYNCV_ICON_DM ICON "icons/dark/toolbar/regular/syncV_off.ico" +IDI_SYNCV_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/syncV_dis.ico" +IDI_SYNCH_ICON_DM ICON "icons/dark/toolbar/regular/syncH_off.ico" +IDI_SYNCH_DISABLE_ICON_DM ICON "icons/dark/toolbar/regular/syncH_dis.ico" +IDI_VIEW_DOC_MAP_ICON_DM ICON "icons/dark/toolbar/regular/docMap_off.ico" +IDI_VIEW_DOCLIST_ICON_DM ICON "icons/dark/toolbar/regular/docList_off.ico" +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" // // TOOLBAR ICO - set 2 Dark Mode // -IDI_NEW_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/new_off.ico" -IDI_OPEN_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/open_off.ico" -IDI_CLOSE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/supp_off.ico" -IDI_CLOSEALL_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/suppall_off.ico" -IDI_SAVE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/save_off.ico" -IDI_SAVEALL_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/saveall_off.ico" -IDI_CUT_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/cut_off.ico" -IDI_COPY_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/dupli_off.ico" -IDI_PASTE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/paste_off.ico" -IDI_UNDO_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/undo_off.ico" -IDI_REDO_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/redo_off.ico" -IDI_FIND_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/find_off.ico" -IDI_REPLACE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/findrep_off.ico" -IDI_ZOOMIN_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/zoomIn_off.ico" -IDI_ZOOMOUT_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/zoomOut_off.ico" -IDI_VIEW_UD_DLG_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico" -IDI_PRINT_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/imprim_off.ico" -IDI_STARTRECORD_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/startrecord_off.ico" -IDI_STARTRECORD_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/startrecord_dis.ico" -IDI_STOPRECORD_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/stoprecord_off.ico" -IDI_STOPRECORD_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/stoprecord_dis.ico" -IDI_PLAYRECORD_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/playrecord_off.ico" -IDI_PLAYRECORD_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/playrecord_dis.ico" -IDI_SAVERECORD_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/saverecord_off.ico" -IDI_SAVERECORD_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/saverecord_dis.ico" -IDI_MMPLAY_DIS_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/playrecord_m_dis.ico" -IDI_MMPLAY_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/playrecord_m_off.ico" -IDI_VIEW_ALL_CHAR_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/allChars_off.ico" -IDI_VIEW_INDENT_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/indentGuide_off.ico" -IDI_VIEW_WRAP_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/wrap_off.ico" -IDI_SAVE_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/save_dis.ico" -IDI_SAVEALL_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/saveall_dis.ico" -IDI_CUT_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/cut_dis.ico" -IDI_COPY_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/dupli_dis.ico" -IDI_PASTE_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/paste_dis.ico" -IDI_UNDO_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/undo_dis.ico" -IDI_REDO_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/redo_dis.ico" -IDI_SYNCV_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/syncV_off.ico" -IDI_SYNCV_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/syncV_dis.ico" -IDI_SYNCH_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/syncH_off.ico" -IDI_SYNCH_DISABLE_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico" -IDI_VIEW_DOC_MAP_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/docMap_off.ico" -IDI_VIEW_DOCLIST_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/docList_off.ico" -IDI_VIEW_FUNCLIST_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/funcList_off.ico" -IDI_VIEW_FILEBROWSER_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico" -IDI_VIEW_MONITORING_ICON_DM2 ICON "icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico" +IDI_NEW_ICON_DM2 ICON "icons/dark/toolbar/filled/new_off.ico" +IDI_OPEN_ICON_DM2 ICON "icons/dark/toolbar/filled/open_off.ico" +IDI_CLOSE_ICON_DM2 ICON "icons/dark/toolbar/filled/close_off.ico" +IDI_CLOSEALL_ICON_DM2 ICON "icons/dark/toolbar/filled/closeall_off.ico" +IDI_SAVE_ICON_DM2 ICON "icons/dark/toolbar/filled/save_off.ico" +IDI_SAVEALL_ICON_DM2 ICON "icons/dark/toolbar/filled/saveall_off.ico" +IDI_CUT_ICON_DM2 ICON "icons/dark/toolbar/filled/cut_off.ico" +IDI_COPY_ICON_DM2 ICON "icons/dark/toolbar/filled/copy_off.ico" +IDI_PASTE_ICON_DM2 ICON "icons/dark/toolbar/filled/paste_off.ico" +IDI_UNDO_ICON_DM2 ICON "icons/dark/toolbar/filled/undo_off.ico" +IDI_REDO_ICON_DM2 ICON "icons/dark/toolbar/filled/redo_off.ico" +IDI_FIND_ICON_DM2 ICON "icons/dark/toolbar/filled/find_off.ico" +IDI_REPLACE_ICON_DM2 ICON "icons/dark/toolbar/filled/findrep_off.ico" +IDI_ZOOMIN_ICON_DM2 ICON "icons/dark/toolbar/filled/zoomIn_off.ico" +IDI_ZOOMOUT_ICON_DM2 ICON "icons/dark/toolbar/filled/zoomOut_off.ico" +IDI_VIEW_UD_DLG_ICON_DM2 ICON "icons/dark/toolbar/filled/udl_off.ico" +IDI_PRINT_ICON_DM2 ICON "icons/dark/toolbar/filled/print_off.ico" +IDI_STARTRECORD_ICON_DM2 ICON "icons/dark/toolbar/filled/startrecord_off.ico" +IDI_STARTRECORD_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/startrecord_dis.ico" +IDI_STOPRECORD_ICON_DM2 ICON "icons/dark/toolbar/filled/stoprecord_off.ico" +IDI_STOPRECORD_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/stoprecord_dis.ico" +IDI_PLAYRECORD_ICON_DM2 ICON "icons/dark/toolbar/filled/playrecord_off.ico" +IDI_PLAYRECORD_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/playrecord_dis.ico" +IDI_SAVERECORD_ICON_DM2 ICON "icons/dark/toolbar/filled/saverecord_off.ico" +IDI_SAVERECORD_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/saverecord_dis.ico" +IDI_MMPLAY_DIS_ICON_DM2 ICON "icons/dark/toolbar/filled/playrecord_m_dis.ico" +IDI_MMPLAY_ICON_DM2 ICON "icons/dark/toolbar/filled/playrecord_m_off.ico" +IDI_VIEW_ALL_CHAR_ICON_DM2 ICON "icons/dark/toolbar/filled/allChars_off.ico" +IDI_VIEW_INDENT_ICON_DM2 ICON "icons/dark/toolbar/filled/indentGuide_off.ico" +IDI_VIEW_WRAP_ICON_DM2 ICON "icons/dark/toolbar/filled/wrap_off.ico" +IDI_SAVE_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/save_dis.ico" +IDI_SAVEALL_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/saveall_dis.ico" +IDI_CUT_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/cut_dis.ico" +IDI_COPY_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/copy_dis.ico" +IDI_PASTE_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/paste_dis.ico" +IDI_UNDO_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/undo_dis.ico" +IDI_REDO_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/redo_dis.ico" +IDI_SYNCV_ICON_DM2 ICON "icons/dark/toolbar/filled/syncV_off.ico" +IDI_SYNCV_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/syncV_dis.ico" +IDI_SYNCH_ICON_DM2 ICON "icons/dark/toolbar/filled/syncH_off.ico" +IDI_SYNCH_DISABLE_ICON_DM2 ICON "icons/dark/toolbar/filled/syncH_dis.ico" +IDI_VIEW_DOC_MAP_ICON_DM2 ICON "icons/dark/toolbar/filled/docMap_off.ico" +IDI_VIEW_DOCLIST_ICON_DM2 ICON "icons/dark/toolbar/filled/docList_off.ico" +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_SAVED_ICON ICON "icons/saved.ico" -IDI_SAVED_DM_ICON ICON "icons/darkMode/tabbar/saved.ico" -IDI_SAVED_ALT_ICON ICON "icons/saved_alt.ico" -IDI_UNSAVED_ICON ICON "icons/unsaved.ico" -IDI_UNSAVED_DM_ICON ICON "icons/darkMode/tabbar/unsaved.ico" -IDI_UNSAVED_ALT_ICON ICON "icons/unsaved_alt.ico" -IDI_READONLY_ICON ICON "icons/readonly.ico" -IDI_READONLY_DM_ICON ICON "icons/darkMode/tabbar/readonly.ico" -IDI_READONLY_ALT_ICON ICON "icons/readonly_alt.ico" -IDI_MONITORING_ICON ICON "icons/monitoring.ico" -IDI_MONITORING_DM_ICON ICON "icons/darkMode/tabbar/monitoring.ico" -IDI_DELETE_ICON ICON "icons/delete.ico" +IDI_SAVED_ICON ICON "icons/standard/tabbar/saved.ico" +IDI_SAVED_DM_ICON ICON "icons/dark/tabbar/saved.ico" +IDI_SAVED_ALT_ICON ICON "icons/standard/tabbar/saved_alt.ico" +IDI_UNSAVED_ICON ICON "icons/standard/tabbar/unsaved.ico" +IDI_UNSAVED_DM_ICON ICON "icons/dark/tabbar/unsaved.ico" +IDI_UNSAVED_ALT_ICON ICON "icons/standard/tabbar/unsaved_alt.ico" +IDI_READONLY_ICON ICON "icons/standard/tabbar/readonly.ico" +IDI_READONLY_DM_ICON ICON "icons/dark/tabbar/readonly.ico" +IDI_READONLY_ALT_ICON ICON "icons/standard/tabbar/readonly_alt.ico" +IDI_MONITORING_ICON ICON "icons/standard/tabbar/monitoring.ico" +IDI_MONITORING_DM_ICON ICON "icons/dark/tabbar/monitoring.ico" + IDI_FIND_RESULT_ICON ICON "icons/findResult.ico" IDC_DRAG_TAB CURSOR "cursors/drag.cur" @@ -288,97 +288,98 @@ IDC_DRAG_INTERDIT_TAB CURSOR "cursors/drag_interdit.cur" IDC_DRAG_PLUS_TAB CURSOR "cursors/drag_plus.cur" IDC_DRAG_OUT_TAB CURSOR "cursors/drag_out.cur" -IDR_FILENEW BITMAP "icons/newFile.bmp" -IDR_FILEOPEN BITMAP "icons/openFile.bmp" -IDR_FILESAVE BITMAP "icons/saveFile.bmp" -IDR_SAVEALL BITMAP "icons/saveAll.bmp" -IDR_CLOSEFILE BITMAP "icons/closeFile.bmp" -IDR_CLOSEALL BITMAP "icons/closeAll.bmp" -IDR_FIND BITMAP "icons/find.bmp" -IDR_REPLACE BITMAP "icons/findReplace.bmp" -IDR_ZOOMIN BITMAP "icons/zoomIn.bmp" -IDR_ZOOMOUT BITMAP "icons/zoomOut.bmp" -IDR_WRAP BITMAP "icons/wrap.bmp" -IDR_INVISIBLECHAR BITMAP "icons/invisibleChar.bmp" -IDR_INDENTGUIDE BITMAP "icons/indentGuide.bmp" -IDR_SHOWPANNEL BITMAP "icons/showPannel.bmp" -IDR_STARTRECORD BITMAP "icons/startRecord.bmp" -IDR_STOPRECORD BITMAP "icons/stopRecord.bmp" -IDR_PLAYRECORD BITMAP "icons/playRecord.bmp" -IDR_M_PLAYRECORD BITMAP "icons/playRecord_m.bmp" -IDR_SAVERECORD BITMAP "icons/saveRecord.bmp" -IDR_CUT BITMAP "icons/cut.bmp" -IDR_COPY BITMAP "icons/copy.bmp" -IDR_PASTE BITMAP "icons/paste.bmp" -IDR_UNDO BITMAP "icons/undo.bmp" -IDR_REDO BITMAP "icons/redo.bmp" -IDR_SYNCV BITMAP "icons/syncV.bmp" -IDR_SYNCH BITMAP "icons/syncH.bmp" -IDR_PRINT BITMAP "icons/print.bmp" -IDR_CLOSETAB BITMAP "icons/closeTabButton.bmp" -IDR_CLOSETAB_INACT BITMAP "icons/closeTabButton_inact.bmp" -IDR_CLOSETAB_HOVER BITMAP "icons/closeTabButton_hover.bmp" -IDR_CLOSETAB_PUSH BITMAP "icons/closeTabButton_push.bmp" -IDR_CLOSETAB_DM BITMAP "icons/darkMode/tabbar/closeTabButton.bmp" -IDR_CLOSETAB_INACT_DM BITMAP "icons/darkMode/tabbar/closeTabButton_inact.bmp" -IDR_CLOSETAB_HOVER_DM BITMAP "icons/darkMode/tabbar/closeTabButton_hover.bmp" -IDR_CLOSETAB_PUSH_DM BITMAP "icons/darkMode/tabbar/closeTabButton_push.bmp" -IDR_DOCMAP BITMAP "icons/docMap.bmp" -IDR_DOCLIST BITMAP "icons/docList.bmp" -IDR_FUNC_LIST BITMAP "icons/functionList.bmp" -IDR_FILEBROWSER BITMAP "icons/fileBrowser.bmp" -IDR_FILEMONITORING BITMAP "icons/fileMonitoring.bmp" +IDR_FILENEW BITMAP "icons/standard/toolbar/newFile.bmp" +IDR_FILEOPEN BITMAP "icons/standard/toolbar/openFile.bmp" +IDR_FILESAVE BITMAP "icons/standard/toolbar/saveFile.bmp" +IDR_SAVEALL BITMAP "icons/standard/toolbar/saveAll.bmp" +IDR_CLOSEFILE BITMAP "icons/standard/toolbar/closeFile.bmp" +IDR_CLOSEALL BITMAP "icons/standard/toolbar/closeAll.bmp" +IDR_FIND BITMAP "icons/standard/toolbar/find.bmp" +IDR_REPLACE BITMAP "icons/standard/toolbar/findReplace.bmp" +IDR_ZOOMIN BITMAP "icons/standard/toolbar/zoomIn.bmp" +IDR_ZOOMOUT BITMAP "icons/standard/toolbar/zoomOut.bmp" +IDR_WRAP BITMAP "icons/standard/toolbar/wrap.bmp" +IDR_INVISIBLECHAR BITMAP "icons/standard/toolbar/allChars.bmp" +IDR_INDENTGUIDE BITMAP "icons/standard/toolbar/indentGuide.bmp" +IDR_SHOWPANNEL BITMAP "icons/standard/toolbar/udl.bmp" +IDR_STARTRECORD BITMAP "icons/standard/toolbar/startRecord.bmp" +IDR_STOPRECORD BITMAP "icons/standard/toolbar/stopRecord.bmp" +IDR_PLAYRECORD BITMAP "icons/standard/toolbar/playRecord.bmp" +IDR_M_PLAYRECORD BITMAP "icons/standard/toolbar/playRecord_m.bmp" +IDR_SAVERECORD BITMAP "icons/standard/toolbar/saveRecord.bmp" +IDR_CUT BITMAP "icons/standard/toolbar/cut.bmp" +IDR_COPY BITMAP "icons/standard/toolbar/copy.bmp" +IDR_PASTE BITMAP "icons/standard/toolbar/paste.bmp" +IDR_UNDO BITMAP "icons/standard/toolbar/undo.bmp" +IDR_REDO BITMAP "icons/standard/toolbar/redo.bmp" +IDR_SYNCV BITMAP "icons/standard/toolbar/syncV.bmp" +IDR_SYNCH BITMAP "icons/standard/toolbar/syncH.bmp" +IDR_PRINT BITMAP "icons/standard/toolbar/print.bmp" +IDR_DOCMAP BITMAP "icons/standard/toolbar/docMap.bmp" +IDR_DOCLIST BITMAP "icons/standard/toolbar/docList.bmp" +IDR_FUNC_LIST BITMAP "icons/standard/toolbar/funcList.bmp" +IDR_FILEBROWSER BITMAP "icons/standard/toolbar/fileBrowser.bmp" +IDR_FILEMONITORING BITMAP "icons/standard/toolbar/monitoring.bmp" -IDR_DOCMAP_ICO ICON "icons/docMap.ico" -IDR_DOCMAP_ICO2 ICON "icons/docMap2.ico" -IDR_DOCMAP_ICO_DM ICON "icons/darkMode/panels/docMap.ico" -IDR_DOCLIST_ICO ICON "icons/docList.ico" -IDR_DOCLIST_ICO2 ICON "icons/docList2.ico" -IDR_DOCLIST_ICO_DM ICON "icons/darkMode/panels/docList.ico" -IDR_FUNC_LIST_ICO ICON "icons/functionList.ico" -IDR_FUNC_LIST_ICO2 ICON "icons/functionList2.ico" -IDR_FUNC_LIST_ICO_DM ICON "icons/darkMode/panels/functionList.ico" -IDR_PROJECTPANEL_ICO ICON "icons/projectPanel.ico" -IDR_PROJECTPANEL_ICO2 ICON "icons/projectPanel2.ico" -IDR_PROJECTPANEL_ICO_DM ICON "icons/darkMode/panels/projectPanel.ico" -IDR_FILEBROWSER_ICO ICON "icons/fileBrowser.ico" -IDR_FILEBROWSER_ICO2 ICON "icons/fileBrowser2.ico" -IDR_FILEBROWSER_ICO_DM ICON "icons/darkMode/panels/fileBrowser.ico" -IDR_CLIPBOARDPANEL_ICO ICON "icons/clipboardPanel.ico" -IDR_CLIPBOARDPANEL_ICO2 ICON "icons/clipboardPanel2.ico" -IDR_CLIPBOARDPANEL_ICO_DM ICON "icons/darkMode/panels/clipboardPanel.ico" -IDR_ASCIIPANEL_ICO ICON "icons/asciiPanel.ico" -IDR_ASCIIPANEL_ICO2 ICON "icons/asciiPanel2.ico" -IDR_ASCIIPANEL_ICO_DM ICON "icons/darkMode/panels/asciiPanel.ico" +IDR_CLOSETAB BITMAP "icons/standard/tabbar/closeTabButton.bmp" +IDR_CLOSETAB_INACT BITMAP "icons/standard/tabbar/closeTabButton_inact.bmp" +IDR_CLOSETAB_HOVER BITMAP "icons/standard/tabbar/closeTabButton_hover.bmp" +IDR_CLOSETAB_PUSH BITMAP "icons/standard/tabbar/closeTabButton_push.bmp" +IDR_CLOSETAB_DM BITMAP "icons/dark/tabbar/closeTabButton.bmp" +IDR_CLOSETAB_INACT_DM BITMAP "icons/dark/tabbar/closeTabButton_inact.bmp" +IDR_CLOSETAB_HOVER_DM BITMAP "icons/dark/tabbar/closeTabButton_hover.bmp" +IDR_CLOSETAB_PUSH_DM BITMAP "icons/dark/tabbar/closeTabButton_push.bmp" + +IDR_DOCMAP_ICO ICON "icons/standard/panels/tabbar/docMap.ico" +IDR_DOCMAP_ICO2 ICON "icons/light/panels/docMap.ico" +IDR_DOCMAP_ICO_DM ICON "icons/dark/panels/docMap.ico" +IDR_DOCLIST_ICO ICON "icons/standard/panels/tabbar/docList.ico" +IDR_DOCLIST_ICO2 ICON "icons/light/panels/docList.ico" +IDR_DOCLIST_ICO_DM ICON "icons/dark/panels/docList.ico" +IDR_FUNC_LIST_ICO ICON "icons/standard/panels/tabbar/functionList.ico" +IDR_FUNC_LIST_ICO2 ICON "icons/light/panels/functionList.ico" +IDR_FUNC_LIST_ICO_DM ICON "icons/dark/panels/functionList.ico" +IDR_PROJECTPANEL_ICO ICON "icons/standard/panels/tabbar/projectPanel.ico" +IDR_PROJECTPANEL_ICO2 ICON "icons/light/panels/projectPanel.ico" +IDR_PROJECTPANEL_ICO_DM ICON "icons/dark/panels/projectPanel.ico" +IDR_FILEBROWSER_ICO ICON "icons/standard/panels/tabbar/fileBrowser.ico" +IDR_FILEBROWSER_ICO2 ICON "icons/light/panels/fileBrowser.ico" +IDR_FILEBROWSER_ICO_DM ICON "icons/dark/panels/fileBrowser.ico" +IDR_CLIPBOARDPANEL_ICO ICON "icons/standard/panels/tabbar/clipboardPanel.ico" +IDR_CLIPBOARDPANEL_ICO2 ICON "icons/light/panels/clipboardPanel.ico" +IDR_CLIPBOARDPANEL_ICO_DM ICON "icons/dark/panels/clipboardPanel.ico" +IDR_ASCIIPANEL_ICO ICON "icons/standard/panels/tabbar/asciiPanel.ico" +IDR_ASCIIPANEL_ICO2 ICON "icons/light/panels/asciiPanel.ico" +IDR_ASCIIPANEL_ICO_DM ICON "icons/dark/panels/asciiPanel.ico" -IDI_PROJECT_WORKSPACE BITMAP "icons/project_work_space.bmp" -IDI_PROJECT_WORKSPACEDIRTY BITMAP "icons/project_work_space_dirty.bmp" -IDI_PROJECT_PROJECT BITMAP "icons/project_root.bmp" -IDI_PROJECT_FOLDEROPEN BITMAP "icons/project_folder_open.bmp" -IDI_PROJECT_FOLDERCLOSE BITMAP "icons/project_folder_close.bmp" -IDI_PROJECT_FILE BITMAP "icons/project_file.bmp" -IDI_PROJECT_FILEINVALID BITMAP "icons/project_file_invalid.bmp" -IDI_FB_ROOTOPEN BITMAP "icons/fb_root_open.bmp" -IDI_FB_ROOTCLOSE BITMAP "icons/fb_root_close.bmp" +IDI_PROJECT_WORKSPACE BITMAP "icons/standard/panels/project_work_space.bmp" +IDI_PROJECT_WORKSPACEDIRTY BITMAP "icons/standard/panels/project_work_space_dirty.bmp" +IDI_PROJECT_PROJECT BITMAP "icons/standard/panels/project_root.bmp" +IDI_PROJECT_FOLDEROPEN BITMAP "icons/standard/panels/project_folder_open.bmp" +IDI_PROJECT_FOLDERCLOSE BITMAP "icons/standard/panels/project_folder_close.bmp" +IDI_PROJECT_FILE BITMAP "icons/standard/panels/project_file.bmp" +IDI_PROJECT_FILEINVALID BITMAP "icons/standard/panels/project_file_invalid.bmp" +IDI_FB_ROOTOPEN BITMAP "icons/standard/panels/fb_root_open.bmp" +IDI_FB_ROOTCLOSE BITMAP "icons/standard/panels/fb_root_close.bmp" -IDI_FB_SELECTCURRENTFILE BITMAP "icons/fb_select_current_file.bmp" -IDI_FB_FOLDALL BITMAP "icons/fb_fold_all.bmp" -IDI_FB_EXPANDALL BITMAP "icons/fb_expand_all.bmp" -IDI_FB_SELECTCURRENTFILE_DM BITMAP "icons/darkMode/panels/fb_select_current_file.bmp" -IDI_FB_FOLDALL_DM BITMAP "icons/darkMode/panels/fb_fold_all.bmp" -IDI_FB_EXPANDALL_DM BITMAP "icons/darkMode/panels/fb_expand_all.bmp" +IDI_FB_SELECTCURRENTFILE BITMAP "icons/standard/panels/fb_select_current_file.bmp" +IDI_FB_FOLDALL BITMAP "icons/standard/panels/fb_fold_all.bmp" +IDI_FB_EXPANDALL BITMAP "icons/standard/panels/fb_expand_all.bmp" +IDI_FB_SELECTCURRENTFILE_DM BITMAP "icons/dark/panels/fb_select_current_file.bmp" +IDI_FB_FOLDALL_DM BITMAP "icons/dark/panels/fb_fold_all.bmp" +IDI_FB_EXPANDALL_DM BITMAP "icons/dark/panels/fb_expand_all.bmp" -IDI_FUNCLIST_ROOT BITMAP "icons/project_file.bmp" -IDI_FUNCLIST_NODE BITMAP "icons/funcList_node.bmp" -IDI_FUNCLIST_LEAF BITMAP "icons/funcList_leaf.bmp" +IDI_FUNCLIST_ROOT BITMAP "icons/standard/panels/project_file.bmp" +IDI_FUNCLIST_NODE BITMAP "icons/standard/panels/funcList_node.bmp" +IDI_FUNCLIST_LEAF BITMAP "icons/standard/panels/funcList_leaf.bmp" -IDI_FUNCLIST_SORTBUTTON BITMAP "icons/funclstSort.bmp" -IDI_FUNCLIST_RELOADBUTTON BITMAP "icons/funclstReload.bmp" -IDI_FUNCLIST_PREFERENCEBUTTON BITMAP "icons/funclstPreferences.bmp" -IDI_FUNCLIST_SORTBUTTON_DM BITMAP "icons/darkMode/panels/funclstSort.bmp" -IDI_FUNCLIST_RELOADBUTTON_DM BITMAP "icons/darkMode/panels/funclstReload.bmp" -IDI_FUNCLIST_PREFERENCEBUTTON_DM BITMAP "icons/darkMode/panels/funclstPreferences.bmp" +IDI_FUNCLIST_SORTBUTTON BITMAP "icons/standard/panels/funclstSort.bmp" +IDI_FUNCLIST_RELOADBUTTON BITMAP "icons/standard/panels/funclstReload.bmp" +IDI_FUNCLIST_PREFERENCEBUTTON BITMAP "icons/standard/panels/funclstPreferences.bmp" +IDI_FUNCLIST_SORTBUTTON_DM BITMAP "icons/dark/panels/funclstSort.bmp" +IDI_FUNCLIST_RELOADBUTTON_DM BITMAP "icons/dark/panels/funclstReload.bmp" +IDI_FUNCLIST_PREFERENCEBUTTON_DM BITMAP "icons/dark/panels/funclstPreferences.bmp" IDI_GET_INFO_FROM_TOOLTIP ICON "icons/moreOnTooltip.ico" diff --git a/PowerEditor/src/icons/darkMode/about/chameleon.ico b/PowerEditor/src/icons/dark/about/chameleon.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/about/chameleon.ico rename to PowerEditor/src/icons/dark/about/chameleon.ico diff --git a/PowerEditor/src/icons/darkMode/panels/asciiPanel.ico b/PowerEditor/src/icons/dark/panels/asciiPanel.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/asciiPanel.ico rename to PowerEditor/src/icons/dark/panels/asciiPanel.ico diff --git a/PowerEditor/src/icons/darkMode/panels/clipboardPanel.ico b/PowerEditor/src/icons/dark/panels/clipboardPanel.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/clipboardPanel.ico rename to PowerEditor/src/icons/dark/panels/clipboardPanel.ico diff --git a/PowerEditor/src/icons/darkMode/panels/docList.ico b/PowerEditor/src/icons/dark/panels/docList.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/docList.ico rename to PowerEditor/src/icons/dark/panels/docList.ico diff --git a/PowerEditor/src/icons/darkMode/panels/docMap.ico b/PowerEditor/src/icons/dark/panels/docMap.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/docMap.ico rename to PowerEditor/src/icons/dark/panels/docMap.ico diff --git a/PowerEditor/src/icons/darkMode/panels/fb_expand_all.bmp b/PowerEditor/src/icons/dark/panels/fb_expand_all.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/fb_expand_all.bmp rename to PowerEditor/src/icons/dark/panels/fb_expand_all.bmp diff --git a/PowerEditor/src/icons/darkMode/panels/fb_fold_all.bmp b/PowerEditor/src/icons/dark/panels/fb_fold_all.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/fb_fold_all.bmp rename to PowerEditor/src/icons/dark/panels/fb_fold_all.bmp diff --git a/PowerEditor/src/icons/darkMode/panels/fb_select_current_file.bmp b/PowerEditor/src/icons/dark/panels/fb_select_current_file.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/fb_select_current_file.bmp rename to PowerEditor/src/icons/dark/panels/fb_select_current_file.bmp diff --git a/PowerEditor/src/icons/darkMode/panels/fileBrowser.ico b/PowerEditor/src/icons/dark/panels/fileBrowser.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/fileBrowser.ico rename to PowerEditor/src/icons/dark/panels/fileBrowser.ico diff --git a/PowerEditor/src/icons/darkMode/panels/funclstPreferences.bmp b/PowerEditor/src/icons/dark/panels/funclstPreferences.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/funclstPreferences.bmp rename to PowerEditor/src/icons/dark/panels/funclstPreferences.bmp diff --git a/PowerEditor/src/icons/darkMode/panels/funclstReload.bmp b/PowerEditor/src/icons/dark/panels/funclstReload.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/funclstReload.bmp rename to PowerEditor/src/icons/dark/panels/funclstReload.bmp diff --git a/PowerEditor/src/icons/darkMode/panels/funclstSort.bmp b/PowerEditor/src/icons/dark/panels/funclstSort.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/funclstSort.bmp rename to PowerEditor/src/icons/dark/panels/funclstSort.bmp diff --git a/PowerEditor/src/icons/darkMode/panels/functionList.ico b/PowerEditor/src/icons/dark/panels/functionList.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/functionList.ico rename to PowerEditor/src/icons/dark/panels/functionList.ico diff --git a/PowerEditor/src/icons/darkMode/panels/projectPanel.ico b/PowerEditor/src/icons/dark/panels/projectPanel.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/panels/projectPanel.ico rename to PowerEditor/src/icons/dark/panels/projectPanel.ico diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton.bmp b/PowerEditor/src/icons/dark/tabbar/closeTabButton.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/closeTabButton.bmp rename to PowerEditor/src/icons/dark/tabbar/closeTabButton.bmp diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_hover.bmp b/PowerEditor/src/icons/dark/tabbar/closeTabButton_hover.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/closeTabButton_hover.bmp rename to PowerEditor/src/icons/dark/tabbar/closeTabButton_hover.bmp diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_inact.bmp b/PowerEditor/src/icons/dark/tabbar/closeTabButton_inact.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/closeTabButton_inact.bmp rename to PowerEditor/src/icons/dark/tabbar/closeTabButton_inact.bmp diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_push.bmp b/PowerEditor/src/icons/dark/tabbar/closeTabButton_push.bmp similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/closeTabButton_push.bmp rename to PowerEditor/src/icons/dark/tabbar/closeTabButton_push.bmp diff --git a/PowerEditor/src/icons/darkMode/tabbar/monitoring.ico b/PowerEditor/src/icons/dark/tabbar/monitoring.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/monitoring.ico rename to PowerEditor/src/icons/dark/tabbar/monitoring.ico diff --git a/PowerEditor/src/icons/darkMode/tabbar/readonly.ico b/PowerEditor/src/icons/dark/tabbar/readonly.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/readonly.ico rename to PowerEditor/src/icons/dark/tabbar/readonly.ico diff --git a/PowerEditor/src/icons/darkMode/tabbar/saved.ico b/PowerEditor/src/icons/dark/tabbar/saved.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/saved.ico rename to PowerEditor/src/icons/dark/tabbar/saved.ico diff --git a/PowerEditor/src/icons/darkMode/tabbar/unsaved.ico b/PowerEditor/src/icons/dark/tabbar/unsaved.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/tabbar/unsaved.ico rename to PowerEditor/src/icons/dark/tabbar/unsaved.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/allChars_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/allChars_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/allChars_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/allChars_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/supp_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/close_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/supp_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/close_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/suppall_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/closeall_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/suppall_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/closeall_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/copy_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/copy_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/copy_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/copy_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/cut_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/cut_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/cut_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/cut_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/docList_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/docList_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docMap_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/docMap_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docMap_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/docMap_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/fileBrowser_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/fileBrowser_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/find_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/find_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/find_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/find_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/findrep_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/findrep_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/findrep_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/findrep_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/funcList_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/funcList_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/funcList_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/funcList_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/indentGuide_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/indentGuide_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/indentGuide_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/indentGuide_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/monitoring_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/monitoring_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/new_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/new_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/new_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/new_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/open_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/open_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/open_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/open_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/paste_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/paste_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/paste_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/paste_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/playrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/playrecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/playrecord_m_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/playrecord_m_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/playrecord_m_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/playrecord_m_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/playrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/playrecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/imprim_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/print_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/imprim_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/print_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/redo_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/redo_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/redo_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/redo_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/save_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/save_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/save_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/save_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/saveall_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/saveall_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/saveall_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/saveall_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/saverecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/saverecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/saverecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/saverecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/startrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/startrecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/startrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/startrecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/stoprecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/stoprecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/stoprecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/stoprecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/syncH_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/syncH_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/syncH_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/syncH_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/syncV_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/syncV_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/syncV_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/syncV_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/udl_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/udl_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_dis.ico b/PowerEditor/src/icons/dark/toolbar/filled/undo_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_dis.ico rename to PowerEditor/src/icons/dark/toolbar/filled/undo_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/undo_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/undo_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/wrap_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/wrap_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/wrap_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/wrap_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomIn_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/zoomIn_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomIn_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/zoomIn_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomOut_off.ico b/PowerEditor/src/icons/dark/toolbar/filled/zoomOut_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomOut_off.ico rename to PowerEditor/src/icons/dark/toolbar/filled/zoomOut_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/allChars_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/allChars_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/allChars_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/allChars_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/supp_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/close_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/supp_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/close_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/suppall_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/closeall_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/suppall_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/closeall_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/copy_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/copy_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/copy_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/copy_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/cut_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/cut_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/cut_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/cut_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/docList_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/docList_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docMap_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/docMap_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/docMap_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/docMap_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/fileBrowser_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/fileBrowser_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/find_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/find_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/find_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/find_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/findrep_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/findrep_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/findrep_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/findrep_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/funcList_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/funcList_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/funcList_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/funcList_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/indentGuide_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/indentGuide_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/indentGuide_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/indentGuide_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/monitoring_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/monitoring_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/monitoring_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/monitoring_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/new_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/new_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/new_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/new_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/open_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/open_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/open_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/open_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/paste_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/paste_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/paste_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/paste_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/playrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/playrecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/playrecord_m_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/playrecord_m_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/playrecord_m_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/playrecord_m_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/playrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/playrecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/imprim_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/print_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/imprim_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/print_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/redo_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/redo_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/redo_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/redo_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/save_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/save_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/save_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/save_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/saveall_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/saveall_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/saveall_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/saveall_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/saverecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/saverecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/saverecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/saverecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/startrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/startrecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/startrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/startrecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/stoprecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/stoprecord_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/stoprecord_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/stoprecord_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/syncH_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/syncH_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/syncH_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/syncH_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/syncV_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/syncV_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/syncV_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/syncV_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/userDefineDlg_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/udl_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/userDefineDlg_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/udl_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_dis.ico b/PowerEditor/src/icons/dark/toolbar/regular/undo_dis.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_dis.ico rename to PowerEditor/src/icons/dark/toolbar/regular/undo_dis.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/undo_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/undo_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/wrap_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/wrap_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/wrap_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/wrap_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomIn_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/zoomIn_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomIn_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/zoomIn_off.ico diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomOut_off.ico b/PowerEditor/src/icons/dark/toolbar/regular/zoomOut_off.ico similarity index 100% rename from PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomOut_off.ico rename to PowerEditor/src/icons/dark/toolbar/regular/zoomOut_off.ico diff --git a/PowerEditor/src/icons/delete.ico b/PowerEditor/src/icons/delete.ico deleted file mode 100644 index 760a5c0f47e8f979b3523e9dfedc74689242069c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2998 zcmchZKTP9T5Qm3lC8r{^&@4?5Taq5Q5>n9seOe@hlp-iiTtO-#rJzJxoKB}ur9sd| z6d+x(RjL)m2}}57$#P7J7~LIn-}9f~u*>PHduIGR{(W!Wyzz6e$c%iDrKNc>?T-&4 z%k)c2#uNFqATl>AvcmNe_7gTEA32NIuvtq+XP%A7wQVOIXD+4R@6#JW<3CX~R~U!6 zWlrBWt6o16DYR0hsXDIPt;}z$w#P@(I)O2*u2FrA+OlI;>dnMIO8q0_+l5w&OX8d1 z$pjO>U=K}%#IK)3B6+{9TE2LsZnJy;2Y1S2&Zi3`4UJ`br4`YkW zVl!B}kK*3==Dvk}!ZuQC(i_vnX6TL0GQaghv&rpu`9y9T8vWJOzh6{WB)`v-McW^_ znYEeh!t{2Un4RWF&n>gh`}chr{`QLuhAO=WmD7RB{;kU9l}f2gI>tKpB8_X2>X}HT zCQ{y(fdhXBe*xcyufgxZ?qFN+Yw)Y^CHMt+;`Vy*r||pmoA4!Ap^^eG@B%OJvMmn$ z9sC7+8@>j=2fxERxCOrkzY1T1Uw|LNKfn**Z{e@tyYOB34txW?3SWUQ!z;YPE4;!h zyu!b5+;d!WoN?4Rwqt$>{{TOLzlFboH_^M$9q0yh6}kdlCcXoI2Y&(IhOfcz!SBFt z!LPxu!k6F|;ECJo!JoqK!*9Zu-l-0o$AQ0tzkqMU*WmX`qB~S`i)yY>%~h&dqM8e4 zv%){X58!X%ui(4zUHA@s1HKAhfiJ@=yuvHI!YjOz50C4f$92u)I^%KGcwF1t{N}(v zzz^VW;jiGk@b7FNap3RZFW}qoHTXUFceW342hxK-h2MwYgfGFrSD=A9@OSVR@NIZ1 zt$Qr&#|0YjcJ=fDegJ<9e+5r*-YL+4UydGjitS^YSP6TtKu=Fk^7!~D-@bj5uV25) z&CQKmUS3MK+m-Y4bLn(Ca(sL&jYdNb4i2PRt;+81u2d=&Szlk5a=9$a%geI3xF~aT zb29u><>xP7{_Fp#5igawJhyp`q;z(RohvvGjHwuE#^Sm$@ zDsmkDA#%2?K*AvKz!E));kp13XDf&#KxcTE0|=Yx0pSBTie7cHaHEMXVMO>SG`X3z z(57|Ii!3V&#q<6}_mD#;0SJ_jPwJLq(i`byg>Q5Up_V0afVf0?og&6M%k#4O<#mcg zt<)J=VJ1(_pXzD~khQ7tYMEjaAycRGw=|t#GJC4W&&L%jOW<|5P=E7yNu8?EGl7$Q z5+o2i!}EMHGA(c%4<-i(g#C$a(F22be8-N{83<^TFlvH5oC MXWuDDuiq*E02S(wSO5S3 diff --git a/PowerEditor/src/icons/asciiPanel2.ico b/PowerEditor/src/icons/light/panels/asciiPanel.ico similarity index 100% rename from PowerEditor/src/icons/asciiPanel2.ico rename to PowerEditor/src/icons/light/panels/asciiPanel.ico diff --git a/PowerEditor/src/icons/clipboardPanel2.ico b/PowerEditor/src/icons/light/panels/clipboardPanel.ico similarity index 100% rename from PowerEditor/src/icons/clipboardPanel2.ico rename to PowerEditor/src/icons/light/panels/clipboardPanel.ico diff --git a/PowerEditor/src/icons/docList2.ico b/PowerEditor/src/icons/light/panels/docList.ico similarity index 100% rename from PowerEditor/src/icons/docList2.ico rename to PowerEditor/src/icons/light/panels/docList.ico diff --git a/PowerEditor/src/icons/docMap2.ico b/PowerEditor/src/icons/light/panels/docMap.ico similarity index 100% rename from PowerEditor/src/icons/docMap2.ico rename to PowerEditor/src/icons/light/panels/docMap.ico diff --git a/PowerEditor/src/icons/fileBrowser2.ico b/PowerEditor/src/icons/light/panels/fileBrowser.ico similarity index 100% rename from PowerEditor/src/icons/fileBrowser2.ico rename to PowerEditor/src/icons/light/panels/fileBrowser.ico diff --git a/PowerEditor/src/icons/functionList2.ico b/PowerEditor/src/icons/light/panels/functionList.ico similarity index 100% rename from PowerEditor/src/icons/functionList2.ico rename to PowerEditor/src/icons/light/panels/functionList.ico diff --git a/PowerEditor/src/icons/projectPanel2.ico b/PowerEditor/src/icons/light/panels/projectPanel.ico similarity index 100% rename from PowerEditor/src/icons/projectPanel2.ico rename to PowerEditor/src/icons/light/panels/projectPanel.ico diff --git a/PowerEditor/src/icons/filledFluentUI/allChars_off.ico b/PowerEditor/src/icons/light/toolbar/filled/allChars_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/allChars_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/allChars_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/supp_off.ico b/PowerEditor/src/icons/light/toolbar/filled/close_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/supp_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/close_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/suppall_off.ico b/PowerEditor/src/icons/light/toolbar/filled/closeall_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/suppall_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/closeall_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/dupli_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/copy_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/dupli_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/copy_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/dupli_off.ico b/PowerEditor/src/icons/light/toolbar/filled/copy_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/dupli_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/copy_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/cut_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/cut_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/cut_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/cut_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/cut_off.ico b/PowerEditor/src/icons/light/toolbar/filled/cut_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/cut_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/cut_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/docList_off.ico b/PowerEditor/src/icons/light/toolbar/filled/docList_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/docList_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/docList_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/docMap_off.ico b/PowerEditor/src/icons/light/toolbar/filled/docMap_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/docMap_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/docMap_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/fileBrowser_off.ico b/PowerEditor/src/icons/light/toolbar/filled/fileBrowser_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/fileBrowser_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/fileBrowser_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/find_off.ico b/PowerEditor/src/icons/light/toolbar/filled/find_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/find_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/find_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/findrep_off.ico b/PowerEditor/src/icons/light/toolbar/filled/findrep_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/findrep_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/findrep_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/funcList_off.ico b/PowerEditor/src/icons/light/toolbar/filled/funcList_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/funcList_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/funcList_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/indentGuide_off.ico b/PowerEditor/src/icons/light/toolbar/filled/indentGuide_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/indentGuide_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/indentGuide_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/monitoring_off.ico b/PowerEditor/src/icons/light/toolbar/filled/monitoring_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/monitoring_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/monitoring_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/new_off.ico b/PowerEditor/src/icons/light/toolbar/filled/new_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/new_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/new_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/open_off.ico b/PowerEditor/src/icons/light/toolbar/filled/open_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/open_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/open_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/paste_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/paste_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/paste_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/paste_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/paste_off.ico b/PowerEditor/src/icons/light/toolbar/filled/paste_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/paste_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/paste_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/playrecord_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/playrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/playrecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/playrecord_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/playrecord_m_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/playrecord_m_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/playrecord_m_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/playrecord_m_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/playrecord_m_off.ico b/PowerEditor/src/icons/light/toolbar/filled/playrecord_m_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/playrecord_m_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/playrecord_m_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/playrecord_off.ico b/PowerEditor/src/icons/light/toolbar/filled/playrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/playrecord_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/playrecord_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/imprim_off.ico b/PowerEditor/src/icons/light/toolbar/filled/print_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/imprim_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/print_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/redo_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/redo_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/redo_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/redo_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/redo_off.ico b/PowerEditor/src/icons/light/toolbar/filled/redo_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/redo_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/redo_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/save_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/save_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/save_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/save_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/save_off.ico b/PowerEditor/src/icons/light/toolbar/filled/save_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/save_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/save_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/saveall_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/saveall_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/saveall_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/saveall_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/saveall_off.ico b/PowerEditor/src/icons/light/toolbar/filled/saveall_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/saveall_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/saveall_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/saverecord_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/saverecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/saverecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/saverecord_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/saverecord_off.ico b/PowerEditor/src/icons/light/toolbar/filled/saverecord_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/saverecord_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/saverecord_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/startrecord_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/startrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/startrecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/startrecord_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/startrecord_off.ico b/PowerEditor/src/icons/light/toolbar/filled/startrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/startrecord_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/startrecord_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/stoprecord_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/stoprecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/stoprecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/stoprecord_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/stoprecord_off.ico b/PowerEditor/src/icons/light/toolbar/filled/stoprecord_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/stoprecord_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/stoprecord_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/syncH_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/syncH_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/syncH_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/syncH_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/syncH_off.ico b/PowerEditor/src/icons/light/toolbar/filled/syncH_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/syncH_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/syncH_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/syncV_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/syncV_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/syncV_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/syncV_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/syncV_off.ico b/PowerEditor/src/icons/light/toolbar/filled/syncV_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/syncV_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/syncV_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/userDefineDlg_off.ico b/PowerEditor/src/icons/light/toolbar/filled/udl_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/userDefineDlg_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/udl_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/undo_dis.ico b/PowerEditor/src/icons/light/toolbar/filled/undo_dis.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/undo_dis.ico rename to PowerEditor/src/icons/light/toolbar/filled/undo_dis.ico diff --git a/PowerEditor/src/icons/filledFluentUI/undo_off.ico b/PowerEditor/src/icons/light/toolbar/filled/undo_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/undo_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/undo_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/wrap_off.ico b/PowerEditor/src/icons/light/toolbar/filled/wrap_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/wrap_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/wrap_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/zoomIn_off.ico b/PowerEditor/src/icons/light/toolbar/filled/zoomIn_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/zoomIn_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/zoomIn_off.ico diff --git a/PowerEditor/src/icons/filledFluentUI/zoomOut_off.ico b/PowerEditor/src/icons/light/toolbar/filled/zoomOut_off.ico similarity index 100% rename from PowerEditor/src/icons/filledFluentUI/zoomOut_off.ico rename to PowerEditor/src/icons/light/toolbar/filled/zoomOut_off.ico diff --git a/PowerEditor/src/icons/allChars_off.ico b/PowerEditor/src/icons/light/toolbar/regular/allChars_off.ico similarity index 100% rename from PowerEditor/src/icons/allChars_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/allChars_off.ico diff --git a/PowerEditor/src/icons/supp_off.ico b/PowerEditor/src/icons/light/toolbar/regular/close_off.ico similarity index 100% rename from PowerEditor/src/icons/supp_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/close_off.ico diff --git a/PowerEditor/src/icons/suppall_off.ico b/PowerEditor/src/icons/light/toolbar/regular/closeall_off.ico similarity index 100% rename from PowerEditor/src/icons/suppall_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/closeall_off.ico diff --git a/PowerEditor/src/icons/dupli_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/copy_dis.ico similarity index 100% rename from PowerEditor/src/icons/dupli_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/copy_dis.ico diff --git a/PowerEditor/src/icons/dupli_off.ico b/PowerEditor/src/icons/light/toolbar/regular/copy_off.ico similarity index 100% rename from PowerEditor/src/icons/dupli_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/copy_off.ico diff --git a/PowerEditor/src/icons/cut_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/cut_dis.ico similarity index 100% rename from PowerEditor/src/icons/cut_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/cut_dis.ico diff --git a/PowerEditor/src/icons/cut_off.ico b/PowerEditor/src/icons/light/toolbar/regular/cut_off.ico similarity index 100% rename from PowerEditor/src/icons/cut_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/cut_off.ico diff --git a/PowerEditor/src/icons/docList_off.ico b/PowerEditor/src/icons/light/toolbar/regular/docList_off.ico similarity index 100% rename from PowerEditor/src/icons/docList_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/docList_off.ico diff --git a/PowerEditor/src/icons/docMap_off.ico b/PowerEditor/src/icons/light/toolbar/regular/docMap_off.ico similarity index 100% rename from PowerEditor/src/icons/docMap_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/docMap_off.ico diff --git a/PowerEditor/src/icons/fileBrowser_off.ico b/PowerEditor/src/icons/light/toolbar/regular/fileBrowser_off.ico similarity index 100% rename from PowerEditor/src/icons/fileBrowser_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/fileBrowser_off.ico diff --git a/PowerEditor/src/icons/find_off.ico b/PowerEditor/src/icons/light/toolbar/regular/find_off.ico similarity index 100% rename from PowerEditor/src/icons/find_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/find_off.ico diff --git a/PowerEditor/src/icons/findrep_off.ico b/PowerEditor/src/icons/light/toolbar/regular/findrep_off.ico similarity index 100% rename from PowerEditor/src/icons/findrep_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/findrep_off.ico diff --git a/PowerEditor/src/icons/funcList_off.ico b/PowerEditor/src/icons/light/toolbar/regular/funcList_off.ico similarity index 100% rename from PowerEditor/src/icons/funcList_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/funcList_off.ico diff --git a/PowerEditor/src/icons/indentGuide_off.ico b/PowerEditor/src/icons/light/toolbar/regular/indentGuide_off.ico similarity index 100% rename from PowerEditor/src/icons/indentGuide_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/indentGuide_off.ico diff --git a/PowerEditor/src/icons/monitoring_off.ico b/PowerEditor/src/icons/light/toolbar/regular/monitoring_off.ico similarity index 100% rename from PowerEditor/src/icons/monitoring_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/monitoring_off.ico diff --git a/PowerEditor/src/icons/new_off.ico b/PowerEditor/src/icons/light/toolbar/regular/new_off.ico similarity index 100% rename from PowerEditor/src/icons/new_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/new_off.ico diff --git a/PowerEditor/src/icons/open_off.ico b/PowerEditor/src/icons/light/toolbar/regular/open_off.ico similarity index 100% rename from PowerEditor/src/icons/open_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/open_off.ico diff --git a/PowerEditor/src/icons/paste_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/paste_dis.ico similarity index 100% rename from PowerEditor/src/icons/paste_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/paste_dis.ico diff --git a/PowerEditor/src/icons/paste_off.ico b/PowerEditor/src/icons/light/toolbar/regular/paste_off.ico similarity index 100% rename from PowerEditor/src/icons/paste_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/paste_off.ico diff --git a/PowerEditor/src/icons/playrecord_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/playrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/playrecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/playrecord_dis.ico diff --git a/PowerEditor/src/icons/playrecord_m_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/playrecord_m_dis.ico similarity index 100% rename from PowerEditor/src/icons/playrecord_m_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/playrecord_m_dis.ico diff --git a/PowerEditor/src/icons/playrecord_m_off.ico b/PowerEditor/src/icons/light/toolbar/regular/playrecord_m_off.ico similarity index 100% rename from PowerEditor/src/icons/playrecord_m_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/playrecord_m_off.ico diff --git a/PowerEditor/src/icons/playrecord_off.ico b/PowerEditor/src/icons/light/toolbar/regular/playrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/playrecord_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/playrecord_off.ico diff --git a/PowerEditor/src/icons/imprim_off.ico b/PowerEditor/src/icons/light/toolbar/regular/print_off.ico similarity index 100% rename from PowerEditor/src/icons/imprim_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/print_off.ico diff --git a/PowerEditor/src/icons/redo_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/redo_dis.ico similarity index 100% rename from PowerEditor/src/icons/redo_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/redo_dis.ico diff --git a/PowerEditor/src/icons/redo_off.ico b/PowerEditor/src/icons/light/toolbar/regular/redo_off.ico similarity index 100% rename from PowerEditor/src/icons/redo_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/redo_off.ico diff --git a/PowerEditor/src/icons/save_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/save_dis.ico similarity index 100% rename from PowerEditor/src/icons/save_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/save_dis.ico diff --git a/PowerEditor/src/icons/save_off.ico b/PowerEditor/src/icons/light/toolbar/regular/save_off.ico similarity index 100% rename from PowerEditor/src/icons/save_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/save_off.ico diff --git a/PowerEditor/src/icons/saveall_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/saveall_dis.ico similarity index 100% rename from PowerEditor/src/icons/saveall_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/saveall_dis.ico diff --git a/PowerEditor/src/icons/saveall_off.ico b/PowerEditor/src/icons/light/toolbar/regular/saveall_off.ico similarity index 100% rename from PowerEditor/src/icons/saveall_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/saveall_off.ico diff --git a/PowerEditor/src/icons/saverecord_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/saverecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/saverecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/saverecord_dis.ico diff --git a/PowerEditor/src/icons/saverecord_off.ico b/PowerEditor/src/icons/light/toolbar/regular/saverecord_off.ico similarity index 100% rename from PowerEditor/src/icons/saverecord_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/saverecord_off.ico diff --git a/PowerEditor/src/icons/startrecord_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/startrecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/startrecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/startrecord_dis.ico diff --git a/PowerEditor/src/icons/startrecord_off.ico b/PowerEditor/src/icons/light/toolbar/regular/startrecord_off.ico similarity index 100% rename from PowerEditor/src/icons/startrecord_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/startrecord_off.ico diff --git a/PowerEditor/src/icons/stoprecord_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/stoprecord_dis.ico similarity index 100% rename from PowerEditor/src/icons/stoprecord_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/stoprecord_dis.ico diff --git a/PowerEditor/src/icons/stoprecord_off.ico b/PowerEditor/src/icons/light/toolbar/regular/stoprecord_off.ico similarity index 100% rename from PowerEditor/src/icons/stoprecord_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/stoprecord_off.ico diff --git a/PowerEditor/src/icons/syncH_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/syncH_dis.ico similarity index 100% rename from PowerEditor/src/icons/syncH_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/syncH_dis.ico diff --git a/PowerEditor/src/icons/syncH_off.ico b/PowerEditor/src/icons/light/toolbar/regular/syncH_off.ico similarity index 100% rename from PowerEditor/src/icons/syncH_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/syncH_off.ico diff --git a/PowerEditor/src/icons/syncV_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/syncV_dis.ico similarity index 100% rename from PowerEditor/src/icons/syncV_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/syncV_dis.ico diff --git a/PowerEditor/src/icons/syncV_off.ico b/PowerEditor/src/icons/light/toolbar/regular/syncV_off.ico similarity index 100% rename from PowerEditor/src/icons/syncV_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/syncV_off.ico diff --git a/PowerEditor/src/icons/userDefineDlg_off.ico b/PowerEditor/src/icons/light/toolbar/regular/udl_off.ico similarity index 100% rename from PowerEditor/src/icons/userDefineDlg_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/udl_off.ico diff --git a/PowerEditor/src/icons/undo_dis.ico b/PowerEditor/src/icons/light/toolbar/regular/undo_dis.ico similarity index 100% rename from PowerEditor/src/icons/undo_dis.ico rename to PowerEditor/src/icons/light/toolbar/regular/undo_dis.ico diff --git a/PowerEditor/src/icons/undo_off.ico b/PowerEditor/src/icons/light/toolbar/regular/undo_off.ico similarity index 100% rename from PowerEditor/src/icons/undo_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/undo_off.ico diff --git a/PowerEditor/src/icons/wrap_off.ico b/PowerEditor/src/icons/light/toolbar/regular/wrap_off.ico similarity index 100% rename from PowerEditor/src/icons/wrap_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/wrap_off.ico diff --git a/PowerEditor/src/icons/zoomIn_off.ico b/PowerEditor/src/icons/light/toolbar/regular/zoomIn_off.ico similarity index 100% rename from PowerEditor/src/icons/zoomIn_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/zoomIn_off.ico diff --git a/PowerEditor/src/icons/zoomOut_off.ico b/PowerEditor/src/icons/light/toolbar/regular/zoomOut_off.ico similarity index 100% rename from PowerEditor/src/icons/zoomOut_off.ico rename to PowerEditor/src/icons/light/toolbar/regular/zoomOut_off.ico diff --git a/PowerEditor/src/icons/chameleon.ico b/PowerEditor/src/icons/standard/about/chameleon.ico similarity index 100% rename from PowerEditor/src/icons/chameleon.ico rename to PowerEditor/src/icons/standard/about/chameleon.ico diff --git a/PowerEditor/src/icons/fb_expand_all.bmp b/PowerEditor/src/icons/standard/panels/fb_expand_all.bmp similarity index 100% rename from PowerEditor/src/icons/fb_expand_all.bmp rename to PowerEditor/src/icons/standard/panels/fb_expand_all.bmp diff --git a/PowerEditor/src/icons/fb_fold_all.bmp b/PowerEditor/src/icons/standard/panels/fb_fold_all.bmp similarity index 100% rename from PowerEditor/src/icons/fb_fold_all.bmp rename to PowerEditor/src/icons/standard/panels/fb_fold_all.bmp diff --git a/PowerEditor/src/icons/fb_root_close.bmp b/PowerEditor/src/icons/standard/panels/fb_root_close.bmp similarity index 100% rename from PowerEditor/src/icons/fb_root_close.bmp rename to PowerEditor/src/icons/standard/panels/fb_root_close.bmp diff --git a/PowerEditor/src/icons/fb_root_open.bmp b/PowerEditor/src/icons/standard/panels/fb_root_open.bmp similarity index 100% rename from PowerEditor/src/icons/fb_root_open.bmp rename to PowerEditor/src/icons/standard/panels/fb_root_open.bmp diff --git a/PowerEditor/src/icons/fb_select_current_file.bmp b/PowerEditor/src/icons/standard/panels/fb_select_current_file.bmp similarity index 100% rename from PowerEditor/src/icons/fb_select_current_file.bmp rename to PowerEditor/src/icons/standard/panels/fb_select_current_file.bmp diff --git a/PowerEditor/src/icons/funcList_leaf.bmp b/PowerEditor/src/icons/standard/panels/funcList_leaf.bmp similarity index 100% rename from PowerEditor/src/icons/funcList_leaf.bmp rename to PowerEditor/src/icons/standard/panels/funcList_leaf.bmp diff --git a/PowerEditor/src/icons/funcList_node.bmp b/PowerEditor/src/icons/standard/panels/funcList_node.bmp similarity index 100% rename from PowerEditor/src/icons/funcList_node.bmp rename to PowerEditor/src/icons/standard/panels/funcList_node.bmp diff --git a/PowerEditor/src/icons/funclstPreferences.bmp b/PowerEditor/src/icons/standard/panels/funclstPreferences.bmp similarity index 100% rename from PowerEditor/src/icons/funclstPreferences.bmp rename to PowerEditor/src/icons/standard/panels/funclstPreferences.bmp diff --git a/PowerEditor/src/icons/funclstReload.bmp b/PowerEditor/src/icons/standard/panels/funclstReload.bmp similarity index 100% rename from PowerEditor/src/icons/funclstReload.bmp rename to PowerEditor/src/icons/standard/panels/funclstReload.bmp diff --git a/PowerEditor/src/icons/funclstSort.bmp b/PowerEditor/src/icons/standard/panels/funclstSort.bmp similarity index 100% rename from PowerEditor/src/icons/funclstSort.bmp rename to PowerEditor/src/icons/standard/panels/funclstSort.bmp diff --git a/PowerEditor/src/icons/project_file.bmp b/PowerEditor/src/icons/standard/panels/project_file.bmp similarity index 100% rename from PowerEditor/src/icons/project_file.bmp rename to PowerEditor/src/icons/standard/panels/project_file.bmp diff --git a/PowerEditor/src/icons/project_file_invalid.bmp b/PowerEditor/src/icons/standard/panels/project_file_invalid.bmp similarity index 100% rename from PowerEditor/src/icons/project_file_invalid.bmp rename to PowerEditor/src/icons/standard/panels/project_file_invalid.bmp diff --git a/PowerEditor/src/icons/project_folder_close.bmp b/PowerEditor/src/icons/standard/panels/project_folder_close.bmp similarity index 100% rename from PowerEditor/src/icons/project_folder_close.bmp rename to PowerEditor/src/icons/standard/panels/project_folder_close.bmp diff --git a/PowerEditor/src/icons/project_folder_open.bmp b/PowerEditor/src/icons/standard/panels/project_folder_open.bmp similarity index 100% rename from PowerEditor/src/icons/project_folder_open.bmp rename to PowerEditor/src/icons/standard/panels/project_folder_open.bmp diff --git a/PowerEditor/src/icons/project_root.bmp b/PowerEditor/src/icons/standard/panels/project_root.bmp similarity index 100% rename from PowerEditor/src/icons/project_root.bmp rename to PowerEditor/src/icons/standard/panels/project_root.bmp diff --git a/PowerEditor/src/icons/project_work_space.bmp b/PowerEditor/src/icons/standard/panels/project_work_space.bmp similarity index 100% rename from PowerEditor/src/icons/project_work_space.bmp rename to PowerEditor/src/icons/standard/panels/project_work_space.bmp diff --git a/PowerEditor/src/icons/project_work_space_dirty.bmp b/PowerEditor/src/icons/standard/panels/project_work_space_dirty.bmp similarity index 100% rename from PowerEditor/src/icons/project_work_space_dirty.bmp rename to PowerEditor/src/icons/standard/panels/project_work_space_dirty.bmp diff --git a/PowerEditor/src/icons/asciiPanel.ico b/PowerEditor/src/icons/standard/panels/tabbar/asciiPanel.ico similarity index 100% rename from PowerEditor/src/icons/asciiPanel.ico rename to PowerEditor/src/icons/standard/panels/tabbar/asciiPanel.ico diff --git a/PowerEditor/src/icons/clipboardPanel.ico b/PowerEditor/src/icons/standard/panels/tabbar/clipboardPanel.ico similarity index 100% rename from PowerEditor/src/icons/clipboardPanel.ico rename to PowerEditor/src/icons/standard/panels/tabbar/clipboardPanel.ico diff --git a/PowerEditor/src/icons/docList.ico b/PowerEditor/src/icons/standard/panels/tabbar/docList.ico similarity index 100% rename from PowerEditor/src/icons/docList.ico rename to PowerEditor/src/icons/standard/panels/tabbar/docList.ico diff --git a/PowerEditor/src/icons/docMap.ico b/PowerEditor/src/icons/standard/panels/tabbar/docMap.ico similarity index 100% rename from PowerEditor/src/icons/docMap.ico rename to PowerEditor/src/icons/standard/panels/tabbar/docMap.ico diff --git a/PowerEditor/src/icons/fileBrowser.ico b/PowerEditor/src/icons/standard/panels/tabbar/fileBrowser.ico similarity index 100% rename from PowerEditor/src/icons/fileBrowser.ico rename to PowerEditor/src/icons/standard/panels/tabbar/fileBrowser.ico diff --git a/PowerEditor/src/icons/functionList.ico b/PowerEditor/src/icons/standard/panels/tabbar/functionList.ico similarity index 100% rename from PowerEditor/src/icons/functionList.ico rename to PowerEditor/src/icons/standard/panels/tabbar/functionList.ico diff --git a/PowerEditor/src/icons/projectPanel.ico b/PowerEditor/src/icons/standard/panels/tabbar/projectPanel.ico similarity index 100% rename from PowerEditor/src/icons/projectPanel.ico rename to PowerEditor/src/icons/standard/panels/tabbar/projectPanel.ico diff --git a/PowerEditor/src/icons/closeTabButton.bmp b/PowerEditor/src/icons/standard/tabbar/closeTabButton.bmp similarity index 100% rename from PowerEditor/src/icons/closeTabButton.bmp rename to PowerEditor/src/icons/standard/tabbar/closeTabButton.bmp diff --git a/PowerEditor/src/icons/closeTabButton_hover.bmp b/PowerEditor/src/icons/standard/tabbar/closeTabButton_hover.bmp similarity index 100% rename from PowerEditor/src/icons/closeTabButton_hover.bmp rename to PowerEditor/src/icons/standard/tabbar/closeTabButton_hover.bmp diff --git a/PowerEditor/src/icons/closeTabButton_inact.bmp b/PowerEditor/src/icons/standard/tabbar/closeTabButton_inact.bmp similarity index 100% rename from PowerEditor/src/icons/closeTabButton_inact.bmp rename to PowerEditor/src/icons/standard/tabbar/closeTabButton_inact.bmp diff --git a/PowerEditor/src/icons/closeTabButton_push.bmp b/PowerEditor/src/icons/standard/tabbar/closeTabButton_push.bmp similarity index 100% rename from PowerEditor/src/icons/closeTabButton_push.bmp rename to PowerEditor/src/icons/standard/tabbar/closeTabButton_push.bmp diff --git a/PowerEditor/src/icons/monitoring.ico b/PowerEditor/src/icons/standard/tabbar/monitoring.ico similarity index 100% rename from PowerEditor/src/icons/monitoring.ico rename to PowerEditor/src/icons/standard/tabbar/monitoring.ico diff --git a/PowerEditor/src/icons/readonly.ico b/PowerEditor/src/icons/standard/tabbar/readonly.ico similarity index 100% rename from PowerEditor/src/icons/readonly.ico rename to PowerEditor/src/icons/standard/tabbar/readonly.ico diff --git a/PowerEditor/src/icons/readonly_alt.ico b/PowerEditor/src/icons/standard/tabbar/readonly_alt.ico similarity index 100% rename from PowerEditor/src/icons/readonly_alt.ico rename to PowerEditor/src/icons/standard/tabbar/readonly_alt.ico diff --git a/PowerEditor/src/icons/saved.ico b/PowerEditor/src/icons/standard/tabbar/saved.ico similarity index 100% rename from PowerEditor/src/icons/saved.ico rename to PowerEditor/src/icons/standard/tabbar/saved.ico diff --git a/PowerEditor/src/icons/saved_alt.ico b/PowerEditor/src/icons/standard/tabbar/saved_alt.ico similarity index 100% rename from PowerEditor/src/icons/saved_alt.ico rename to PowerEditor/src/icons/standard/tabbar/saved_alt.ico diff --git a/PowerEditor/src/icons/unsaved.ico b/PowerEditor/src/icons/standard/tabbar/unsaved.ico similarity index 100% rename from PowerEditor/src/icons/unsaved.ico rename to PowerEditor/src/icons/standard/tabbar/unsaved.ico diff --git a/PowerEditor/src/icons/unsaved_alt.ico b/PowerEditor/src/icons/standard/tabbar/unsaved_alt.ico similarity index 100% rename from PowerEditor/src/icons/unsaved_alt.ico rename to PowerEditor/src/icons/standard/tabbar/unsaved_alt.ico diff --git a/PowerEditor/src/icons/invisibleChar.bmp b/PowerEditor/src/icons/standard/toolbar/allChars.bmp similarity index 100% rename from PowerEditor/src/icons/invisibleChar.bmp rename to PowerEditor/src/icons/standard/toolbar/allChars.bmp diff --git a/PowerEditor/src/icons/closeAll.bmp b/PowerEditor/src/icons/standard/toolbar/closeAll.bmp similarity index 100% rename from PowerEditor/src/icons/closeAll.bmp rename to PowerEditor/src/icons/standard/toolbar/closeAll.bmp diff --git a/PowerEditor/src/icons/closeFile.bmp b/PowerEditor/src/icons/standard/toolbar/closeFile.bmp similarity index 100% rename from PowerEditor/src/icons/closeFile.bmp rename to PowerEditor/src/icons/standard/toolbar/closeFile.bmp diff --git a/PowerEditor/src/icons/copy.bmp b/PowerEditor/src/icons/standard/toolbar/copy.bmp similarity index 100% rename from PowerEditor/src/icons/copy.bmp rename to PowerEditor/src/icons/standard/toolbar/copy.bmp diff --git a/PowerEditor/src/icons/cut.bmp b/PowerEditor/src/icons/standard/toolbar/cut.bmp similarity index 100% rename from PowerEditor/src/icons/cut.bmp rename to PowerEditor/src/icons/standard/toolbar/cut.bmp diff --git a/PowerEditor/src/icons/docList.bmp b/PowerEditor/src/icons/standard/toolbar/docList.bmp similarity index 100% rename from PowerEditor/src/icons/docList.bmp rename to PowerEditor/src/icons/standard/toolbar/docList.bmp diff --git a/PowerEditor/src/icons/docMap.bmp b/PowerEditor/src/icons/standard/toolbar/docMap.bmp similarity index 100% rename from PowerEditor/src/icons/docMap.bmp rename to PowerEditor/src/icons/standard/toolbar/docMap.bmp diff --git a/PowerEditor/src/icons/fileBrowser.bmp b/PowerEditor/src/icons/standard/toolbar/fileBrowser.bmp similarity index 100% rename from PowerEditor/src/icons/fileBrowser.bmp rename to PowerEditor/src/icons/standard/toolbar/fileBrowser.bmp diff --git a/PowerEditor/src/icons/find.bmp b/PowerEditor/src/icons/standard/toolbar/find.bmp similarity index 100% rename from PowerEditor/src/icons/find.bmp rename to PowerEditor/src/icons/standard/toolbar/find.bmp diff --git a/PowerEditor/src/icons/findReplace.bmp b/PowerEditor/src/icons/standard/toolbar/findReplace.bmp similarity index 100% rename from PowerEditor/src/icons/findReplace.bmp rename to PowerEditor/src/icons/standard/toolbar/findReplace.bmp diff --git a/PowerEditor/src/icons/functionList.bmp b/PowerEditor/src/icons/standard/toolbar/funcList.bmp similarity index 100% rename from PowerEditor/src/icons/functionList.bmp rename to PowerEditor/src/icons/standard/toolbar/funcList.bmp diff --git a/PowerEditor/src/icons/indentGuide.bmp b/PowerEditor/src/icons/standard/toolbar/indentGuide.bmp similarity index 100% rename from PowerEditor/src/icons/indentGuide.bmp rename to PowerEditor/src/icons/standard/toolbar/indentGuide.bmp diff --git a/PowerEditor/src/icons/fileMonitoring.bmp b/PowerEditor/src/icons/standard/toolbar/monitoring.bmp similarity index 100% rename from PowerEditor/src/icons/fileMonitoring.bmp rename to PowerEditor/src/icons/standard/toolbar/monitoring.bmp diff --git a/PowerEditor/src/icons/newFile.bmp b/PowerEditor/src/icons/standard/toolbar/newFile.bmp similarity index 100% rename from PowerEditor/src/icons/newFile.bmp rename to PowerEditor/src/icons/standard/toolbar/newFile.bmp diff --git a/PowerEditor/src/icons/openFile.bmp b/PowerEditor/src/icons/standard/toolbar/openFile.bmp similarity index 100% rename from PowerEditor/src/icons/openFile.bmp rename to PowerEditor/src/icons/standard/toolbar/openFile.bmp diff --git a/PowerEditor/src/icons/paste.bmp b/PowerEditor/src/icons/standard/toolbar/paste.bmp similarity index 100% rename from PowerEditor/src/icons/paste.bmp rename to PowerEditor/src/icons/standard/toolbar/paste.bmp diff --git a/PowerEditor/src/icons/playRecord.bmp b/PowerEditor/src/icons/standard/toolbar/playRecord.bmp similarity index 100% rename from PowerEditor/src/icons/playRecord.bmp rename to PowerEditor/src/icons/standard/toolbar/playRecord.bmp diff --git a/PowerEditor/src/icons/playRecord_m.bmp b/PowerEditor/src/icons/standard/toolbar/playRecord_m.bmp similarity index 100% rename from PowerEditor/src/icons/playRecord_m.bmp rename to PowerEditor/src/icons/standard/toolbar/playRecord_m.bmp diff --git a/PowerEditor/src/icons/print.bmp b/PowerEditor/src/icons/standard/toolbar/print.bmp similarity index 100% rename from PowerEditor/src/icons/print.bmp rename to PowerEditor/src/icons/standard/toolbar/print.bmp diff --git a/PowerEditor/src/icons/redo.bmp b/PowerEditor/src/icons/standard/toolbar/redo.bmp similarity index 100% rename from PowerEditor/src/icons/redo.bmp rename to PowerEditor/src/icons/standard/toolbar/redo.bmp diff --git a/PowerEditor/src/icons/saveAll.bmp b/PowerEditor/src/icons/standard/toolbar/saveAll.bmp similarity index 100% rename from PowerEditor/src/icons/saveAll.bmp rename to PowerEditor/src/icons/standard/toolbar/saveAll.bmp diff --git a/PowerEditor/src/icons/saveFile.bmp b/PowerEditor/src/icons/standard/toolbar/saveFile.bmp similarity index 100% rename from PowerEditor/src/icons/saveFile.bmp rename to PowerEditor/src/icons/standard/toolbar/saveFile.bmp diff --git a/PowerEditor/src/icons/saveRecord.bmp b/PowerEditor/src/icons/standard/toolbar/saveRecord.bmp similarity index 100% rename from PowerEditor/src/icons/saveRecord.bmp rename to PowerEditor/src/icons/standard/toolbar/saveRecord.bmp diff --git a/PowerEditor/src/icons/startRecord.bmp b/PowerEditor/src/icons/standard/toolbar/startRecord.bmp similarity index 100% rename from PowerEditor/src/icons/startRecord.bmp rename to PowerEditor/src/icons/standard/toolbar/startRecord.bmp diff --git a/PowerEditor/src/icons/stopRecord.bmp b/PowerEditor/src/icons/standard/toolbar/stopRecord.bmp similarity index 100% rename from PowerEditor/src/icons/stopRecord.bmp rename to PowerEditor/src/icons/standard/toolbar/stopRecord.bmp diff --git a/PowerEditor/src/icons/syncH.bmp b/PowerEditor/src/icons/standard/toolbar/syncH.bmp similarity index 100% rename from PowerEditor/src/icons/syncH.bmp rename to PowerEditor/src/icons/standard/toolbar/syncH.bmp diff --git a/PowerEditor/src/icons/syncV.bmp b/PowerEditor/src/icons/standard/toolbar/syncV.bmp similarity index 100% rename from PowerEditor/src/icons/syncV.bmp rename to PowerEditor/src/icons/standard/toolbar/syncV.bmp diff --git a/PowerEditor/src/icons/showPannel.bmp b/PowerEditor/src/icons/standard/toolbar/udl.bmp similarity index 100% rename from PowerEditor/src/icons/showPannel.bmp rename to PowerEditor/src/icons/standard/toolbar/udl.bmp diff --git a/PowerEditor/src/icons/undo.bmp b/PowerEditor/src/icons/standard/toolbar/undo.bmp similarity index 100% rename from PowerEditor/src/icons/undo.bmp rename to PowerEditor/src/icons/standard/toolbar/undo.bmp diff --git a/PowerEditor/src/icons/wrap.bmp b/PowerEditor/src/icons/standard/toolbar/wrap.bmp similarity index 100% rename from PowerEditor/src/icons/wrap.bmp rename to PowerEditor/src/icons/standard/toolbar/wrap.bmp diff --git a/PowerEditor/src/icons/zoomIn.bmp b/PowerEditor/src/icons/standard/toolbar/zoomIn.bmp similarity index 100% rename from PowerEditor/src/icons/zoomIn.bmp rename to PowerEditor/src/icons/standard/toolbar/zoomIn.bmp diff --git a/PowerEditor/src/icons/zoomOut.bmp b/PowerEditor/src/icons/standard/toolbar/zoomOut.bmp similarity index 100% rename from PowerEditor/src/icons/zoomOut.bmp rename to PowerEditor/src/icons/standard/toolbar/zoomOut.bmp diff --git a/PowerEditor/visual.net/notepadPlus.Resource.targets b/PowerEditor/visual.net/notepadPlus.Resource.targets deleted file mode 100644 index 5a5dc5a46..000000000 --- a/PowerEditor/visual.net/notepadPlus.Resource.targets +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - <_ResourceImage Include="..\src\icons\allChars_off.ico" /> - <_ResourceImage Include="..\src\icons\allChars_on.ico" /> - <_ResourceImage Include="..\src\icons\closeAll.bmp" /> - <_ResourceImage Include="..\src\icons\closefile.bmp" /> - <_ResourceImage Include="..\src\icons\closeTabButton.bmp" /> - <_ResourceImage Include="..\src\icons\closeTabButton_hover.bmp" /> - <_ResourceImage Include="..\src\icons\closeTabButton_inact.bmp" /> - <_ResourceImage Include="..\src\icons\closeTabButton_push.bmp" /> - <_ResourceImage Include="..\src\icons\copy.bmp" /> - <_ResourceImage Include="..\src\icons\cut.bmp" /> - <_ResourceImage Include="..\src\icons\cut_dis.ico" /> - <_ResourceImage Include="..\src\icons\cut_off.ico" /> - <_ResourceImage Include="..\src\icons\cut_on.ico" /> - <_ResourceImage Include="..\src\icons\delete.ico" /> - <_ResourceImage Include="..\src\icons\dupli_dis.ico" /> - <_ResourceImage Include="..\src\icons\dupli_off.ico" /> - <_ResourceImage Include="..\src\icons\dupli_on.ico" /> - <_ResourceImage Include="..\src\icons\find.bmp" /> - <_ResourceImage Include="..\src\icons\find_off.ico" /> - <_ResourceImage Include="..\src\icons\find_on.ico" /> - <_ResourceImage Include="..\src\icons\findrep_off.ico" /> - <_ResourceImage Include="..\src\icons\findrep_on.ico" /> - <_ResourceImage Include="..\src\icons\findReplace.bmp" /> - <_ResourceImage Include="..\src\icons\findResult.ico" /> - <_ResourceImage Include="..\src\icons\imprim_off.ico" /> - <_ResourceImage Include="..\src\icons\imprim_on.ico" /> - <_ResourceImage Include="..\src\icons\indentGuide.bmp" /> - <_ResourceImage Include="..\src\icons\indentGuide_off.ico" /> - <_ResourceImage Include="..\src\icons\indentGuide_on.ico" /> - <_ResourceImage Include="..\src\icons\invisibleChar.bmp" /> - <_ResourceImage Include="..\src\icons\new_off.ico" /> - <_ResourceImage Include="..\src\icons\new_on.ico" /> - <_ResourceImage Include="..\src\icons\newFile.bmp" /> - <_ResourceImage Include="..\src\icons\npp.ico" /> - <_ResourceImage Include="..\src\icons\open_off.ico" /> - <_ResourceImage Include="..\src\icons\open_on.ico" /> - <_ResourceImage Include="..\src\icons\openFile.bmp" /> - <_ResourceImage Include="..\src\icons\paste.bmp" /> - <_ResourceImage Include="..\src\icons\paste_dis.ico" /> - <_ResourceImage Include="..\src\icons\paste_off.ico" /> - <_ResourceImage Include="..\src\icons\paste_on.ico" /> - <_ResourceImage Include="..\src\icons\playRecord.bmp" /> - <_ResourceImage Include="..\src\icons\playrecord_dis.ico" /> - <_ResourceImage Include="..\src\icons\playRecord_m.bmp" /> - <_ResourceImage Include="..\src\icons\playrecord_m_dis.ico" /> - <_ResourceImage Include="..\src\icons\playrecord_m_off.ico" /> - <_ResourceImage Include="..\src\icons\playrecord_m_on.ico" /> - <_ResourceImage Include="..\src\icons\playrecord_off.ico" /> - <_ResourceImage Include="..\src\icons\playrecord_on.ico" /> - <_ResourceImage Include="..\src\icons\print.bmp" /> - <_ResourceImage Include="..\src\icons\readonly.ico" /> - <_ResourceImage Include="..\src\icons\redo.bmp" /> - <_ResourceImage Include="..\src\icons\redo_dis.ico" /> - <_ResourceImage Include="..\src\icons\redo_off.ico" /> - <_ResourceImage Include="..\src\icons\redo_on.ico" /> - <_ResourceImage Include="..\src\icons\save_dis.ico" /> - <_ResourceImage Include="..\src\icons\save_off.ico" /> - <_ResourceImage Include="..\src\icons\save_on.ico" /> - <_ResourceImage Include="..\src\icons\saveAll.bmp" /> - <_ResourceImage Include="..\src\icons\saveall_dis.ico" /> - <_ResourceImage Include="..\src\icons\saveall_off.ico" /> - <_ResourceImage Include="..\src\icons\saveall_on.ico" /> - <_ResourceImage Include="..\src\icons\saved.ico" /> - <_ResourceImage Include="..\src\icons\saveFile.bmp" /> - <_ResourceImage Include="..\src\icons\saveRecord.bmp" /> - <_ResourceImage Include="..\src\icons\saverecord_dis.ico" /> - <_ResourceImage Include="..\src\icons\saverecord_off.ico" /> - <_ResourceImage Include="..\src\icons\saverecord_on.ico" /> - <_ResourceImage Include="..\src\icons\showPannel.bmp" /> - <_ResourceImage Include="..\src\icons\startRecord.bmp" /> - <_ResourceImage Include="..\src\icons\startrecord_dis.ico" /> - <_ResourceImage Include="..\src\icons\startrecord_off.ico" /> - <_ResourceImage Include="..\src\icons\startrecord_on.ico" /> - <_ResourceImage Include="..\src\icons\stopRecord.bmp" /> - <_ResourceImage Include="..\src\icons\stoprecord_dis.ico" /> - <_ResourceImage Include="..\src\icons\stoprecord_off.ico" /> - <_ResourceImage Include="..\src\icons\stoprecord_on.ico" /> - <_ResourceImage Include="..\src\icons\supp_off.ico" /> - <_ResourceImage Include="..\src\icons\supp_on.ico" /> - <_ResourceImage Include="..\src\icons\suppall_off.ico" /> - <_ResourceImage Include="..\src\icons\suppall_on.ico" /> - <_ResourceImage Include="..\src\icons\syncH.bmp" /> - <_ResourceImage Include="..\src\icons\syncH_dis.ico" /> - <_ResourceImage Include="..\src\icons\syncH_off.ico" /> - <_ResourceImage Include="..\src\icons\syncH_on.ico" /> - <_ResourceImage Include="..\src\icons\syncV.bmp" /> - <_ResourceImage Include="..\src\icons\syncV_dis.ico" /> - <_ResourceImage Include="..\src\icons\syncV_off.ico" /> - <_ResourceImage Include="..\src\icons\syncV_on.ico" /> - <_ResourceImage Include="..\src\icons\undo.bmp" /> - <_ResourceImage Include="..\src\icons\undo_dis.ico" /> - <_ResourceImage Include="..\src\icons\undo_off.ico" /> - <_ResourceImage Include="..\src\icons\undo_on.ico" /> - <_ResourceImage Include="..\src\icons\unsaved.ico" /> - <_ResourceImage Include="..\src\icons\userDefineDlg_off.ico" /> - <_ResourceImage Include="..\src\icons\userDefineDlg_on.ico" /> - <_ResourceImage Include="..\src\icons\wrap.bmp" /> - <_ResourceImage Include="..\src\icons\wrap_off.ico" /> - <_ResourceImage Include="..\src\icons\wrap_on.ico" /> - <_ResourceImage Include="..\src\icons\zoomIn.bmp" /> - <_ResourceImage Include="..\src\icons\zoomIn_off.ico" /> - <_ResourceImage Include="..\src\icons\zoomIn_on.ico" /> - <_ResourceImage Include="..\src\icons\zoomOut.bmp" /> - <_ResourceImage Include="..\src\icons\zoomOut_off.ico" /> - <_ResourceImage Include="..\src\icons\zoomOut_on.ico" /> - - - <_ResourceNone Include="..\src\cursors\drag.cur" /> - <_ResourceNone Include="..\src\cursors\drag_interdit.cur" /> - <_ResourceNone Include="..\src\cursors\drag_plus.cur" /> - - \ No newline at end of file diff --git a/PowerEditor/visual.net/notepadPlus.vcxproj b/PowerEditor/visual.net/notepadPlus.vcxproj index 7d6fba981..e18a3409c 100755 --- a/PowerEditor/visual.net/notepadPlus.vcxproj +++ b/PowerEditor/visual.net/notepadPlus.vcxproj @@ -382,7 +382,6 @@ -