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

[NEW] Add panel icons for 6 panels: ascii insertion, clipboard history, doc map, doc switcher, function list and project. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1154 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-12-03 00:41:27 +00:00
parent 6e45308b79
commit 662aed98cf
10 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PowerEditor/src/Notepad_plus.cpp
View File

@ -5034,7 +5034,7 @@ void Notepad_plus::launchClipboardHistoryPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pClipboardHistoryPanel->getHSelf()); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pClipboardHistoryPanel->getHSelf());
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB; data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_CLIPBOARDPANEL_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR; data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
@ -5068,7 +5068,7 @@ void Notepad_plus::launchFileSwitcherPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pFileSwitcherPanel->getHSelf()); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pFileSwitcherPanel->getHSelf());
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB; data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_DOCSWITCHER_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR; data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
@ -5103,7 +5103,7 @@ void Notepad_plus::launchAnsiCharPanel()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pAnsiCharPanel->getHSelf()); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pAnsiCharPanel->getHSelf());
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB; data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_ASCIIPANEL_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR; data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
@ -5142,7 +5142,7 @@ void Notepad_plus::launchProjectPanel(int cmdID, ProjectPanel ** pProjPanel, int
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)(*pProjPanel)->getHSelf()); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)(*pProjPanel)->getHSelf());
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB; data.uMask = DWS_DF_CONT_LEFT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_PROJECTPANEL_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR; data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
@ -5183,7 +5183,7 @@ void Notepad_plus::launchDocMap()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pDocMap->getHSelf()); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pDocMap->getHSelf());
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB; data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_DOCMAP_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR; data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is
@ -5222,7 +5222,7 @@ void Notepad_plus::launchFunctionList()
::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pFuncList->getHSelf()); ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pFuncList->getHSelf());
// define the default docking behaviour // define the default docking behaviour
data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB; data.uMask = DWS_DF_CONT_RIGHT | DWS_ICONTAB;
//data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDI_FIND_RESULT_ICON), IMAGE_ICON, 0, 0, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT); data.hIconTab = (HICON)::LoadImage(_pPublicInterface->getHinst(), MAKEINTRESOURCE(IDR_FUNC_LIST_ICO), IMAGE_ICON, 14, 14, LR_LOADMAP3DCOLORS | LR_LOADTRANSPARENT);
data.pszModuleName = NPP_INTERNAL_FUCTION_STR; data.pszModuleName = NPP_INTERNAL_FUCTION_STR;
// the dlgDlg should be the index of funcItem where the current function pointer is // the dlgDlg should be the index of funcItem where the current function pointer is

6
PowerEditor/src/Notepad_plus.rc
View File

@ -157,6 +157,12 @@ IDR_CLOSETAB_HOVER BITMAP "icons\\closeTabButton_hover.bmp"
IDR_CLOSETAB_PUSH BITMAP "icons\\closeTabButton_push.bmp" IDR_CLOSETAB_PUSH BITMAP "icons\\closeTabButton_push.bmp"
IDR_DOCMAP BITMAP "icons\\docMap.bmp" IDR_DOCMAP BITMAP "icons\\docMap.bmp"
IDR_FUNC_LIST BITMAP "icons\\functionList.bmp" IDR_FUNC_LIST BITMAP "icons\\functionList.bmp"
IDR_DOCMAP_ICO ICON "icons\\docMap.ico"
IDR_FUNC_LIST_ICO ICON "icons\\functionList.ico"
IDR_PROJECTPANEL_ICO ICON "icons\\projectPanel.ico"
IDR_CLIPBOARDPANEL_ICO ICON "icons\\clipboardPanel.ico"
IDR_ASCIIPANEL_ICO ICON "icons\\asciiPanel.ico"
IDR_DOCSWITCHER_ICO ICON "icons\\docSwitcher.ico"
IDI_STARTRECORD_OFF_ICON ICON "icons\\startrecord_off.ico" IDI_STARTRECORD_OFF_ICON ICON "icons\\startrecord_off.ico"
IDI_STARTRECORD_ON_ICON ICON "icons\\startrecord_on.ico" IDI_STARTRECORD_ON_ICON ICON "icons\\startrecord_on.ico"
IDI_STARTRECORD_DISABLE_ICON ICON "icons\\startrecord_dis.ico" IDI_STARTRECORD_DISABLE_ICON ICON "icons\\startrecord_dis.ico"

2
PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
View File

@ -555,7 +555,7 @@ void DockingManager::reSizeTo(RECT & rc)
void DockingManager::createDockableDlg(tTbData data, int iCont, bool isVisible) void DockingManager::createDockableDlg(tTbData data, int iCont, bool isVisible)
{ {
// add icons // add icons
if (data.uMask & DWS_ICONTAB) if ((data.uMask & DWS_ICONTAB) && data.hIconTab != NULL)
{ {
// create image list if not exist // create image list if not exist
if (_hImageList == NULL) if (_hImageList == NULL)

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

8
PowerEditor/src/resource.h
View File

@ -190,12 +190,18 @@
#define IDR_M_PLAYRECORD 1526 #define IDR_M_PLAYRECORD 1526
#define IDR_DOCMAP 1527 #define IDR_DOCMAP 1527
#define IDR_FUNC_LIST 1528 #define IDR_FUNC_LIST 1528
#define IDR_CLOSETAB 1530 #define IDR_CLOSETAB 1530
#define IDR_CLOSETAB_INACT 1531 #define IDR_CLOSETAB_INACT 1531
#define IDR_CLOSETAB_HOVER 1532 #define IDR_CLOSETAB_HOVER 1532
#define IDR_CLOSETAB_PUSH 1533 #define IDR_CLOSETAB_PUSH 1533
#define IDR_FUNC_LIST_ICO 1534
#define IDR_DOCMAP_ICO 1535
#define IDR_PROJECTPANEL_ICO 1536
#define IDR_CLIPBOARDPANEL_ICO 1537
#define IDR_ASCIIPANEL_ICO 1538
#define IDR_DOCSWITCHER_ICO 1539
#define ID_MACRO 20000 #define ID_MACRO 20000
#define ID_MACRO_LIMIT 20200 #define ID_MACRO_LIMIT 20200