From 662aed98cf85aacffb5371ceb448d93566f3b0e0 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Tue, 3 Dec 2013 00:41:27 +0000 Subject: [PATCH] [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 --- PowerEditor/src/Notepad_plus.cpp | 12 ++++++------ PowerEditor/src/Notepad_plus.rc | 6 ++++++ .../WinControls/DockingWnd/DockingManager.cpp | 2 +- PowerEditor/src/icons/asciiPanel.ico | Bin 0 -> 1366 bytes PowerEditor/src/icons/clipboardPanel.ico | Bin 0 -> 1406 bytes PowerEditor/src/icons/docMap.ico | Bin 0 -> 1150 bytes PowerEditor/src/icons/docSwitcher.ico | Bin 0 -> 1406 bytes PowerEditor/src/icons/functionList.ico | Bin 0 -> 1366 bytes PowerEditor/src/icons/projectPanel.ico | Bin 0 -> 1366 bytes PowerEditor/src/resource.h | 8 +++++++- 10 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 PowerEditor/src/icons/asciiPanel.ico create mode 100644 PowerEditor/src/icons/clipboardPanel.ico create mode 100644 PowerEditor/src/icons/docMap.ico create mode 100644 PowerEditor/src/icons/docSwitcher.ico create mode 100644 PowerEditor/src/icons/functionList.ico create mode 100644 PowerEditor/src/icons/projectPanel.ico diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp index bbeab30b0..2f12bd3ab 100644 --- a/PowerEditor/src/Notepad_plus.cpp +++ b/PowerEditor/src/Notepad_plus.cpp @@ -5034,7 +5034,7 @@ void Notepad_plus::launchClipboardHistoryPanel() ::SendMessage(_pPublicInterface->getHSelf(), NPPM_MODELESSDIALOG, MODELESSDIALOGREMOVE, (WPARAM)_pClipboardHistoryPanel->getHSelf()); // define the default docking behaviour 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; // 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()); // define the default docking behaviour 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; // 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()); // define the default docking behaviour 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; // 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()); // define the default docking behaviour 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; // 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()); // define the default docking behaviour 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; // 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()); // define the default docking behaviour 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; // the dlgDlg should be the index of funcItem where the current function pointer is diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index af01f6c59..18366126c 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -157,6 +157,12 @@ IDR_CLOSETAB_HOVER BITMAP "icons\\closeTabButton_hover.bmp" IDR_CLOSETAB_PUSH BITMAP "icons\\closeTabButton_push.bmp" IDR_DOCMAP BITMAP "icons\\docMap.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_ON_ICON ICON "icons\\startrecord_on.ico" IDI_STARTRECORD_DISABLE_ICON ICON "icons\\startrecord_dis.ico" diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp index 2370a7684..cd992ea3c 100644 --- a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp +++ b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp @@ -555,7 +555,7 @@ void DockingManager::reSizeTo(RECT & rc) void DockingManager::createDockableDlg(tTbData data, int iCont, bool isVisible) { // add icons - if (data.uMask & DWS_ICONTAB) + if ((data.uMask & DWS_ICONTAB) && data.hIconTab != NULL) { // create image list if not exist if (_hImageList == NULL) diff --git a/PowerEditor/src/icons/asciiPanel.ico b/PowerEditor/src/icons/asciiPanel.ico new file mode 100644 index 0000000000000000000000000000000000000000..dd943665693c50691ba89d01a702d4cc3529e664 GIT binary patch literal 1366 zcmai!J!@1!6o%ix3Old_(kvF+$Tp^)DxIVcq)DCb{Dm|Y3rcJR1tBn93KcAD@&lFy zMZrv+SQuPLu^0j-UBD#AXU+zLrtsdJ`FQWld7pdcZlne7#YNF}_2{0|m-LW8(tv1s zyY4SUcc&St-O?zU+reZq(d64iXJ6j(Y$T6ca%WA%eBcOYzg(|(ch%{1)a`cF>-Ds> zw4{E&ufbrTuRl(;yu7T9jSa1>t!Z_2RVyni8a;Ncue)C9Kz>^F>ENdhW;4Bf_a2i> z7*U8ipJud-meF$4U}#GW-540Up&NSJR?rK2VN%cwI-M$dMX%@;p`tr;XYMteGi@e$ zCQ)Wn=B2})Cc}_n$S`CW0tto;Lxv&4kYNZ+7%~hQh73c7A<$vSFk~1q3>k*(XmDgW za^s-3Pz8n28Y~8j!4j_wi(zgU8A%P6C<70Tfx%+1L|Nc4I1CPh!{CTg!C^2M35ZEkLAYimo}+uPdN z+0p*~zV`O^ba;5EqoX4oA0O-FL g&GhfiFQq4)+xYxkdhzjYJbNmA=<%NX!)$wg164e^CjbBd literal 0 HcmV?d00001 diff --git a/PowerEditor/src/icons/clipboardPanel.ico b/PowerEditor/src/icons/clipboardPanel.ico new file mode 100644 index 0000000000000000000000000000000000000000..49caafa23ec0ad75488842f09a35a7e756ff1dc3 GIT binary patch literal 1406 zcmeH@O=uHQ6otQvBS9@zr6QXcK zv1r@)M?eHcEJ{^GT8!4(w24$~mXZ|3iuh9mC0z*PokVSP<<3pd=YuRca23X&w#TIU;58VRd`5Ji3D0GgL)YPjcrT^r@J-0c zoJadv-Fcf>ECvNw6CGe}^e()Xx;L=y_&sqAvajzRCMfrJyMOENnjWge~18V1wt}C|i5R*w&X}dm@WEY|-HGsYTBU3hoLV@VCP1gsT(_d}Q7Htx?O|e+SmN<|3ANU_X&{Bf$7n*{)B3K;$37>8V zG*38GLfEGms;cgAhszC))>O6LJ(u@tnp*Ff%Zt`_RrEW0cV*s?2L1PaieIkNJZ^zY z?r17&>Cp_u8CCInor$EVLOW^ATgunze!~m|OvCG~cIrdAQfoFhn@bfv=xA}A2P!Md RqUHO)e)=*g{EMk$@B?a-)}8qY-RWe07%YHzfpqb^=R@4j zH}37NZLenaN44@){t2Dwd7TvkTirMW2Vh_@QwZc;w6Owe`<=UnltZU>1RVq)vGvcE(>U z&ad$cQal=hT^P27<(#@37azXs2*hyE(> z2cI6AcY56(?f~B99~A0z{mxha0exwEwAuWTn)4G_-z=6b-k^uI&lXkR>(AOp*E9G6+q$2_H`TsFGMR)~t>>g4 zu>JfnJCZNpm-c@l0~OWhVb`Ts?Cu!_7Xnwt*wZ`C-u@i>Qh9=Wwn%3seYSr9w>s=c literal 0 HcmV?d00001 diff --git a/PowerEditor/src/icons/functionList.ico b/PowerEditor/src/icons/functionList.ico new file mode 100644 index 0000000000000000000000000000000000000000..a9cae008280d627debbec51f6c355dc7ab4373b3 GIT binary patch literal 1366 zcmZ{jF-sgl7=~Zrf`=T!ZgB*;Vh=75>#6L5y6Qk$dwLm-MjCw|>E`Q4#s;!{OJ?NcR=*g+&4cOv(UBUBhMLW$TCJ9f zqENftR;Sa^w;$J9UtibG&W^UWwzRpqsf~>d4c?fxw@vSKD!YyvpZ?V8<)z+!`izOA zd0L>wI&^3b&7rxZ!H`lsy645CdvuSUrUmqX9tZ+@KIuM2P4{Y{V9`v!iz` z?pVk%$+78dPv>B8FgO?-3>gUq2ZMvb!Qf!Xm@qgP91IQy2SY}O!NK5Qa4S4)cV9@j8Vezo!vcTct@NjrIJRG@HaCjIz z3?7D5IuD13!NU;qxyQPM_|!LXE^n$1RCovSa;fnSFa=Bl1_7pkcVIB!9qeUJgd-*nHkOZ@ zNfDL^O9Ucfm_GqnA`>G?5h23DkH$KjNrWY)dSsULHKbEOgTY`h7z_r3!C=Ur6ATds zgTY{kFt7}bd>9M{gTY{6X&O2V27|$102uy}#f*tYl4lK1?BTGycFOVU>VtN7ceS^- zr~UnX9UL6!l9`I=1+ zyTdh`nZ2mTp2H-`4=)zpcSoOZo*`>+y~N literal 0 HcmV?d00001 diff --git a/PowerEditor/src/icons/projectPanel.ico b/PowerEditor/src/icons/projectPanel.ico new file mode 100644 index 0000000000000000000000000000000000000000..a71e54f3d7635a4a7ee843dfb6a97872d0e5b629 GIT binary patch literal 1366 zcmbW0ze`+E5QUFmUPvb_L((#>=`Ehm zr8V6c`E&1%?7cV!}{hC@>Tl3Ji%3LxG{dP+%x9lt6={z)>0p zwS_7vjNV`|SPYhYWmpVz!^qgwV97EtXgnA!21}L&4uiwsFgOg3EEOCEgTY`hw9*+I z27|%idG0gv0~Owtd0A?_D@+yBia~{`;$0c6cvrkD-gzA9jgEiCzvADH zsN!F#O@*PtP^m*ZHmZ_ukHVe49V0bx{2Vri!|}_bZ5-6V;qb=6i{){%$YF6<90rh0Y{La9H@!*oQN5SiIFES=!goP5}*ufFWQA7y^cXAwMS=9EN})U~m}NhQ@pt z0)~JgU|?$+It&3rzz_fg{?2B>!eElIhmji`k$bl}rWbmz?d@&t?CfZFcUSxS`#L>6 z)#2fx&d<+vd3mX;t1I2y-01%PUJnlsy2v;p_6X^MKkY2Yk2~aUINTZx2HjES$9vt@ zTjEJRe3FkD|0_Qk|IRPk`it?n8w}ZTtIK@m)=l$;Sv=;~kFn4lxAn8($Nb6q6ULv! I3HkrVFQ25-VgLXD literal 0 HcmV?d00001 diff --git a/PowerEditor/src/resource.h b/PowerEditor/src/resource.h index 2ec58a1d7..58432bff7 100644 --- a/PowerEditor/src/resource.h +++ b/PowerEditor/src/resource.h @@ -190,12 +190,18 @@ #define IDR_M_PLAYRECORD 1526 #define IDR_DOCMAP 1527 #define IDR_FUNC_LIST 1528 - #define IDR_CLOSETAB 1530 #define IDR_CLOSETAB_INACT 1531 #define IDR_CLOSETAB_HOVER 1532 #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_LIMIT 20200