diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index ad8c0de40..09a68217b 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -48,72 +48,73 @@ enum tb_stat {tb_saved, tb_unsaved, tb_ro, tb_monitored}; #define DIR_RIGHT false int docTabIconIDs[] = { IDI_SAVED_ICON, IDI_UNSAVED_ICON, IDI_READONLY_ICON, IDI_MONITORING_ICON }; +int docTabIconIDs_darkMode[] = { IDI_SAVED_DM_ICON, IDI_UNSAVED_DM_ICON, IDI_READONLY_DM_ICON, IDI_MONITORING_DM_ICON }; int docTabIconIDs_alt[] = { IDI_SAVED_ALT_ICON, IDI_UNSAVED_ALT_ICON, IDI_READONLY_ALT_ICON, IDI_MONITORING_ICON }; ToolBarButtonUnit toolBarIcons[] = { - {IDM_FILE_NEW, IDI_NEW_ICON, IDI_NEW_ICON, IDI_NEW_ICON2, IDI_NEW_ICON2, IDR_FILENEW}, - {IDM_FILE_OPEN, IDI_OPEN_ICON, IDI_OPEN_ICON, IDI_OPEN_ICON2, IDI_OPEN_ICON2, IDR_FILEOPEN}, - {IDM_FILE_SAVE, IDI_SAVE_ICON, IDI_SAVE_DISABLE_ICON, IDI_SAVE_ICON2, IDI_SAVE_DISABLE_ICON2, IDR_FILESAVE}, - {IDM_FILE_SAVEALL, IDI_SAVEALL_ICON, IDI_SAVEALL_DISABLE_ICON, IDI_SAVEALL_ICON2, IDI_SAVEALL_DISABLE_ICON2, IDR_SAVEALL}, - {IDM_FILE_CLOSE, IDI_CLOSE_ICON, IDI_CLOSE_ICON, IDI_CLOSE_ICON2, IDI_CLOSE_ICON2, IDR_CLOSEFILE}, - {IDM_FILE_CLOSEALL, IDI_CLOSEALL_ICON, IDI_CLOSEALL_ICON, IDI_CLOSEALL_ICON2, IDI_CLOSEALL_ICON2, IDR_CLOSEALL}, - {IDM_FILE_PRINT, IDI_PRINT_ICON, IDI_PRINT_ICON, IDI_PRINT_ICON2, IDI_PRINT_ICON2, IDR_PRINT}, - - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - - {IDM_EDIT_CUT, IDI_CUT_ICON, IDI_CUT_DISABLE_ICON, IDI_CUT_ICON2, IDI_CUT_DISABLE_ICON2, IDR_CUT}, - {IDM_EDIT_COPY, IDI_COPY_ICON, IDI_COPY_DISABLE_ICON, IDI_COPY_ICON2, IDI_COPY_DISABLE_ICON2, IDR_COPY}, - {IDM_EDIT_PASTE, IDI_PASTE_ICON, IDI_PASTE_DISABLE_ICON, IDI_PASTE_ICON2, IDI_PASTE_DISABLE_ICON2, IDR_PASTE}, - - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - - {IDM_EDIT_UNDO, IDI_UNDO_ICON, IDI_UNDO_DISABLE_ICON, IDI_UNDO_ICON2, IDI_UNDO_DISABLE_ICON2, IDR_UNDO}, - {IDM_EDIT_REDO, IDI_REDO_ICON, IDI_REDO_DISABLE_ICON, IDI_REDO_ICON2, IDI_REDO_DISABLE_ICON2, IDR_REDO}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - - {IDM_SEARCH_FIND, IDI_FIND_ICON, IDI_FIND_ICON, IDI_FIND_ICON2, IDI_FIND_ICON2, IDR_FIND}, - {IDM_SEARCH_REPLACE, IDI_REPLACE_ICON, IDI_REPLACE_ICON, IDI_REPLACE_ICON2, IDI_REPLACE_ICON2, IDR_REPLACE}, - - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {IDM_VIEW_ZOOMIN, IDI_ZOOMIN_ICON, IDI_ZOOMIN_ICON, IDI_ZOOMIN_ICON2, IDI_ZOOMIN_ICON2, IDR_ZOOMIN}, - {IDM_VIEW_ZOOMOUT, IDI_ZOOMOUT_ICON, IDI_ZOOMOUT_ICON, IDI_ZOOMOUT_ICON2, IDI_ZOOMOUT_ICON2, IDR_ZOOMOUT}, - - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {IDM_VIEW_SYNSCROLLV, IDI_SYNCV_ICON, IDI_SYNCV_DISABLE_ICON, IDI_SYNCV_ICON2, IDI_SYNCV_DISABLE_ICON2, IDR_SYNCV}, - {IDM_VIEW_SYNSCROLLH, IDI_SYNCH_ICON, IDI_SYNCH_DISABLE_ICON, IDI_SYNCH_ICON2, IDI_SYNCH_DISABLE_ICON2, IDR_SYNCH}, - - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {IDM_VIEW_WRAP, IDI_VIEW_WRAP_ICON, IDI_VIEW_WRAP_ICON, IDI_VIEW_WRAP_ICON2, IDI_VIEW_WRAP_ICON2, IDR_WRAP}, - {IDM_VIEW_ALL_CHARACTERS, IDI_VIEW_ALL_CHAR_ICON, IDI_VIEW_ALL_CHAR_ICON, IDI_VIEW_ALL_CHAR_ICON2, IDI_VIEW_ALL_CHAR_ICON2, IDR_INVISIBLECHAR}, - {IDM_VIEW_INDENT_GUIDE, IDI_VIEW_INDENT_ICON, IDI_VIEW_INDENT_ICON, IDI_VIEW_INDENT_ICON2, IDI_VIEW_INDENT_ICON2, IDR_INDENTGUIDE}, - {IDM_LANG_USER_DLG, IDI_VIEW_UD_DLG_ICON, IDI_VIEW_UD_DLG_ICON, IDI_VIEW_UD_DLG_ICON2, IDI_VIEW_UD_DLG_ICON2, IDR_SHOWPANNEL}, - {IDM_VIEW_DOC_MAP, IDI_VIEW_DOC_MAP_ICON, IDI_VIEW_DOC_MAP_ICON, IDI_VIEW_DOC_MAP_ICON2, IDI_VIEW_DOC_MAP_ICON2, IDR_DOCMAP}, - {IDM_VIEW_FUNC_LIST, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON2, IDR_FUNC_LIST}, - {IDM_VIEW_FILEBROWSER, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON2, IDR_FILEBROWSER}, - {IDM_VIEW_MONITORING, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON2, IDR_FILEMONITORING}, - - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, - //-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// - - {IDM_MACRO_STARTRECORDINGMACRO, IDI_STARTRECORD_ICON, IDI_STARTRECORD_DISABLE_ICON, IDI_STARTRECORD_ICON2, IDI_STARTRECORD_DISABLE_ICON2, IDR_STARTRECORD}, - {IDM_MACRO_STOPRECORDINGMACRO, IDI_STOPRECORD_ICON, IDI_STOPRECORD_DISABLE_ICON, IDI_STOPRECORD_ICON2, IDI_STOPRECORD_DISABLE_ICON2, IDR_STOPRECORD}, - {IDM_MACRO_PLAYBACKRECORDEDMACRO, IDI_PLAYRECORD_ICON, IDI_PLAYRECORD_DISABLE_ICON, IDI_PLAYRECORD_ICON2, IDI_PLAYRECORD_DISABLE_ICON2, IDR_PLAYRECORD}, - {IDM_MACRO_RUNMULTIMACRODLG, IDI_MMPLAY_ICON, IDI_MMPLAY_DIS_ICON, IDI_MMPLAY_ICON2, IDI_MMPLAY_DIS_ICON2, IDR_M_PLAYRECORD}, - {IDM_MACRO_SAVECURRENTMACRO, IDI_SAVERECORD_ICON, IDI_SAVERECORD_DISABLE_ICON, IDI_SAVERECORD_ICON2, IDI_SAVERECORD_DISABLE_ICON2, IDR_SAVERECORD} + {IDM_FILE_NEW, IDI_NEW_ICON, IDI_NEW_ICON, IDI_NEW_ICON2, IDI_NEW_ICON2, IDI_NEW_ICON_DM, IDI_NEW_ICON_DM, IDI_NEW_ICON_DM2, IDI_NEW_ICON_DM2, IDR_FILENEW}, + {IDM_FILE_OPEN, IDI_OPEN_ICON, IDI_OPEN_ICON, IDI_OPEN_ICON2, IDI_OPEN_ICON2, IDI_OPEN_ICON_DM, IDI_OPEN_ICON_DM, IDI_OPEN_ICON_DM2, IDI_OPEN_ICON_DM2, IDR_FILEOPEN}, + {IDM_FILE_SAVE, IDI_SAVE_ICON, IDI_SAVE_DISABLE_ICON, IDI_SAVE_ICON2, IDI_SAVE_DISABLE_ICON2, IDI_SAVE_ICON_DM, IDI_SAVE_DISABLE_ICON_DM, IDI_SAVE_ICON_DM2, IDI_SAVE_DISABLE_ICON_DM2, IDR_FILESAVE}, + {IDM_FILE_SAVEALL, IDI_SAVEALL_ICON, IDI_SAVEALL_DISABLE_ICON, IDI_SAVEALL_ICON2, IDI_SAVEALL_DISABLE_ICON2, IDI_SAVEALL_ICON_DM, IDI_SAVEALL_DISABLE_ICON_DM, IDI_SAVEALL_ICON_DM2, IDI_SAVEALL_DISABLE_ICON_DM2, IDR_SAVEALL}, + {IDM_FILE_CLOSE, IDI_CLOSE_ICON, IDI_CLOSE_ICON, IDI_CLOSE_ICON2, IDI_CLOSE_ICON2, IDI_CLOSE_ICON_DM, IDI_CLOSE_ICON_DM, IDI_CLOSE_ICON_DM2, IDI_CLOSE_ICON_DM2, IDR_CLOSEFILE}, + {IDM_FILE_CLOSEALL, IDI_CLOSEALL_ICON, IDI_CLOSEALL_ICON, IDI_CLOSEALL_ICON2, IDI_CLOSEALL_ICON2, IDI_CLOSEALL_ICON_DM, IDI_CLOSEALL_ICON_DM, IDI_CLOSEALL_ICON_DM2, IDI_CLOSEALL_ICON_DM2, IDR_CLOSEALL}, + {IDM_FILE_PRINT, IDI_PRINT_ICON, IDI_PRINT_ICON, IDI_PRINT_ICON2, IDI_PRINT_ICON2, IDI_PRINT_ICON_DM, IDI_PRINT_ICON_DM, IDI_PRINT_ICON_DM2, IDI_PRINT_ICON_DM2, IDR_PRINT}, + + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + + {IDM_EDIT_CUT, IDI_CUT_ICON, IDI_CUT_DISABLE_ICON, IDI_CUT_ICON2, IDI_CUT_DISABLE_ICON2, IDI_CUT_ICON_DM, IDI_CUT_DISABLE_ICON_DM, IDI_CUT_ICON_DM2, IDI_CUT_DISABLE_ICON_DM2, IDR_CUT}, + {IDM_EDIT_COPY, IDI_COPY_ICON, IDI_COPY_DISABLE_ICON, IDI_COPY_ICON2, IDI_COPY_DISABLE_ICON2, IDI_COPY_ICON_DM, IDI_COPY_DISABLE_ICON_DM, IDI_COPY_ICON_DM2, IDI_COPY_DISABLE_ICON_DM2, IDR_COPY}, + {IDM_EDIT_PASTE, IDI_PASTE_ICON, IDI_PASTE_DISABLE_ICON, IDI_PASTE_ICON2, IDI_PASTE_DISABLE_ICON2, IDI_PASTE_ICON_DM, IDI_PASTE_DISABLE_ICON_DM, IDI_PASTE_ICON_DM2, IDI_PASTE_DISABLE_ICON_DM2, IDR_PASTE}, + + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + + {IDM_EDIT_UNDO, IDI_UNDO_ICON, IDI_UNDO_DISABLE_ICON, IDI_UNDO_ICON2, IDI_UNDO_DISABLE_ICON2, IDI_UNDO_ICON_DM, IDI_UNDO_DISABLE_ICON_DM, IDI_UNDO_ICON_DM2, IDI_UNDO_DISABLE_ICON_DM2, IDR_UNDO}, + {IDM_EDIT_REDO, IDI_REDO_ICON, IDI_REDO_DISABLE_ICON, IDI_REDO_ICON2, IDI_REDO_DISABLE_ICON2, IDI_REDO_ICON_DM, IDI_REDO_DISABLE_ICON_DM, IDI_REDO_ICON_DM2, IDI_REDO_DISABLE_ICON_DM2, IDR_REDO}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + + {IDM_SEARCH_FIND, IDI_FIND_ICON, IDI_FIND_ICON, IDI_FIND_ICON2, IDI_FIND_ICON2, IDI_FIND_ICON_DM, IDI_FIND_ICON_DM, IDI_FIND_ICON_DM2, IDI_FIND_ICON_DM2, IDR_FIND}, + {IDM_SEARCH_REPLACE, IDI_REPLACE_ICON, IDI_REPLACE_ICON, IDI_REPLACE_ICON2, IDI_REPLACE_ICON2, IDI_REPLACE_ICON_DM, IDI_REPLACE_ICON_DM, IDI_REPLACE_ICON_DM2, IDI_REPLACE_ICON_DM2, IDR_REPLACE}, + + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {IDM_VIEW_ZOOMIN, IDI_ZOOMIN_ICON, IDI_ZOOMIN_ICON, IDI_ZOOMIN_ICON2, IDI_ZOOMIN_ICON2, IDI_ZOOMIN_ICON_DM, IDI_ZOOMIN_ICON_DM, IDI_ZOOMIN_ICON_DM2, IDI_ZOOMIN_ICON_DM2, IDR_ZOOMIN}, + {IDM_VIEW_ZOOMOUT, IDI_ZOOMOUT_ICON, IDI_ZOOMOUT_ICON, IDI_ZOOMOUT_ICON2, IDI_ZOOMOUT_ICON2, IDI_ZOOMOUT_ICON_DM, IDI_ZOOMOUT_ICON_DM, IDI_ZOOMOUT_ICON_DM2, IDI_ZOOMOUT_ICON_DM2, IDR_ZOOMOUT}, + + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {IDM_VIEW_SYNSCROLLV, IDI_SYNCV_ICON, IDI_SYNCV_DISABLE_ICON, IDI_SYNCV_ICON2, IDI_SYNCV_DISABLE_ICON2, IDI_SYNCV_ICON_DM, IDI_SYNCV_DISABLE_ICON_DM, IDI_SYNCV_ICON_DM2, IDI_SYNCV_DISABLE_ICON_DM2, IDR_SYNCV}, + {IDM_VIEW_SYNSCROLLH, IDI_SYNCH_ICON, IDI_SYNCH_DISABLE_ICON, IDI_SYNCH_ICON2, IDI_SYNCH_DISABLE_ICON2, IDI_SYNCH_ICON_DM, IDI_SYNCH_DISABLE_ICON_DM, IDI_SYNCH_ICON_DM2, IDI_SYNCH_DISABLE_ICON_DM2, IDR_SYNCH}, + + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {IDM_VIEW_WRAP, IDI_VIEW_WRAP_ICON, IDI_VIEW_WRAP_ICON, IDI_VIEW_WRAP_ICON2, IDI_VIEW_WRAP_ICON2, IDI_VIEW_WRAP_ICON_DM, IDI_VIEW_WRAP_ICON_DM, IDI_VIEW_WRAP_ICON_DM2, IDI_VIEW_WRAP_ICON_DM2, IDR_WRAP}, + {IDM_VIEW_ALL_CHARACTERS, IDI_VIEW_ALL_CHAR_ICON, IDI_VIEW_ALL_CHAR_ICON, IDI_VIEW_ALL_CHAR_ICON2, IDI_VIEW_ALL_CHAR_ICON2, IDI_VIEW_ALL_CHAR_ICON_DM, IDI_VIEW_ALL_CHAR_ICON_DM, IDI_VIEW_ALL_CHAR_ICON_DM2, IDI_VIEW_ALL_CHAR_ICON_DM2, IDR_INVISIBLECHAR}, + {IDM_VIEW_INDENT_GUIDE, IDI_VIEW_INDENT_ICON, IDI_VIEW_INDENT_ICON, IDI_VIEW_INDENT_ICON2, IDI_VIEW_INDENT_ICON2, IDI_VIEW_INDENT_ICON_DM, IDI_VIEW_INDENT_ICON_DM, IDI_VIEW_INDENT_ICON_DM2, IDI_VIEW_INDENT_ICON_DM2, IDR_INDENTGUIDE}, + {IDM_LANG_USER_DLG, IDI_VIEW_UD_DLG_ICON, IDI_VIEW_UD_DLG_ICON, IDI_VIEW_UD_DLG_ICON2, IDI_VIEW_UD_DLG_ICON2, IDI_VIEW_UD_DLG_ICON_DM, IDI_VIEW_UD_DLG_ICON_DM, IDI_VIEW_UD_DLG_ICON_DM2, IDI_VIEW_UD_DLG_ICON_DM2, IDR_SHOWPANNEL}, + {IDM_VIEW_DOC_MAP, IDI_VIEW_DOC_MAP_ICON, IDI_VIEW_DOC_MAP_ICON, IDI_VIEW_DOC_MAP_ICON2, IDI_VIEW_DOC_MAP_ICON2, IDI_VIEW_DOC_MAP_ICON_DM, IDI_VIEW_DOC_MAP_ICON_DM, IDI_VIEW_DOC_MAP_ICON_DM2, IDI_VIEW_DOC_MAP_ICON_DM2, IDR_DOCMAP}, + {IDM_VIEW_FUNC_LIST, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON2, IDI_VIEW_FUNCLIST_ICON_DM, IDI_VIEW_FUNCLIST_ICON_DM, IDI_VIEW_FUNCLIST_ICON_DM2, IDI_VIEW_FUNCLIST_ICON_DM2, IDR_FUNC_LIST}, + {IDM_VIEW_FILEBROWSER, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON2, IDI_VIEW_FILEBROWSER_ICON_DM, IDI_VIEW_FILEBROWSER_ICON_DM, IDI_VIEW_FILEBROWSER_ICON_DM2, IDI_VIEW_FILEBROWSER_ICON_DM2, IDR_FILEBROWSER}, + {IDM_VIEW_MONITORING, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON2, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_ICON_DM, IDI_VIEW_MONITORING_ICON_DM2, IDI_VIEW_MONITORING_ICON_DM2, IDR_FILEMONITORING}, + + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + {0, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON, IDI_SEPARATOR_ICON}, + //---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------// + + {IDM_MACRO_STARTRECORDINGMACRO, IDI_STARTRECORD_ICON, IDI_STARTRECORD_DISABLE_ICON, IDI_STARTRECORD_ICON2, IDI_STARTRECORD_DISABLE_ICON2, IDI_STARTRECORD_ICON_DM, IDI_STARTRECORD_DISABLE_ICON_DM, IDI_STARTRECORD_ICON_DM2, IDI_STARTRECORD_DISABLE_ICON_DM2, IDR_STARTRECORD}, + {IDM_MACRO_STOPRECORDINGMACRO, IDI_STOPRECORD_ICON, IDI_STOPRECORD_DISABLE_ICON, IDI_STOPRECORD_ICON2, IDI_STOPRECORD_DISABLE_ICON2, IDI_STOPRECORD_ICON_DM, IDI_STOPRECORD_DISABLE_ICON_DM, IDI_STOPRECORD_ICON_DM2, IDI_STOPRECORD_DISABLE_ICON_DM2, IDR_STOPRECORD}, + {IDM_MACRO_PLAYBACKRECORDEDMACRO, IDI_PLAYRECORD_ICON, IDI_PLAYRECORD_DISABLE_ICON, IDI_PLAYRECORD_ICON2, IDI_PLAYRECORD_DISABLE_ICON2, IDI_PLAYRECORD_ICON_DM, IDI_PLAYRECORD_DISABLE_ICON_DM, IDI_PLAYRECORD_ICON_DM2, IDI_PLAYRECORD_DISABLE_ICON_DM2, IDR_PLAYRECORD}, + {IDM_MACRO_RUNMULTIMACRODLG, IDI_MMPLAY_ICON, IDI_MMPLAY_DIS_ICON, IDI_MMPLAY_ICON2, IDI_MMPLAY_DIS_ICON2, IDI_MMPLAY_ICON_DM, IDI_MMPLAY_DIS_ICON_DM, IDI_MMPLAY_ICON_DM2, IDI_MMPLAY_DIS_ICON_DM2, IDR_M_PLAYRECORD}, + {IDM_MACRO_SAVECURRENTMACRO, IDI_SAVERECORD_ICON, IDI_SAVERECORD_DISABLE_ICON, IDI_SAVERECORD_ICON2, IDI_SAVERECORD_DISABLE_ICON2, IDI_SAVERECORD_ICON_DM, IDI_SAVERECORD_DISABLE_ICON_DM, IDI_SAVERECORD_ICON_DM2, IDI_SAVERECORD_DISABLE_ICON_DM2, IDR_SAVERECORD} }; @@ -226,13 +227,17 @@ LRESULT Notepad_plus::init(HWND hwnd) int iconDpiDynamicalSize = nppParam._dpiManager.scaleY(_toReduceTabBar ? 13 : 20); _docTabIconList.create(iconDpiDynamicalSize, _pPublicInterface->getHinst(), docTabIconIDs, sizeof(docTabIconIDs) / sizeof(int)); _docTabIconListAlt.create(iconDpiDynamicalSize, _pPublicInterface->getHinst(), docTabIconIDs_alt, sizeof(docTabIconIDs_alt) / sizeof(int)); - + _docTabIconListDarkMode.create(iconDpiDynamicalSize, _pPublicInterface->getHinst(), docTabIconIDs_darkMode, sizeof(docTabIconIDs_darkMode) / sizeof(int)); + vector pIconListVector; - pIconListVector.push_back(&_docTabIconList); - pIconListVector.push_back(&_docTabIconListAlt); + pIconListVector.push_back(&_docTabIconList); // 0 + pIconListVector.push_back(&_docTabIconListAlt); // 1 + pIconListVector.push_back(&_docTabIconListDarkMode);// 2 - _mainDocTab.init(_pPublicInterface->getHinst(), hwnd, &_mainEditView, pIconListVector, (tabBarStatus & TAB_ALTICONS) ? 1 : 0); - _subDocTab.init(_pPublicInterface->getHinst(), hwnd, &_subEditView, pIconListVector, (tabBarStatus & TAB_ALTICONS) ? 1 : 0); + unsigned char indexDocTabIcon = NppDarkMode::isEnabled() ? 2 : ((tabBarStatus & TAB_ALTICONS) ? 1 : 0); + + _mainDocTab.init(_pPublicInterface->getHinst(), hwnd, &_mainEditView, pIconListVector, indexDocTabIcon); + _subDocTab.init(_pPublicInterface->getHinst(), hwnd, &_subEditView, pIconListVector, indexDocTabIcon); _mainEditView.display(); @@ -7513,6 +7518,33 @@ void Notepad_plus::refreshDarkMode() SendMessage(_incrementFindDlg.getHSelf(), NPPM_INTERNAL_REFRESHDARKMODE, 0, 0); RedrawWindow(_pPublicInterface->getHSelf(), nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); RedrawWindow(_findReplaceDlg.getHSelf(), nullptr, nullptr, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_ALLCHILDREN); + SendMessage(_pPublicInterface->getHSelf(), NPPM_INTERNAL_CHANGETABBAEICONS, 0, NppDarkMode::isEnabled() ? 2 : 0); + + toolBarStatusType state = _toolBar.getState(); + switch (state) + { + case TB_SMALL: + _toolBar.reduce(); + break; + + case TB_LARGE: + _toolBar.enlarge(); + break; + + case TB_SMALL2: + _toolBar.reduceToSet2(); + break; + + case TB_LARGE2: + _toolBar.enlargeToSet2(); + break; + + case TB_STANDARD: + // Force standard colorful icon to Fluent UI small icon in dark mode + if (NppDarkMode::isEnabled()) + _toolBar.reduce(); + break; + } if (NppDarkMode::isExperimentalEnabled()) { diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h index a32b37be7..fde8d5790 100644 --- a/PowerEditor/src/Notepad_plus.h +++ b/PowerEditor/src/Notepad_plus.h @@ -298,6 +298,7 @@ private: ToolBar _toolBar; IconList _docTabIconList; IconList _docTabIconListAlt; + IconList _docTabIconListDarkMode; StatusBar _statusBar; bool _toReduceTabBar = false; diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index b44347e34..7b57a61e9 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -154,15 +154,120 @@ 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" +// +// 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_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" + +// +// 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_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_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_FIND_RESULT_ICON ICON "icons/findResult.ico" @@ -202,6 +307,10 @@ 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_FUNC_LIST BITMAP "icons/functionList.bmp" IDR_FILEBROWSER BITMAP "icons/fileBrowser.bmp" diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp index 29f61b422..04d3f8d54 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp @@ -589,7 +589,8 @@ void DockingCont::drawCaptionItem(DRAWITEMSTRUCT *pDrawItemStruct) ::DrawText(hDc, L"x", 1, &rc, DT_VCENTER | DT_CENTER | DT_SINGLELINE); } - else { + else + { HDC dcMem = ::CreateCompatibleDC(NULL); diff --git a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp index 84cfa025a..753cdf69e 100644 --- a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp +++ b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.cpp @@ -49,6 +49,29 @@ void IconList::addIcon(int iconID) const ImageList_AddIcon(_hImglst, hIcon); ::DestroyIcon(hIcon); }; +/* +bool IconList::addInvertIcon(int iconID) const +{ + HICON hIcon = ::LoadIcon(_hInst, MAKEINTRESOURCE(iconID)); + if (!hIcon) + throw std::runtime_error("IconList::addIcon : LoadIcon() function return null"); + + HICON hColorInvertedIcon = invertColour(hIcon); + + if (hColorInvertedIcon) + ImageList_AddIcon(_hImglst, hColorInvertedIcon); + + ::DestroyIcon(hIcon); + + return hColorInvertedIcon != 0; +} + +HICON IconList::invertColour(HICON hIcon) const +{ + // Light mode in, dark mode out + return NULL; +} +*/ void IconList::addIcon(HICON hIcon) const { @@ -91,6 +114,12 @@ void ToolBarIcons::reInit(int size) ImageList_SetIconSize(getDefaultLstSet2(), size, size); ImageList_SetIconSize(getDisableLstSet2(), size, size); + ImageList_SetIconSize(getDefaultLstDM(), size, size); + ImageList_SetIconSize(getDisableLstDM(), size, size); + + ImageList_SetIconSize(getDefaultLstSetDM2(), size, size); + ImageList_SetIconSize(getDisableLstSetDM2(), size, size); + for (size_t i = 0, len = _tbiis.size(); i < len; ++i) { if (_tbiis[i]._defaultIcon != -1) @@ -99,31 +128,54 @@ void ToolBarIcons::reInit(int size) _iconListVector[HLIST_DISABLE].addIcon(_tbiis[i]._grayIcon); _iconListVector[HLIST_DEFAULT2].addIcon(_tbiis[i]._defaultIcon2); _iconListVector[HLIST_DISABLE2].addIcon(_tbiis[i]._grayIcon2); + + _iconListVector[HLIST_DEFAULT_DM].addIcon(_tbiis[i]._defaultDarkModeIcon); + _iconListVector[HLIST_DISABLE_DM].addIcon(_tbiis[i]._grayDarkModeIcon); + _iconListVector[HLIST_DEFAULT_DM2].addIcon(_tbiis[i]._defaultDarkModeIcon2); + _iconListVector[HLIST_DISABLE_DM2].addIcon(_tbiis[i]._grayDarkModeIcon2); } } - // Add dynamic icons + // Add dynamic icons (from plugins) for (auto i : _moreCmds) { _iconListVector[HLIST_DEFAULT].addIcon(i._hIcon); _iconListVector[HLIST_DISABLE].addIcon(i._hIcon); _iconListVector[HLIST_DEFAULT2].addIcon(i._hIcon); _iconListVector[HLIST_DISABLE2].addIcon(i._hIcon); + + + _iconListVector[HLIST_DEFAULT_DM].addIcon(i._hIcon); + _iconListVector[HLIST_DISABLE_DM].addIcon(i._hIcon); + _iconListVector[HLIST_DEFAULT_DM2].addIcon(i._hIcon); + _iconListVector[HLIST_DISABLE_DM2].addIcon(i._hIcon); } } + void ToolBarIcons::create(HINSTANCE hInst, int iconSize) { _iconListVector.push_back(IconList()); _iconListVector.push_back(IconList()); _iconListVector.push_back(IconList()); _iconListVector.push_back(IconList()); + + _iconListVector.push_back(IconList()); + _iconListVector.push_back(IconList()); + _iconListVector.push_back(IconList()); + _iconListVector.push_back(IconList()); + _iconListVector[HLIST_DEFAULT].init(hInst, iconSize); _iconListVector[HLIST_DISABLE].init(hInst, iconSize); _iconListVector[HLIST_DEFAULT2].init(hInst, iconSize); _iconListVector[HLIST_DISABLE2].init(hInst, iconSize); + _iconListVector[HLIST_DEFAULT_DM].init(hInst, iconSize); + _iconListVector[HLIST_DISABLE_DM].init(hInst, iconSize); + _iconListVector[HLIST_DEFAULT_DM2].init(hInst, iconSize); + _iconListVector[HLIST_DISABLE_DM2].init(hInst, iconSize); + reInit(iconSize); } diff --git a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h index 13ec121a9..5ac7ab22d 100644 --- a/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h +++ b/PowerEditor/src/WinControls/ImageListSet/ImageListSet.h @@ -35,16 +35,21 @@ public : }; HIMAGELIST getHandle() const {return _hImglst;}; void addIcon(int iconID) const; + //bool addInvertIcon(int iconID) const; void addIcon(HICON hIcon) const; + bool changeIcon(int index, const TCHAR *iconLocation) const; void addIcons(int size) const; + private : HIMAGELIST _hImglst = nullptr; HINSTANCE _hInst = nullptr; int *_pIconIDArray = nullptr; int _iconIDArraySize = 0; int _iconSize = 0; + + //HICON invertColour(HICON hIcon) const; }; typedef struct @@ -57,6 +62,12 @@ typedef struct int _defaultIcon2; int _grayIcon2; + int _defaultDarkModeIcon; + int _grayDarkModeIcon; + + int _defaultDarkModeIcon2; + int _grayDarkModeIcon2; + int _stdIcon; } ToolBarButtonUnit; @@ -68,11 +79,16 @@ struct DynamicCmdIcoBmp { typedef std::vector ToolBarIconIDs; - +// Light Mode list const int HLIST_DEFAULT = 0; const int HLIST_DISABLE = 1; const int HLIST_DEFAULT2 = 2; const int HLIST_DISABLE2 = 3; +// Dark Mode list +const int HLIST_DEFAULT_DM = 4; +const int HLIST_DISABLE_DM = 5; +const int HLIST_DEFAULT_DM2 = 6; +const int HLIST_DISABLE_DM2 = 7; class ToolBarIcons { @@ -99,6 +115,22 @@ public : return _iconListVector[HLIST_DISABLE2].getHandle(); }; + HIMAGELIST getDefaultLstDM() const { + return _iconListVector[HLIST_DEFAULT_DM].getHandle(); + }; + + HIMAGELIST getDisableLstDM() const { + return _iconListVector[HLIST_DISABLE_DM].getHandle(); + }; + + HIMAGELIST getDefaultLstSetDM2() const { + return _iconListVector[HLIST_DEFAULT_DM2].getHandle(); + }; + + HIMAGELIST getDisableLstSetDM2() const { + return _iconListVector[HLIST_DISABLE_DM2].getHandle(); + }; + void resizeIcon(int size) { reInit(size); }; diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp index 002adcaef..999b16424 100644 --- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp +++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp @@ -1112,13 +1112,14 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode) // 3 status for each inactive tab and selected tab close item : // normal / hover / pushed int idCloseImg; + bool isDM = NppDarkMode::isEnabled(); if (_isCloseHover && (_currentHoverTabItem == nTab) && (_whichCloseClickDown == -1)) // hover - idCloseImg = IDR_CLOSETAB_HOVER; + idCloseImg = isDM ? IDR_CLOSETAB_HOVER_DM : IDR_CLOSETAB_HOVER; else if (_isCloseHover && (_currentHoverTabItem == nTab) && (_whichCloseClickDown == _currentHoverTabItem)) // pushed - idCloseImg = IDR_CLOSETAB_PUSH; + idCloseImg = isDM ? IDR_CLOSETAB_PUSH_DM : IDR_CLOSETAB_PUSH; else - idCloseImg = isSelected?IDR_CLOSETAB:IDR_CLOSETAB_INACT; + idCloseImg = isSelected ? (isDM ? IDR_CLOSETAB_DM : IDR_CLOSETAB) : (isDM ? IDR_CLOSETAB_INACT_DM : IDR_CLOSETAB_INACT); HDC hdcMemory; hdcMemory = ::CreateCompatibleDC(hDC); diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp index 74e08378c..c247f1bee 100644 --- a/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp +++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.cpp @@ -203,9 +203,6 @@ int ToolBar::getHeight() const void ToolBar::reduce() { - if (_state == TB_SMALL) - return; - int iconDpiDynamicalSize = NppParameters::getInstance()._dpiManager.scaleX(16); _toolBarIcons.resizeIcon(iconDpiDynamicalSize); setState(TB_SMALL); @@ -215,9 +212,6 @@ void ToolBar::reduce() void ToolBar::enlarge() { - if (_state == TB_LARGE) - return; - int iconDpiDynamicalSize = NppParameters::getInstance()._dpiManager.scaleX(32); _toolBarIcons.resizeIcon(iconDpiDynamicalSize); setState(TB_LARGE); @@ -227,9 +221,6 @@ void ToolBar::enlarge() void ToolBar::reduceToSet2() { - if (_state == TB_SMALL2) - return; - int iconDpiDynamicalSize = NppParameters::getInstance()._dpiManager.scaleX(16); _toolBarIcons.resizeIcon(iconDpiDynamicalSize); @@ -240,9 +231,6 @@ void ToolBar::reduceToSet2() void ToolBar::enlargeToSet2() { - if (_state == TB_LARGE2) - return; - int iconDpiDynamicalSize = NppParameters::getInstance()._dpiManager.scaleX(32); _toolBarIcons.resizeIcon(iconDpiDynamicalSize); setState(TB_LARGE2); @@ -252,8 +240,6 @@ void ToolBar::enlargeToSet2() void ToolBar::setToBmpIcons() { - if (_state == TB_STANDARD) - return; bool recreate = true; setState(TB_STANDARD); reset(recreate); //must recreate toolbar if setting to internal bitmaps @@ -311,13 +297,29 @@ void ToolBar::reset(bool create) { if (_state == TB_SMALL || _state == TB_LARGE) { - setDefaultImageList(); - setDisableImageList(); + if (NppDarkMode::isEnabled()) + { + setDefaultImageListDM(); + setDisableImageListDM(); + } + else + { + setDefaultImageList(); + setDisableImageList(); + } } else { - setDefaultImageList2(); - setDisableImageList2(); + if (NppDarkMode::isEnabled()) + { + setDefaultImageListDM2(); + setDisableImageListDM2(); + } + else + { + setDefaultImageList2(); + setDisableImageList2(); + } } } else @@ -467,21 +469,24 @@ LRESULT CALLBACK RebarSubclass( UNREFERENCED_PARAMETER(dwRefData); UNREFERENCED_PARAMETER(uIdSubclass); - switch (uMsg) { - case WM_ERASEBKGND: - if (NppDarkMode::isEnabled()) - { - RECT rc; - GetClientRect(hWnd, &rc); - FillRect((HDC)wParam, &rc, NppDarkMode::getPureBackgroundBrush()); - return 1; - } - else { + switch (uMsg) + { + case WM_ERASEBKGND: + if (NppDarkMode::isEnabled()) + { + RECT rc; + GetClientRect(hWnd, &rc); + FillRect((HDC)wParam, &rc, NppDarkMode::getPureBackgroundBrush()); + return TRUE; + } + else + { + break; + } + + case WM_NCDESTROY: + RemoveWindowSubclass(hWnd, RebarSubclass, g_rebarSubclassID); break; - } - case WM_NCDESTROY: - RemoveWindowSubclass(hWnd, RebarSubclass, g_rebarSubclassID); - break; } return DefSubclassProc(hWnd, uMsg, wParam, lParam); } diff --git a/PowerEditor/src/WinControls/ToolBar/ToolBar.h b/PowerEditor/src/WinControls/ToolBar/ToolBar.h index 690d01d3b..d0ac5d32e 100644 --- a/PowerEditor/src/WinControls/ToolBar/ToolBar.h +++ b/PowerEditor/src/WinControls/ToolBar/ToolBar.h @@ -130,6 +130,22 @@ private : ::SendMessage(_hSelf, TB_SETDISABLEDIMAGELIST, 0, reinterpret_cast(_toolBarIcons.getDisableLstSet2())); }; + void setDefaultImageListDM() { + ::SendMessage(_hSelf, TB_SETIMAGELIST, 0, reinterpret_cast(_toolBarIcons.getDefaultLstDM())); + }; + + void setDisableImageListDM() { + ::SendMessage(_hSelf, TB_SETDISABLEDIMAGELIST, 0, reinterpret_cast(_toolBarIcons.getDisableLstDM())); + }; + + void setDefaultImageListDM2() { + ::SendMessage(_hSelf, TB_SETIMAGELIST, 0, reinterpret_cast(_toolBarIcons.getDefaultLstSetDM2())); + }; + + void setDisableImageListDM2() { + ::SendMessage(_hSelf, TB_SETDISABLEDIMAGELIST, 0, reinterpret_cast(_toolBarIcons.getDisableLstSetDM2())); + }; + void reset(bool create = false); void setState(toolBarStatusType state) { _state = state; diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton.bmp b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton.bmp new file mode 100644 index 000000000..ea6e6c4eb Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton.bmp differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_hover.bmp b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_hover.bmp new file mode 100644 index 000000000..b5bc396eb Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_hover.bmp differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_inact.bmp b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_inact.bmp new file mode 100644 index 000000000..22fb92486 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_inact.bmp differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_push.bmp b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_push.bmp new file mode 100644 index 000000000..b5bc396eb Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/closeTabButton_push.bmp differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/monitoring.ico b/PowerEditor/src/icons/darkMode/tabbar/monitoring.ico new file mode 100644 index 000000000..04e019fa6 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/monitoring.ico differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/readonly.ico b/PowerEditor/src/icons/darkMode/tabbar/readonly.ico new file mode 100644 index 000000000..f3b633d93 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/readonly.ico differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/saved.ico b/PowerEditor/src/icons/darkMode/tabbar/saved.ico new file mode 100644 index 000000000..619284ced Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/saved.ico differ diff --git a/PowerEditor/src/icons/darkMode/tabbar/unsaved.ico b/PowerEditor/src/icons/darkMode/tabbar/unsaved.ico new file mode 100644 index 000000000..f3526dcd6 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/tabbar/unsaved.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/allChars_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/allChars_off.ico new file mode 100644 index 000000000..30fa4c475 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/allChars_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_dis.ico new file mode 100644 index 000000000..b2236915e Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_off.ico new file mode 100644 index 000000000..9c194d077 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/cut_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docMap_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docMap_off.ico new file mode 100644 index 000000000..a9fdf8034 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/docMap_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_dis.ico new file mode 100644 index 000000000..a34e3da5e Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_off.ico new file mode 100644 index 000000000..993289530 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/dupli_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico new file mode 100644 index 000000000..f19913bb2 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/fileBrowser_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/find_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/find_off.ico new file mode 100644 index 000000000..f0ead4be9 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/find_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/findrep_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/findrep_off.ico new file mode 100644 index 000000000..a34fe4f4d Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/findrep_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/funcList_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/funcList_off.ico new file mode 100644 index 000000000..c147071f3 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/funcList_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/imprim_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/imprim_off.ico new file mode 100644 index 000000000..ff7fac34b Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/imprim_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/indentGuide_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/indentGuide_off.ico new file mode 100644 index 000000000..b857e3ebb Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/indentGuide_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/monitoring_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/monitoring_off.ico new file mode 100644 index 000000000..a8d3899df Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/monitoring_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/new_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/new_off.ico new file mode 100644 index 000000000..0342846d6 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/new_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/open_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/open_off.ico new file mode 100644 index 000000000..55e5a028d Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/open_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_dis.ico new file mode 100644 index 000000000..cd50b6c95 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_off.ico new file mode 100644 index 000000000..3d7bba3b3 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/paste_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_dis.ico new file mode 100644 index 000000000..5e61b7a98 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_dis.ico new file mode 100644 index 000000000..9bbede56b Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_off.ico new file mode 100644 index 000000000..712510ffc Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_m_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_off.ico new file mode 100644 index 000000000..3f972e470 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/playrecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_dis.ico new file mode 100644 index 000000000..51ae0a23d Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_off.ico new file mode 100644 index 000000000..0165762a3 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/redo_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_dis.ico new file mode 100644 index 000000000..eb5e7eb26 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_off.ico new file mode 100644 index 000000000..10a0ef3a9 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/save_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_dis.ico new file mode 100644 index 000000000..54966f435 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_off.ico new file mode 100644 index 000000000..deb6c7d74 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saveall_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_dis.ico new file mode 100644 index 000000000..6b4107a95 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_off.ico new file mode 100644 index 000000000..06703d32b Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/saverecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_dis.ico new file mode 100644 index 000000000..9b87baf77 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_off.ico new file mode 100644 index 000000000..329bde1eb Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/startrecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_dis.ico new file mode 100644 index 000000000..6938aff53 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_off.ico new file mode 100644 index 000000000..2cfa8e8fc Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/stoprecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/supp_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/supp_off.ico new file mode 100644 index 000000000..ad3784a17 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/supp_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/suppall_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/suppall_off.ico new file mode 100644 index 000000000..3dd8f3cf7 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/suppall_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_dis.ico new file mode 100644 index 000000000..98a7a9f3f Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_off.ico new file mode 100644 index 000000000..2bf8957c0 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncH_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_dis.ico new file mode 100644 index 000000000..d80e0b2bf Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_off.ico new file mode 100644 index 000000000..3f44b1766 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/syncV_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_dis.ico new file mode 100644 index 000000000..daf0713a9 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_off.ico new file mode 100644 index 000000000..2f87cae34 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/undo_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/userDefineDlg_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/userDefineDlg_off.ico new file mode 100644 index 000000000..7d6d11e54 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/userDefineDlg_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/wrap_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/wrap_off.ico new file mode 100644 index 000000000..27a0c0598 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/wrap_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomIn_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomIn_off.ico new file mode 100644 index 000000000..4a109fa95 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomIn_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomOut_off.ico b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomOut_off.ico new file mode 100644 index 000000000..c24fe0a63 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/FluentUI/zoomOut_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/allChars_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/allChars_off.ico new file mode 100644 index 000000000..614a8f331 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/allChars_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_dis.ico new file mode 100644 index 000000000..bed42f331 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_off.ico new file mode 100644 index 000000000..7c670a538 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/cut_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docMap_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docMap_off.ico new file mode 100644 index 000000000..a5081f513 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docMap_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_dis.ico new file mode 100644 index 000000000..405391e83 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_off.ico new file mode 100644 index 000000000..b6471435c Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/dupli_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico new file mode 100644 index 000000000..f16e35e34 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/fileBrowser_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/find_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/find_off.ico new file mode 100644 index 000000000..6b114c2cf Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/find_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/findrep_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/findrep_off.ico new file mode 100644 index 000000000..87373c566 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/findrep_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/funcList_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/funcList_off.ico new file mode 100644 index 000000000..ec9daba39 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/funcList_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/imprim_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/imprim_off.ico new file mode 100644 index 000000000..926458d6b Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/imprim_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/indentGuide_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/indentGuide_off.ico new file mode 100644 index 000000000..48caae7c9 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/indentGuide_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico new file mode 100644 index 000000000..0c6086369 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/monitoring_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/new_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/new_off.ico new file mode 100644 index 000000000..867f283f9 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/new_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/open_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/open_off.ico new file mode 100644 index 000000000..7f106b376 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/open_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_dis.ico new file mode 100644 index 000000000..a5475fcad Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_off.ico new file mode 100644 index 000000000..c6580b25e Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/paste_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_dis.ico new file mode 100644 index 000000000..1a75072c3 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_dis.ico new file mode 100644 index 000000000..824f0b2e8 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_off.ico new file mode 100644 index 000000000..9891ce7c3 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_m_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_off.ico new file mode 100644 index 000000000..68e1d17ef Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/playrecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_dis.ico new file mode 100644 index 000000000..f37dc6f41 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_off.ico new file mode 100644 index 000000000..385e9c6de Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/redo_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_dis.ico new file mode 100644 index 000000000..cad5b5b5f Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_off.ico new file mode 100644 index 000000000..4ca94abbd Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/save_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_dis.ico new file mode 100644 index 000000000..d6d930c67 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_off.ico new file mode 100644 index 000000000..8ec134f95 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saveall_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_dis.ico new file mode 100644 index 000000000..dcf7df2a6 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_off.ico new file mode 100644 index 000000000..dbbd796d6 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/saverecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_dis.ico new file mode 100644 index 000000000..9b87baf77 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_off.ico new file mode 100644 index 000000000..7d4c3a94b Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/startrecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_dis.ico new file mode 100644 index 000000000..023c3b747 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_off.ico new file mode 100644 index 000000000..ca2ad9672 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/stoprecord_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/supp_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/supp_off.ico new file mode 100644 index 000000000..4f813bc0a Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/supp_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/suppall_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/suppall_off.ico new file mode 100644 index 000000000..d38320071 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/suppall_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico new file mode 100644 index 000000000..6dc2a16ef Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_off.ico new file mode 100644 index 000000000..600acfb3a Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncH_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_dis.ico new file mode 100644 index 000000000..12d12850f Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_off.ico new file mode 100644 index 000000000..32d1f90c4 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/syncV_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_dis.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_dis.ico new file mode 100644 index 000000000..20f2b0eaa Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_dis.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_off.ico new file mode 100644 index 000000000..97d86ca33 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/undo_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico new file mode 100644 index 000000000..5c12fc0f6 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/userDefineDlg_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/wrap_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/wrap_off.ico new file mode 100644 index 000000000..ebc3b0afe Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/wrap_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomIn_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomIn_off.ico new file mode 100644 index 000000000..d0527f7f5 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomIn_off.ico differ diff --git a/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomOut_off.ico b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomOut_off.ico new file mode 100644 index 000000000..44ae2b138 Binary files /dev/null and b/PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/zoomOut_off.ico differ diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index b5b3f11e4..96ebe8995 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -43,101 +43,198 @@ // // TOOLBAR ICO - set 1 // -#define IDI_NEW_ICON 201 -#define IDI_OPEN_ICON 202 -#define IDI_CLOSE_ICON 203 -#define IDI_CLOSEALL_ICON 204 -#define IDI_SAVE_ICON 205 -#define IDI_SAVEALL_ICON 206 -#define IDI_CUT_ICON 207 -#define IDI_COPY_ICON 208 -#define IDI_PASTE_ICON 209 -#define IDI_UNDO_ICON 210 -#define IDI_REDO_ICON 211 -#define IDI_FIND_ICON 212 -#define IDI_REPLACE_ICON 213 -#define IDI_ZOOMIN_ICON 214 -#define IDI_ZOOMOUT_ICON 215 -#define IDI_VIEW_UD_DLG_ICON 216 -#define IDI_PRINT_ICON 217 -#define IDI_STARTRECORD_ICON 218 -#define IDI_STARTRECORD_DISABLE_ICON 219 -#define IDI_STOPRECORD_ICON 220 -#define IDI_STOPRECORD_DISABLE_ICON 221 -#define IDI_PLAYRECORD_ICON 222 -#define IDI_PLAYRECORD_DISABLE_ICON 223 -#define IDI_SAVERECORD_ICON 224 -#define IDI_SAVERECORD_DISABLE_ICON 225 -#define IDI_MMPLAY_DIS_ICON 226 -#define IDI_MMPLAY_ICON 227 -#define IDI_VIEW_ALL_CHAR_ICON 228 -#define IDI_VIEW_INDENT_ICON 229 -#define IDI_VIEW_WRAP_ICON 230 -#define IDI_SAVE_DISABLE_ICON 231 -#define IDI_SAVEALL_DISABLE_ICON 232 -#define IDI_CUT_DISABLE_ICON 233 -#define IDI_COPY_DISABLE_ICON 234 -#define IDI_PASTE_DISABLE_ICON 235 -#define IDI_UNDO_DISABLE_ICON 236 -#define IDI_REDO_DISABLE_ICON 237 -#define IDI_SYNCV_ICON 238 -#define IDI_SYNCV_DISABLE_ICON 239 -#define IDI_SYNCH_ICON 240 -#define IDI_SYNCH_DISABLE_ICON 241 -#define IDI_VIEW_DOC_MAP_ICON 242 -#define IDI_VIEW_FILEBROWSER_ICON 243 -#define IDI_VIEW_FUNCLIST_ICON 244 -#define IDI_VIEW_MONITORING_ICON 245 +#define IDI_NEW_ICON 201 +#define IDI_OPEN_ICON 202 +#define IDI_CLOSE_ICON 203 +#define IDI_CLOSEALL_ICON 204 +#define IDI_SAVE_ICON 205 +#define IDI_SAVEALL_ICON 206 +#define IDI_CUT_ICON 207 +#define IDI_COPY_ICON 208 +#define IDI_PASTE_ICON 209 +#define IDI_UNDO_ICON 210 +#define IDI_REDO_ICON 211 +#define IDI_FIND_ICON 212 +#define IDI_REPLACE_ICON 213 +#define IDI_ZOOMIN_ICON 214 +#define IDI_ZOOMOUT_ICON 215 +#define IDI_VIEW_UD_DLG_ICON 216 +#define IDI_PRINT_ICON 217 +#define IDI_STARTRECORD_ICON 218 +#define IDI_STARTRECORD_DISABLE_ICON 219 +#define IDI_STOPRECORD_ICON 220 +#define IDI_STOPRECORD_DISABLE_ICON 221 +#define IDI_PLAYRECORD_ICON 222 +#define IDI_PLAYRECORD_DISABLE_ICON 223 +#define IDI_SAVERECORD_ICON 224 +#define IDI_SAVERECORD_DISABLE_ICON 225 +#define IDI_MMPLAY_DIS_ICON 226 +#define IDI_MMPLAY_ICON 227 +#define IDI_VIEW_ALL_CHAR_ICON 228 +#define IDI_VIEW_INDENT_ICON 229 +#define IDI_VIEW_WRAP_ICON 230 +#define IDI_SAVE_DISABLE_ICON 231 +#define IDI_SAVEALL_DISABLE_ICON 232 +#define IDI_CUT_DISABLE_ICON 233 +#define IDI_COPY_DISABLE_ICON 234 +#define IDI_PASTE_DISABLE_ICON 235 +#define IDI_UNDO_DISABLE_ICON 236 +#define IDI_REDO_DISABLE_ICON 237 +#define IDI_SYNCV_ICON 238 +#define IDI_SYNCV_DISABLE_ICON 239 +#define IDI_SYNCH_ICON 240 +#define IDI_SYNCH_DISABLE_ICON 241 +#define IDI_VIEW_DOC_MAP_ICON 242 +#define IDI_VIEW_FILEBROWSER_ICON 243 +#define IDI_VIEW_FUNCLIST_ICON 244 +#define IDI_VIEW_MONITORING_ICON 245 + +// +// TOOLBAR ICO - set 1, Dark Mode +// +#define IDI_NEW_ICON_DM 246 +#define IDI_OPEN_ICON_DM 247 +#define IDI_CLOSE_ICON_DM 248 +#define IDI_CLOSEALL_ICON_DM 249 +#define IDI_SAVE_ICON_DM 250 +#define IDI_SAVEALL_ICON_DM 251 +#define IDI_CUT_ICON_DM 252 +#define IDI_COPY_ICON_DM 253 +#define IDI_PASTE_ICON_DM 254 +#define IDI_UNDO_ICON_DM 255 +#define IDI_REDO_ICON_DM 256 +#define IDI_FIND_ICON_DM 257 +#define IDI_REPLACE_ICON_DM 258 +#define IDI_ZOOMIN_ICON_DM 259 +#define IDI_ZOOMOUT_ICON_DM 260 +#define IDI_VIEW_UD_DLG_ICON_DM 261 +#define IDI_PRINT_ICON_DM 262 +#define IDI_STARTRECORD_ICON_DM 263 +#define IDI_STARTRECORD_DISABLE_ICON_DM 264 +#define IDI_STOPRECORD_ICON_DM 265 +#define IDI_STOPRECORD_DISABLE_ICON_DM 266 +#define IDI_PLAYRECORD_ICON_DM 267 +#define IDI_PLAYRECORD_DISABLE_ICON_DM 268 +#define IDI_SAVERECORD_ICON_DM 269 +#define IDI_SAVERECORD_DISABLE_ICON_DM 270 +#define IDI_MMPLAY_DIS_ICON_DM 271 +#define IDI_MMPLAY_ICON_DM 272 +#define IDI_VIEW_ALL_CHAR_ICON_DM 273 +#define IDI_VIEW_INDENT_ICON_DM 274 +#define IDI_VIEW_WRAP_ICON_DM 275 +#define IDI_SAVE_DISABLE_ICON_DM 276 +#define IDI_SAVEALL_DISABLE_ICON_DM 277 +#define IDI_CUT_DISABLE_ICON_DM 278 +#define IDI_COPY_DISABLE_ICON_DM 279 +#define IDI_PASTE_DISABLE_ICON_DM 280 +#define IDI_UNDO_DISABLE_ICON_DM 281 +#define IDI_REDO_DISABLE_ICON_DM 282 +#define IDI_SYNCV_ICON_DM 283 +#define IDI_SYNCV_DISABLE_ICON_DM 284 +#define IDI_SYNCH_ICON_DM 285 +#define IDI_SYNCH_DISABLE_ICON_DM 286 +#define IDI_VIEW_DOC_MAP_ICON_DM 287 +#define IDI_VIEW_FILEBROWSER_ICON_DM 288 +#define IDI_VIEW_FUNCLIST_ICON_DM 289 +#define IDI_VIEW_MONITORING_ICON_DM 290 // // TOOLBAR ICO - set 2 // -#define IDI_NEW_ICON2 301 -#define IDI_OPEN_ICON2 302 -#define IDI_CLOSE_ICON2 303 -#define IDI_CLOSEALL_ICON2 304 -#define IDI_SAVE_ICON2 305 -#define IDI_SAVEALL_ICON2 306 -#define IDI_CUT_ICON2 307 -#define IDI_COPY_ICON2 308 -#define IDI_PASTE_ICON2 309 -#define IDI_UNDO_ICON2 310 -#define IDI_REDO_ICON2 311 -#define IDI_FIND_ICON2 312 -#define IDI_REPLACE_ICON2 313 -#define IDI_ZOOMIN_ICON2 314 -#define IDI_ZOOMOUT_ICON2 315 -#define IDI_VIEW_UD_DLG_ICON2 316 -#define IDI_PRINT_ICON2 317 -#define IDI_STARTRECORD_ICON2 318 -#define IDI_STARTRECORD_DISABLE_ICON2 319 -#define IDI_STOPRECORD_ICON2 320 -#define IDI_STOPRECORD_DISABLE_ICON2 321 -#define IDI_PLAYRECORD_ICON2 322 -#define IDI_PLAYRECORD_DISABLE_ICON2 323 -#define IDI_SAVERECORD_ICON2 324 -#define IDI_SAVERECORD_DISABLE_ICON2 325 -#define IDI_MMPLAY_DIS_ICON2 326 -#define IDI_MMPLAY_ICON2 327 -#define IDI_VIEW_ALL_CHAR_ICON2 328 -#define IDI_VIEW_INDENT_ICON2 329 -#define IDI_VIEW_WRAP_ICON2 330 -#define IDI_SAVE_DISABLE_ICON2 331 -#define IDI_SAVEALL_DISABLE_ICON2 332 -#define IDI_CUT_DISABLE_ICON2 333 -#define IDI_COPY_DISABLE_ICON2 334 -#define IDI_PASTE_DISABLE_ICON2 335 -#define IDI_UNDO_DISABLE_ICON2 336 -#define IDI_REDO_DISABLE_ICON2 337 -#define IDI_SYNCV_ICON2 338 -#define IDI_SYNCV_DISABLE_ICON2 339 -#define IDI_SYNCH_ICON2 340 -#define IDI_SYNCH_DISABLE_ICON2 341 -#define IDI_VIEW_DOC_MAP_ICON2 342 -#define IDI_VIEW_FILEBROWSER_ICON2 343 -#define IDI_VIEW_FUNCLIST_ICON2 344 -#define IDI_VIEW_MONITORING_ICON2 345 +#define IDI_NEW_ICON2 301 +#define IDI_OPEN_ICON2 302 +#define IDI_CLOSE_ICON2 303 +#define IDI_CLOSEALL_ICON2 304 +#define IDI_SAVE_ICON2 305 +#define IDI_SAVEALL_ICON2 306 +#define IDI_CUT_ICON2 307 +#define IDI_COPY_ICON2 308 +#define IDI_PASTE_ICON2 309 +#define IDI_UNDO_ICON2 310 +#define IDI_REDO_ICON2 311 +#define IDI_FIND_ICON2 312 +#define IDI_REPLACE_ICON2 313 +#define IDI_ZOOMIN_ICON2 314 +#define IDI_ZOOMOUT_ICON2 315 +#define IDI_VIEW_UD_DLG_ICON2 316 +#define IDI_PRINT_ICON2 317 +#define IDI_STARTRECORD_ICON2 318 +#define IDI_STARTRECORD_DISABLE_ICON2 319 +#define IDI_STOPRECORD_ICON2 320 +#define IDI_STOPRECORD_DISABLE_ICON2 321 +#define IDI_PLAYRECORD_ICON2 322 +#define IDI_PLAYRECORD_DISABLE_ICON2 323 +#define IDI_SAVERECORD_ICON2 324 +#define IDI_SAVERECORD_DISABLE_ICON2 325 +#define IDI_MMPLAY_DIS_ICON2 326 +#define IDI_MMPLAY_ICON2 327 +#define IDI_VIEW_ALL_CHAR_ICON2 328 +#define IDI_VIEW_INDENT_ICON2 329 +#define IDI_VIEW_WRAP_ICON2 330 +#define IDI_SAVE_DISABLE_ICON2 331 +#define IDI_SAVEALL_DISABLE_ICON2 332 +#define IDI_CUT_DISABLE_ICON2 333 +#define IDI_COPY_DISABLE_ICON2 334 +#define IDI_PASTE_DISABLE_ICON2 335 +#define IDI_UNDO_DISABLE_ICON2 336 +#define IDI_REDO_DISABLE_ICON2 337 +#define IDI_SYNCV_ICON2 338 +#define IDI_SYNCV_DISABLE_ICON2 339 +#define IDI_SYNCH_ICON2 340 +#define IDI_SYNCH_DISABLE_ICON2 341 +#define IDI_VIEW_DOC_MAP_ICON2 342 +#define IDI_VIEW_FILEBROWSER_ICON2 343 +#define IDI_VIEW_FUNCLIST_ICON2 344 +#define IDI_VIEW_MONITORING_ICON2 345 +// +// TOOLBAR ICO - set 2, Dark Mode +// +#define IDI_NEW_ICON_DM2 346 +#define IDI_OPEN_ICON_DM2 347 +#define IDI_CLOSE_ICON_DM2 348 +#define IDI_CLOSEALL_ICON_DM2 349 +#define IDI_SAVE_ICON_DM2 350 +#define IDI_SAVEALL_ICON_DM2 351 +#define IDI_CUT_ICON_DM2 352 +#define IDI_COPY_ICON_DM2 353 +#define IDI_PASTE_ICON_DM2 354 +#define IDI_UNDO_ICON_DM2 355 +#define IDI_REDO_ICON_DM2 356 +#define IDI_FIND_ICON_DM2 357 +#define IDI_REPLACE_ICON_DM2 358 +#define IDI_ZOOMIN_ICON_DM2 359 +#define IDI_ZOOMOUT_ICON_DM2 360 +#define IDI_VIEW_UD_DLG_ICON_DM2 361 +#define IDI_PRINT_ICON_DM2 362 +#define IDI_STARTRECORD_ICON_DM2 363 +#define IDI_STARTRECORD_DISABLE_ICON_DM2 364 +#define IDI_STOPRECORD_ICON_DM2 365 +#define IDI_STOPRECORD_DISABLE_ICON_DM2 366 +#define IDI_PLAYRECORD_ICON_DM2 367 +#define IDI_PLAYRECORD_DISABLE_ICON_DM2 368 +#define IDI_SAVERECORD_ICON_DM2 369 +#define IDI_SAVERECORD_DISABLE_ICON_DM2 370 +#define IDI_MMPLAY_DIS_ICON_DM2 371 +#define IDI_MMPLAY_ICON_DM2 372 +#define IDI_VIEW_ALL_CHAR_ICON_DM2 373 +#define IDI_VIEW_INDENT_ICON_DM2 374 +#define IDI_VIEW_WRAP_ICON_DM2 375 +#define IDI_SAVE_DISABLE_ICON_DM2 376 +#define IDI_SAVEALL_DISABLE_ICON_DM2 377 +#define IDI_CUT_DISABLE_ICON_DM2 378 +#define IDI_COPY_DISABLE_ICON_DM2 379 +#define IDI_PASTE_DISABLE_ICON_DM2 380 +#define IDI_UNDO_DISABLE_ICON_DM2 381 +#define IDI_REDO_DISABLE_ICON_DM2 382 +#define IDI_SYNCV_ICON_DM2 383 +#define IDI_SYNCV_DISABLE_ICON_DM2 384 +#define IDI_SYNCH_ICON_DM2 385 +#define IDI_SYNCH_DISABLE_ICON_DM2 386 +#define IDI_VIEW_DOC_MAP_ICON_DM2 387 +#define IDI_VIEW_FILEBROWSER_ICON_DM2 388 +#define IDI_VIEW_FUNCLIST_ICON_DM2 389 +#define IDI_VIEW_MONITORING_ICON_DM2 390 @@ -149,7 +246,10 @@ #define IDI_SAVED_ALT_ICON 506 #define IDI_UNSAVED_ALT_ICON 507 #define IDI_READONLY_ALT_ICON 508 - +#define IDI_SAVED_DM_ICON 509 +#define IDI_UNSAVED_DM_ICON 510 +#define IDI_MONITORING_DM_ICON 511 +#define IDI_READONLY_DM_ICON 512 #define IDI_DELETE_ICON 525 @@ -232,6 +332,10 @@ #define IDR_DOCSWITCHER_ICO 1539 #define IDR_FILEBROWSER_ICO 1540 #define IDR_FILEMONITORING 1541 +#define IDR_CLOSETAB_DM 1542 +#define IDR_CLOSETAB_INACT_DM 1543 +#define IDR_CLOSETAB_HOVER_DM 1544 +#define IDR_CLOSETAB_PUSH_DM 1545 #define ID_MACRO 20000 #define ID_MACRO_LIMIT 20200