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

Update some dark/light icons for panels 

1. Add panels' toolbar icons in both dark/light mode for Folder as Workspace panel and function list panel.
2. Add panels' dark/light mode (Fluent UI style) icons for the tab interface.
3. Update doclist icons.
4. Remove not used icon.

Note that these icons cannot be changed dynamically yet while switching between light mode & dark mode.

Fix #10066
This commit is contained in:
Don Ho 2021-07-27 20:21:07 +02:00
parent a8a802df2c
commit 5edc7500e9
34 changed files with 197 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
PowerEditor/src/Notepad_plus.cpp
View File

@ -149,7 +149,7 @@ Notepad_plus::Notepad_plus()
// Determine if user is administrator.
BOOL is_admin;
winVer ver = NppParameters::getInstance().getWinVersion();
winVer ver = nppParam.getWinVersion();
if (ver >= WV_VISTA || ver == WV_UNKNOWN)
{
SID_IDENTIFIER_AUTHORITY NtAuthority = SECURITY_NT_AUTHORITY;
@ -759,7 +759,8 @@ void Notepad_plus::killAllChildren()
bool Notepad_plus::saveGUIParams()
{
NppGUI & nppGUI = (NppParameters::getInstance()).getNppGUI();
NppParameters& nppParams = NppParameters::getInstance();
NppGUI & nppGUI = nppParams.getNppGUI();
nppGUI._toolbarShow = _rebarTop.getIDVisible(REBAR_BAR_TOOLBAR);
nppGUI._toolBarStatus = _toolBar.getState();
@ -802,28 +803,30 @@ bool Notepad_plus::saveGUIParams()
}
saveDockingParams();
(NppParameters::getInstance()).createXmlTreeFromGUIParams();
nppParams.createXmlTreeFromGUIParams();
return true;
}
bool Notepad_plus::saveProjectPanelsParams()
{
NppParameters& nppParams = NppParameters::getInstance();
if (_pProjectPanel_1)
{
if (!_pProjectPanel_1->checkIfNeedSave()) return false;
(NppParameters::getInstance()).setWorkSpaceFilePath(0, _pProjectPanel_1->getWorkSpaceFilePath());
nppParams.setWorkSpaceFilePath(0, _pProjectPanel_1->getWorkSpaceFilePath());
}
if (_pProjectPanel_2)
{
if (!_pProjectPanel_2->checkIfNeedSave()) return false;
(NppParameters::getInstance()).setWorkSpaceFilePath(1, _pProjectPanel_2->getWorkSpaceFilePath());
nppParams.setWorkSpaceFilePath(1, _pProjectPanel_2->getWorkSpaceFilePath());
}
if (_pProjectPanel_3)
{
if (!_pProjectPanel_3->checkIfNeedSave()) return false;
(NppParameters::getInstance()).setWorkSpaceFilePath(2, _pProjectPanel_3->getWorkSpaceFilePath());
nppParams.setWorkSpaceFilePath(2, _pProjectPanel_3->getWorkSpaceFilePath());
}
return (NppParameters::getInstance()).writeProjectPanelsSettings();
return nppParams.writeProjectPanelsSettings();
}
bool Notepad_plus::saveFileBrowserParam()
@ -2332,10 +2335,11 @@ void Notepad_plus::checkLangsMenu(int id) const
generic_string Notepad_plus::getLangDesc(LangType langType, bool getName)
{
NppParameters& nppParams = NppParameters::getInstance();
if ((langType >= L_EXTERNAL) && (langType < NppParameters::getInstance().L_END))
if ((langType >= L_EXTERNAL) && (langType < nppParams.L_END))
{
ExternalLangContainer & elc = NppParameters::getInstance().getELCFromIndex(langType - L_EXTERNAL);
ExternalLangContainer & elc = nppParams.getELCFromIndex(langType - L_EXTERNAL);
if (getName)
return generic_string(elc._name);
else
@ -3461,7 +3465,8 @@ LangType Notepad_plus::menuID2LangType(int cmdID)
void Notepad_plus::setTitle()
{
const NppGUI & nppGUI = NppParameters::getInstance().getNppGUI();
NppParameters& nppParams = NppParameters::getInstance();
const NppGUI & nppGUI = nppParams.getNppGUI();
//Get the buffer
Buffer * buf = _pEditView->getCurrentBuffer();
@ -3485,7 +3490,7 @@ void Notepad_plus::setTitle()
if (_isAdministrator)
result += TEXT(" [Administrator]");
generic_string tbAdd = (NppParameters::getInstance()).getTitleBarAdd();
generic_string tbAdd = nppParams.getTitleBarAdd();
if (!tbAdd.empty())
{
result += TEXT(" - ");
@ -4334,7 +4339,8 @@ void Notepad_plus::docGotoAnotherEditView(FileTransferMode mode)
bool Notepad_plus::activateBuffer(BufferID id, int whichOne)
{
bool isSnapshotMode = NppParameters::getInstance().getNppGUI().isSnapshotMode();
NppGUI& nppGui = NppParameters::getInstance().getNppGUI();
bool isSnapshotMode = nppGui.isSnapshotMode();
if (isSnapshotMode)
{
// Before switching off, synchronize backup file
@ -4377,7 +4383,7 @@ bool Notepad_plus::activateBuffer(BufferID id, int whichOne)
notifyBufferActivated(id, whichOne);
bool isCurrBuffDetection = (NppParameters::getInstance().getNppGUI()._fileAutoDetection & cdEnabledNew) ? true : false;
bool isCurrBuffDetection = (nppGui._fileAutoDetection & cdEnabledNew) ? true : false;
if (!reload && isCurrBuffDetection)
{
// Buffer has been activated, now check for file modification
@ -6037,7 +6043,7 @@ std::vector<generic_string> Notepad_plus::loadCommandlineParams(const TCHAR * co
if (pCmdParams->_isSessionFile && fnss.size() == 1)
{
Session session2Load;
if ((NppParameters::getInstance()).loadSession(session2Load, fnss.getFileName(0)))
if (nppParams.loadSession(session2Load, fnss.getFileName(0)))
{
const bool isSnapshotMode = false;
const bool shouldLoadFileBrowser = true;
@ -6153,7 +6159,7 @@ void Notepad_plus::setFindReplaceFolderFilter(const TCHAR *dir, const TCHAR *fil
}
else
{
ext = NppParameters::getInstance().getLangExtFromLangType(lt);
ext = nppParam.getLangExtFromLangType(lt);
}
if (ext && ext[0])
@ -6498,13 +6504,14 @@ bool Notepad_plus::reloadLang()
void Notepad_plus::launchClipboardHistoryPanel()
{
NppParameters& nppParams = NppParameters::getInstance();
if (!_pClipboardHistoryPanel)
{
_pClipboardHistoryPanel = new ClipboardHistoryPanel();
_pClipboardHistoryPanel->init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), &_pEditView);
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParams.getNativeLangSpeaker();
bool isRTL = pNativeSpeaker->isRTL();
tTbData data = {0};
_pClipboardHistoryPanel->create(&data, isRTL);
@ -6512,7 +6519,14 @@ void Notepad_plus::launchClipboardHistoryPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pClipboardHistoryPanel->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_CLIPBOARDPANEL_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
int icoID = IDR_CLIPBOARDPANEL_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_CLIPBOARDPANEL_ICO_DM;
else if (nppParams.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_CLIPBOARDPANEL_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -6529,8 +6543,8 @@ void Notepad_plus::launchClipboardHistoryPanel()
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
COLORREF fgColor = (NppParameters::getInstance()).getCurrentDefaultFgColor();
COLORREF bgColor = (NppParameters::getInstance()).getCurrentDefaultBgColor();
COLORREF fgColor = nppParams.getCurrentDefaultFgColor();
COLORREF bgColor = nppParams.getCurrentDefaultBgColor();
_pClipboardHistoryPanel->setBackgroundColor(bgColor);
_pClipboardHistoryPanel->setForegroundColor(fgColor);
@ -6544,10 +6558,12 @@ void Notepad_plus::launchDocumentListPanel()
{
if (!_pDocumentListPanel)
{
NppParameters& nppParams = NppParameters::getInstance();
_pDocumentListPanel = new VerticalFileSwitcher;
HIMAGELIST hImgLst = _docTabIconList.getHandle();
_pDocumentListPanel->init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), hImgLst);
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParams.getNativeLangSpeaker();
bool isRTL = pNativeSpeaker->isRTL();
tTbData data = {0};
_pDocumentListPanel->create(&data, isRTL);
@ -6555,7 +6571,14 @@ void Notepad_plus::launchDocumentListPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pDocumentListPanel->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_DOCLIST_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
int icoID = IDR_DOCLIST_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_DOCLIST_ICO_DM;
else if (nppParams.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_DOCLIST_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -6572,8 +6595,8 @@ void Notepad_plus::launchDocumentListPanel()
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
COLORREF fgColor = (NppParameters::getInstance()).getCurrentDefaultFgColor();
COLORREF bgColor = (NppParameters::getInstance()).getCurrentDefaultBgColor();
COLORREF fgColor = nppParams.getCurrentDefaultFgColor();
COLORREF bgColor = nppParams.getCurrentDefaultBgColor();
_pDocumentListPanel->setBackgroundColor(bgColor);
_pDocumentListPanel->setForegroundColor(fgColor);
@ -6588,8 +6611,10 @@ void Notepad_plus::launchAnsiCharPanel()
{
_pAnsiCharPanel = new AnsiCharPanel();
_pAnsiCharPanel->init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), &_pEditView);
NppParameters& nppParams = NppParameters::getInstance();
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParams.getNativeLangSpeaker();
bool isRTL = pNativeSpeaker->isRTL();
tTbData data = {0};
_pAnsiCharPanel->create(&data, isRTL);
@ -6597,7 +6622,14 @@ void Notepad_plus::launchAnsiCharPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pAnsiCharPanel->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_ASCIIPANEL_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
int icoID = IDR_ASCIIPANEL_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_ASCIIPANEL_ICO_DM;
else if (nppParams.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_ASCIIPANEL_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -6614,8 +6646,8 @@ void Notepad_plus::launchAnsiCharPanel()
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
COLORREF fgColor = (NppParameters::getInstance()).getCurrentDefaultFgColor();
COLORREF bgColor = (NppParameters::getInstance()).getCurrentDefaultBgColor();
COLORREF fgColor = nppParams.getCurrentDefaultFgColor();
COLORREF bgColor = nppParams.getCurrentDefaultBgColor();
_pAnsiCharPanel->setBackgroundColor(bgColor);
_pAnsiCharPanel->setForegroundColor(fgColor);
@ -6636,10 +6668,19 @@ void Notepad_plus::launchFileBrowser(const vector<generic_string> & folders, con
_pFileBrowser->create(&data, _nativeLangSpeaker.isRTL());
data.pszName = TEXT("ST");
NppParameters& nppParams = NppParameters::getInstance();
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pFileBrowser->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_FILEBROWSER_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
int icoID = IDR_FILEBROWSER_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_FILEBROWSER_ICO_DM;
else if (nppParams.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_FILEBROWSER_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -6647,7 +6688,7 @@ void Notepad_plus::launchFileBrowser(const vector<generic_string> & folders, con
// In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog
data.dlgID = IDM_VIEW_FILEBROWSER;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParams.getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getAttrNameStr(FB_PANELTITLE, FOLDERASWORKSPACE_NODE, "PanelTitle");
static TCHAR title[32];
@ -6658,8 +6699,8 @@ void Notepad_plus::launchFileBrowser(const vector<generic_string> & folders, con
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
COLORREF fgColor = (NppParameters::getInstance()).getCurrentDefaultFgColor();
COLORREF bgColor = (NppParameters::getInstance()).getCurrentDefaultBgColor();
COLORREF fgColor = nppParams.getCurrentDefaultFgColor();
COLORREF bgColor = nppParams.getCurrentDefaultBgColor();
_pFileBrowser->setBackgroundColor(bgColor);
_pFileBrowser->setForegroundColor(fgColor);
@ -6730,7 +6771,7 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
(*pProjPanel) = new ProjectPanel;
(*pProjPanel)->init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), panelID);
(*pProjPanel)->setWorkSpaceFilePath(nppParam.getWorkSpaceFilePath(panelID));
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker();
bool isRTL = pNativeSpeaker->isRTL();
tTbData data;
memset(&data, 0, sizeof(data));
@ -6740,7 +6781,14 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>((*pProjPanel)->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_PROJECTPANEL_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
int icoID = IDR_PROJECTPANEL_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_PROJECTPANEL_ICO_DM;
else if (nppParam.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_PROJECTPANEL_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -6754,8 +6802,8 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
data.pszName = (*pProjPanel)->getPanelTitle();
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
COLORREF fgColor = (NppParameters::getInstance()).getCurrentDefaultFgColor();
COLORREF bgColor = (NppParameters::getInstance()).getCurrentDefaultBgColor();
COLORREF fgColor = nppParam.getCurrentDefaultFgColor();
COLORREF bgColor = nppParam.getCurrentDefaultBgColor();
(*pProjPanel)->setBackgroundColor(bgColor);
(*pProjPanel)->setForegroundColor(fgColor);
@ -6774,7 +6822,8 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
void Notepad_plus::launchDocMap()
{
if (!(NppParameters::getInstance()).isTransparentAvailable())
NppParameters& nppParam = NppParameters::getInstance();
if (!nppParam.isTransparentAvailable())
{
_nativeLangSpeaker.messageBox("PrehistoricSystemDetected",
_pPublicInterface->getHSelf(),
@ -6796,7 +6845,14 @@ void Notepad_plus::launchDocMap()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pDocMap->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_DOCMAP_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
int icoID = IDR_DOCMAP_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_DOCMAP_ICO_DM;
else if (nppParam.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_DOCMAP_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
@ -6804,7 +6860,7 @@ void Notepad_plus::launchDocMap()
// In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog
data.dlgID = IDM_VIEW_DOC_MAP;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getAttrNameStr(DM_PANELTITLE, "DocumentMap", "PanelTitle");
static TCHAR title[32];
if (title_temp.length() < 32)
@ -6836,14 +6892,24 @@ void Notepad_plus::launchFunctionList()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, reinterpret_cast<LPARAM>(_pFuncList->getHSelf()));
// define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_FUNC_LIST_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
NppParameters& nppParam = NppParameters::getInstance();
int icoID = IDR_FUNC_LIST_ICO;
if (NppDarkMode::isEnabled())
icoID = IDR_FUNC_LIST_ICO_DM;
else if (nppParam.getNppGUI()._toolBarStatus != TB_STANDARD)
icoID = IDR_FUNC_LIST_ICO2;
data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(icoID), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is
// in this case is DOCKABLE_DEMO_INDEX
// In the case of Notepad++ internal function, it'll be the command ID which triggers this dialog
data.dlgID = IDM_VIEW_FUNC_LIST;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParam.getNativeLangSpeaker();
generic_string title_temp = pNativeSpeaker->getAttrNameStr(FL_PANELTITLE, FL_FUCTIONLISTROOTNODE, "PanelTitle");
static TCHAR title[32];
@ -6854,8 +6920,8 @@ void Notepad_plus::launchFunctionList()
}
::SendMessage(_pPublicInterface->getHSelf(), NPPM_DMMREGASDCKDLG, 0, reinterpret_cast<LPARAM>(&data));
COLORREF fgColor = (NppParameters::getInstance()).getCurrentDefaultFgColor();
COLORREF bgColor = (NppParameters::getInstance()).getCurrentDefaultBgColor();
COLORREF fgColor = nppParam.getCurrentDefaultFgColor();
COLORREF bgColor = nppParam.getCurrentDefaultBgColor();
_pFuncList->setBackgroundColor(bgColor);
_pFuncList->setForegroundColor(fgColor);
@ -7512,7 +7578,9 @@ void Notepad_plus::restoreMinimizeDialogs()
void Notepad_plus::refreshDarkMode()
{
SendMessage(_pPublicInterface->getHSelf(), NPPM_SETEDITORBORDEREDGE, 0, NppParameters::getInstance().getSVP()._showBorderEdge);
NppParameters& nppParams = NppParameters::getInstance();
SendMessage(_pPublicInterface->getHSelf(), NPPM_SETEDITORBORDEREDGE, 0, nppParams.getSVP()._showBorderEdge);
if (NppDarkMode::isExperimentalSupported())
{
NppDarkMode::allowDarkModeForApp(NppDarkMode::isEnabled());
@ -7604,8 +7672,6 @@ void Notepad_plus::refreshDarkMode()
break;
}
NppParameters& nppParams = NppParameters::getInstance();
ThemeSwitcher & themeSwitcher = nppParams.getThemeSwitcher();
generic_string themePath;
generic_string themeName;

23
PowerEditor/src/Notepad_plus.rc
View File

@ -323,13 +323,26 @@ IDR_FILEBROWSER BITMAP "icons/fileBrowser.bmp"
IDR_FILEMONITORING BITMAP "icons/fileMonitoring.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_DOCSWITCHER_ICO ICON "icons/docSwitcher.ico"
IDR_ASCIIPANEL_ICO2 ICON "icons/asciiPanel2.ico"
IDR_ASCIIPANEL_ICO_DM ICON "icons/darkMode/panels/asciiPanel.ico"
IDI_PROJECT_WORKSPACE BITMAP "icons/project_work_space.bmp"
@ -345,6 +358,9 @@ IDI_FB_ROOTCLOSE BITMAP "icons/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_FUNCLIST_ROOT BITMAP "icons/project_file.bmp"
IDI_FUNCLIST_NODE BITMAP "icons/funcList_node.bmp"
@ -352,7 +368,10 @@ IDI_FUNCLIST_LEAF BITMAP "icons/funcList_leaf.bmp"
IDI_FUNCLIST_SORTBUTTON BITMAP "icons/funclstSort.bmp"
IDI_FUNCLIST_RELOADBUTTON BITMAP "icons/funclstReload.bmp"
IDI_FUNCLIST_SORTBUTTON2 BITMAP "icons/funclstSort2.bmp"
IDI_FUNCLIST_RELOADBUTTON2 BITMAP "icons/funclstReload2.bmp"
IDI_FUNCLIST_SORTBUTTON_DM BITMAP "icons/darkMode/panels/funclstSort.bmp"
IDI_FUNCLIST_RELOADBUTTON_DM BITMAP "icons/darkMode/panels/funclstReload.bmp"
IDI_GET_INFO_FROM_TOOLTIP ICON "icons/MoreOnTooltip.ico"

8
PowerEditor/src/WinControls/FileBrowser/fileBrowser.cpp
View File

@ -111,11 +111,11 @@ INT_PTR CALLBACK FileBrowser::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
TBBUTTON tbButtons[3];
// Add the bmap image into toolbar's imagelist
TBADDBITMAP addbmp = { _hInst, 0 };
addbmp.nID = IDI_FB_SELECTCURRENTFILE;
addbmp.nID = NppDarkMode::isEnabled() ? IDI_FB_SELECTCURRENTFILE_DM : IDI_FB_SELECTCURRENTFILE;
::SendMessage(_hToolbarMenu, TB_ADDBITMAP, 1, reinterpret_cast<LPARAM>(&addbmp));
addbmp.nID = IDI_FB_FOLDALL;
addbmp.nID = NppDarkMode::isEnabled() ? IDI_FB_FOLDALL_DM : IDI_FB_FOLDALL;
::SendMessage(_hToolbarMenu, TB_ADDBITMAP, 1, reinterpret_cast<LPARAM>(&addbmp));
addbmp.nID = IDI_FB_EXPANDALL;
addbmp.nID = NppDarkMode::isEnabled() ? IDI_FB_EXPANDALL_DM : IDI_FB_EXPANDALL;
::SendMessage(_hToolbarMenu, TB_ADDBITMAP, 1, reinterpret_cast<LPARAM>(&addbmp));
tbButtons[0].idCommand = FB_CMD_AIMFILE;
tbButtons[0].iBitmap = 0;
@ -144,6 +144,8 @@ INT_PTR CALLBACK FileBrowser::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
::SendMessage(_hToolbarMenu, TB_SETPADDING, 0, MAKELONG(20, 0));
::SendMessage(_hToolbarMenu, TB_ADDBUTTONS, sizeof(tbButtons) / sizeof(TBBUTTON), reinterpret_cast<LPARAM>(&tbButtons));
::SendMessage(_hToolbarMenu, TB_AUTOSIZE, 0, 0);
::SendMessage(_hToolbarMenu, TB_GETIMAGELIST, 0, 0);
ShowWindow(_hToolbarMenu, SW_SHOW);
FileBrowser::initPopupMenus();

35
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -478,14 +478,15 @@ void FunctionListPanel::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **pp
{
DockingDlgInterface::init(hInst, hPere);
_ppEditView = ppEditView;
NppParameters& nppParams = NppParameters::getInstance();
generic_string funcListXmlPath = (NppParameters::getInstance()).getUserPath();
generic_string funcListXmlPath = nppParams.getUserPath();
PathAppend(funcListXmlPath, TEXT("functionList"));
generic_string funcListDefaultXmlPath = (NppParameters::getInstance()).getNppPath();
generic_string funcListDefaultXmlPath = nppParams.getNppPath();
PathAppend(funcListDefaultXmlPath, TEXT("functionList"));
bool doLocalConf = (NppParameters::getInstance()).isLocal();
bool doLocalConf = nppParams.isLocal();
if (!doLocalConf)
{
@ -504,7 +505,7 @@ void FunctionListPanel::init(HINSTANCE hInst, HWND hPere, ScintillaEditView **pp
}
else
{
generic_string funcListDefaultXmlPath = (NppParameters::getInstance()).getNppPath();
generic_string funcListDefaultXmlPath = nppParams.getNppPath();
PathAppend(funcListDefaultXmlPath, TEXT("functionList"));
if (PathFileExists(funcListDefaultXmlPath.c_str()))
{
@ -816,9 +817,11 @@ INT_PTR CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPA
case WM_INITDIALOG :
{
int editWidth = NppParameters::getInstance()._dpiManager.scaleX(100);
int editWidthSep = NppParameters::getInstance()._dpiManager.scaleX(105); //editWidth + 5
int editHeight = NppParameters::getInstance()._dpiManager.scaleY(20);
NppParameters& nppParams = NppParameters::getInstance();
int editWidth = nppParams._dpiManager.scaleX(100);
int editWidthSep = nppParams._dpiManager.scaleX(105); //editWidth + 5
int editHeight = nppParams._dpiManager.scaleY(20);
// Create toolbar menu
int style = WS_CHILD | WS_VISIBLE | CCS_ADJUSTABLE | TBSTYLE_AUTOSIZE | TBSTYLE_FLAT | TBSTYLE_LIST | TBSTYLE_TRANSPARENT | BTNS_AUTOSIZE | BTNS_SEP | TBSTYLE_TOOLTIPS;
@ -832,10 +835,22 @@ INT_PTR CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPA
TBBUTTON tbButtons[3];
// Add the bmap image into toolbar's imagelist
int icoID0 = IDI_FUNCLIST_SORTBUTTON;
int icoID1 = IDI_FUNCLIST_RELOADBUTTON;
if (NppDarkMode::isEnabled())
{
icoID0 = IDI_FUNCLIST_SORTBUTTON_DM;
icoID1 = IDI_FUNCLIST_RELOADBUTTON_DM;
}
else if (nppParams.getNppGUI()._toolBarStatus != TB_STANDARD)
{
icoID0 = IDI_FUNCLIST_SORTBUTTON2;
icoID1 = IDI_FUNCLIST_RELOADBUTTON2;
}
TBADDBITMAP addbmp = {_hInst, 0};
addbmp.nID = IDI_FUNCLIST_SORTBUTTON;
addbmp.nID = icoID0;
::SendMessage(_hToolbarMenu, TB_ADDBITMAP, 1, reinterpret_cast<LPARAM>(&addbmp));
addbmp.nID = IDI_FUNCLIST_RELOADBUTTON;
addbmp.nID = icoID1;
::SendMessage(_hToolbarMenu, TB_ADDBITMAP, 1, reinterpret_cast<LPARAM>(&addbmp));
// Place holder of search text field
@ -865,7 +880,7 @@ INT_PTR CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPA
ShowWindow(_hToolbarMenu, SW_SHOW);
// tips text for toolbar buttons
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
NativeLangSpeaker *pNativeSpeaker = nppParams.getNativeLangSpeaker();
_sortTipStr = pNativeSpeaker->getAttrNameStr(_sortTipStr.c_str(), FL_FUCTIONLISTROOTNODE, FL_SORTLOCALNODENAME);
_reloadTipStr = pNativeSpeaker->getAttrNameStr(_reloadTipStr.c_str(), FL_FUCTIONLISTROOTNODE, FL_RELOADLOCALNODENAME);

BIN
PowerEditor/src/icons/asciiPanel2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/clipboardPanel2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/asciiPanel.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/clipboardPanel.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/docList.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/docMap.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/fb_expand_all.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/darkMode/panels/fb_fold_all.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/darkMode/panels/fb_select_current_file.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/darkMode/panels/fileBrowser.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/funclstReload.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/darkMode/panels/funclstSort.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/darkMode/panels/functionList.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/panels/projectPanel.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/darkMode/toolbar/FluentUI/docList_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
PowerEditor/src/icons/darkMode/toolbar/filledFluentUI/docList_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
PowerEditor/src/icons/docList2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/docList_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
PowerEditor/src/icons/docMap2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/docSwitcher.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
PowerEditor/src/icons/fb_expand_all.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/fb_fold_all.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/fb_select_current_file.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/fileBrowser2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/filledFluentUI/docList_off.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
PowerEditor/src/icons/funclstReload2.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/funclstSort2.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
PowerEditor/src/icons/functionList2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

BIN
PowerEditor/src/icons/projectPanel2.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 902 B

49
PowerEditor/src/resource.h
View File

@ -258,26 +258,32 @@
#define IDI_DELETE_ICON 525
#define IDI_PROJECT_WORKSPACE 601
#define IDI_PROJECT_WORKSPACEDIRTY 602
#define IDI_PROJECT_WORKSPACE 601
#define IDI_PROJECT_WORKSPACEDIRTY 602
#define IDI_PROJECT_PROJECT 603
#define IDI_PROJECT_FOLDEROPEN 604
#define IDI_PROJECT_FOLDEROPEN 604
#define IDI_PROJECT_FOLDERCLOSE 605
#define IDI_PROJECT_FILE 606
#define IDI_PROJECT_FILE 606
#define IDI_PROJECT_FILEINVALID 607
#define IDI_FB_ROOTOPEN 608
#define IDI_FB_ROOTCLOSE 609
#define IDI_FB_SELECTCURRENTFILE 610
#define IDI_FB_FOLDALL 611
#define IDI_FB_EXPANDALL 612
#define IDI_FB_ROOTOPEN 608
#define IDI_FB_ROOTCLOSE 609
#define IDI_FB_SELECTCURRENTFILE 610
#define IDI_FB_FOLDALL 611
#define IDI_FB_EXPANDALL 612
#define IDI_FB_SELECTCURRENTFILE_DM 613
#define IDI_FB_FOLDALL_DM 614
#define IDI_FB_EXPANDALL_DM 615
#define IDI_FUNCLIST_ROOT 620
#define IDI_FUNCLIST_NODE 621
#define IDI_FUNCLIST_LEAF 622
#define IDI_FUNCLIST_ROOT 620
#define IDI_FUNCLIST_NODE 621
#define IDI_FUNCLIST_LEAF 622
#define IDI_FUNCLIST_SORTBUTTON 631
#define IDI_FUNCLIST_RELOADBUTTON 632
#define IDI_FUNCLIST_RELOADBUTTON 632
#define IDI_FUNCLIST_SORTBUTTON2 633
#define IDI_FUNCLIST_RELOADBUTTON2 634
#define IDI_FUNCLIST_SORTBUTTON_DM 635
#define IDI_FUNCLIST_RELOADBUTTON_DM 636
@ -344,6 +350,21 @@
#define IDR_DOCLIST 1546
#define IDR_DOCLIST_ICO 1547
#define IDR_FILEBROWSER_ICO2 1550
#define IDR_FILEBROWSER_ICO_DM 1551
#define IDR_FUNC_LIST_ICO2 1552
#define IDR_FUNC_LIST_ICO_DM 1553
#define IDR_DOCMAP_ICO2 1554
#define IDR_DOCMAP_ICO_DM 1555
#define IDR_DOCLIST_ICO2 1556
#define IDR_DOCLIST_ICO_DM 1557
#define IDR_PROJECTPANEL_ICO2 1558
#define IDR_PROJECTPANEL_ICO_DM 1559
#define IDR_CLIPBOARDPANEL_ICO2 1560
#define IDR_CLIPBOARDPANEL_ICO_DM 1561
#define IDR_ASCIIPANEL_ICO2 1562
#define IDR_ASCIIPANEL_ICO_DM 1563
#define ID_MACRO 20000
#define ID_MACRO_LIMIT 20200