From 958dad1d59d95b707f68da4a6cec29e9049022c4 Mon Sep 17 00:00:00 2001 From: Manuel Dobusch Date: Wed, 30 Dec 2015 01:06:15 +0100 Subject: [PATCH] logic: vs plugin solution utility Utility class to get list of files in a vs solution in the plugin. --- .../CoatiSetup/CoatiSetup/CoatiSetup.vdproj | 102 +++++++++++++++++- .../vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo | Bin 94208 -> 116224 bytes .../CoatiPlugin/CoatiPlugin.csproj | 1 + .../CoatiPlugin/CoatiPluginPackage.cs | 1 + .../CoatiPlugin/SolutionUtility.cs | 54 ++++++++++ .../graphElements/QtGraphNodeExpandToggle.cpp | 2 - 6 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs diff --git a/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj b/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj index 7a8d795d..64e6881b 100644 --- a/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj +++ b/deployment/windows/CoatiSetup/CoatiSetup/CoatiSetup.vdproj @@ -525,6 +525,12 @@ } "Entry" { + "MsmKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_CABEFC3263394106B5E96F489B7E8D85" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -640,6 +646,12 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_FB29EAD658C3497D9AC46ADE92D33C83" "MsmSig" = "8:_UNDEFINED" } @@ -769,6 +781,20 @@ "InstallerClass" = "11:TRUE" "CustomActionData" = "8:" } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_2DD762B8DECB40D69A7E3495EFDABC4E" + { + "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)" + "Condition" = "8:" + "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "FileType" = "3:1" + "InstallAction" = "3:3" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:4" + "Identifier" = "8:_147D9FD0_6C78_461C_AD73_82ECCAB526B2" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3822F3F8AB4C430794A666BBCCC3C6BC" { "Name" = "8:Primary output from SetupApplicationSettingsLib (Active)" @@ -783,6 +809,20 @@ "InstallerClass" = "11:TRUE" "CustomActionData" = "8:" } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_3BBF42F2D0554015BCF7349671B9EFFD" + { + "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)" + "Condition" = "8:" + "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "FileType" = "3:1" + "InstallAction" = "3:2" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:3" + "Identifier" = "8:_CAEF50B1_02B9_4DB1_8DC5_E4E5DB4772DE" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_463FBB946E6F4CF290A4B7E51ED398E5" { "Name" = "8:Primary output from SetupCreateDesktopShortcutLib (Active)" @@ -811,6 +851,20 @@ "InstallerClass" = "11:TRUE" "CustomActionData" = "8:" } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_541A6531B7F740DF8DCF518908A99D36" + { + "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)" + "Condition" = "8:" + "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "FileType" = "3:1" + "InstallAction" = "3:4" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:4" + "Identifier" = "8:_A7EE1E7D_CFF9_47D5_9F1D_8340AF683CFA" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_67190625A6A64789B579DC9ABA4CC848" { "Name" = "8:Primary output from SetupCreateDesktopShortcutLib (Active)" @@ -867,6 +921,20 @@ "InstallerClass" = "11:TRUE" "CustomActionData" = "8:" } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_DD799787F39A4F1A8742B6CBC1DABF17" + { + "Name" = "8:Primary output from SetupCreateStartMenuShortcutLib (Active)" + "Condition" = "8:" + "Object" = "8:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + "FileType" = "3:1" + "InstallAction" = "3:1" + "Arguments" = "8:" + "EntryPoint" = "8:" + "Sequence" = "3:3" + "Identifier" = "8:_73BFCC58_37EB_4D02_A2F8_7A0D5C37AF81" + "InstallerClass" = "11:TRUE" + "CustomActionData" = "8:" + } "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_EA511606B8E840088DBD733FF462117D" { "Name" = "8:Primary output from SetupRemoveCacheFiles (Active)" @@ -4241,7 +4309,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3460FAB707F8431E87168499A7F51556" { - "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Debug\\SetupApplicationSettingsLib.dll" + "SourcePath" = "8:..\\SetupApplicationSettingsLib\\obj\\Release\\SetupApplicationSettingsLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -4267,9 +4335,37 @@ { } } + "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C84BE68F0D9E42D3B9BD9C8A53DF049A" + { + "SourcePath" = "8:..\\SetupCreateStartMenuShortcutLib\\obj\\Release\\SetupCreateStartMenuShortcutLib.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + "ProjectOutputGroupRegister" = "3:1" + "OutputConfiguration" = "8:" + "OutputGroupCanonicalName" = "8:Built" + "OutputProjectGuid" = "8:{962F7DA5-AEA1-4D03-89FD-F9AC42C24E46}" + "ShowKeyOutput" = "11:TRUE" + "ExcludeFilters" + { + } + } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F81B906E39E44A5DAC37B3D70BC8A8CE" { - "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Debug\\SetupCreateDesktopShortcutLib.dll" + "SourcePath" = "8:..\\SetupCreateDesktopShortcutLib\\obj\\Release\\SetupCreateDesktopShortcutLib.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" @@ -4297,7 +4393,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_FB29EAD658C3497D9AC46ADE92D33C83" { - "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Debug\\SetupRemoveCacheFiles.dll" + "SourcePath" = "8:..\\SetupRemoveCacheFiles\\obj\\Release\\SetupRemoveCacheFiles.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A96454F2CE0E4C55B59EDE1094D40E56" diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin.v11.suo index e5c9672ba78a7f835e810eeb28f6e67adfb95c34..23d32bda918098df350024bd6faca580ba7940ea 100644 GIT binary patch delta 4333 zcmd^CeNa@_6~E`f?((q+3kxoYu#!cHZdpXq5Hx%VqEw9tVXAdNJ_UpYSs=z(U2MiW zYE<@EpKUTtT&>!UG0L;Rkq*t?1{>CC7Bg- z_Fw?^U8|7)m;y8L)I^KojmradMz7A4HoV~2pMU(|U;mv`)6;eO$o-k3w=@ba((Bf^3nlD$FAL3sV{p?a zMrDz84+OQe%5R zWE~_NB5-^h^@j<+CmbQf_LlAn9wg%`A*Q$V33p~7r8E!cnT&?T*}wYj{D>n=6TNB!3u7@K`$ z^z_qp8E>s>ojhsV(hr+U7V_$ZE>TT9F^e+MDY}I9GOnr!z7qTNUR&z*qO9$5L@c!T z#ovU`Ep!?=4_J9vrC9n{Iapy?{$dFJ#kiy})l7P(I+CfMIBJr0Q+?{b!po+bQ4{rKHxQN* z@R=e@AV(?3ikuL{EM_Uhfr+WuS-h#Qyi?Mc$nh>dUU5s?PnOn*D`&5xTi}|t0?0k< zmUi!m8=b|Jb!r_F-D{MxPB>18h!EzIq!ZI`0>^Yuv*5p6_;aDHQ;(!Q+D z%8$A9@Vy@sX>EgT1+LnU0*E>%~&cw@<}O%NAgHV+LB9 z4t!12*~SHUwzUFJ*k6n-E|@d>tDe`RtZiEr2?8hd&Q=n39056UD%2=T*8VyS-6sy? zh9@JG9jB%TV8=EyI#(ERV2c)8Fi6SU`jQSmIO0UJBSvYy*sQ?l(M%j%2gTt(d$Fto|W%WrXptSaaa$wVfaQA?8*P+-0(77%~ zF`gX^2z3xex`jhzh-3vW41w%Qf-Fx~5}efGn{8>Bvrdbf*9B4VF~E!q4QMvScve~A znJ~CK!u^9c?P2P-?+Dd<-X5!A6+1r?GrzXQGms72G;nIPkA&I;7Nz=TiUt?liowcT zAq02dXR9DEU8DpLZQ!1ec6z}K#QUKLkd`F_E(d(uO zzSa4nR^3RqsK?yc=f_pksG5pXhv=Xg8;$Bm>W@FiCd=*NV3fT8d7)a8WUk*r#5MVb z1pkoVm*8J;mF;~&j<%Mr&ZaiI{9G7hz@=el`?96At#wUx@|h5rERPR?H{=&4gF#LV zhi5$-wcrYnZ->Cmzz|V*_lliykS|*!L60^mNGiO?Tgo*Vv>Cl8aS<2*{;s}J-W~^Y zqEg83Zx4_`1=QXfp#XBa0dB|q%s(a4yibwMDHXmwy!>)7y|q6MV&pLq5DjXc`{X@i zpwV+f4|`{#>&okIw<~!=~9qq))I&dl-)^?ki_LD zx5cD%b~mWh)PJ;bLo?NO1`pLIg;EhTn7Q{u8aLuJz)$R8f9K#i<|4xtw8|+b-a_iBM(=YEX z;w0uUy`7$nN-A4ix6=&ML?(HkAOb%ivIzOg(a&EUVR*naVZ)u*qA)LZzsgxUG}E2W zW+nx zE3I-~4CHyd^bhdmjoI>Q6Bs?4%}_3>l-2pD?bECnIqyE$rytExrf#^OtQ<|1$S8$d z%QbkC5d15S3qbCFLYPVLH(t#jX5wKoW)N*yv6|HSp@FQ&Xxu@!DGirj9Sdoge=TLr zTpHWyBF$FStd&-AS=&Ni_0@F$mQl$!TmaOoT4*Ni<9NQ49l|QiR5y@1lBbi%)=?O6trynG_W$%~RBs9o9ZSbHPd&LGx^5HZnhh^+c#_&jsx=hx$K_~y}(ZhcL D2P{4H delta 2630 zcmc(ge^69a6vyB9u?xE_((+3UP?rUTbb}SNNXfQPBvW7kkq{J!h#G{AfGM(E3c-qs z-Rp46skF7xnwo-r#;Y}T&HkvFe#q36fAoW#YMQbcoT0|d*v^IBnu@Gxn(6F(-aYre zd(S=R-t*2n`y-rV+5u~dECt0VNhzd;5tD&HK#U4qKWtBu^`^cRUFqggWU>yqh~>vF z#f!@KvH>tLXyRNB-43xPBy(w<&@TzL5!4LU#SxDZV(t*NX+#te6C8`D zc0LhFEFl&U(L^dSj}Uv#q4wuMAY0g&5;F}5B{|p%-4oQ8QkxUhH@NJ#uw~jFR&FSC z%guUQP0@6SN=G=u4iilyy8+?5@JmaG{S3izVfJCtLotf}KZ#Myn<>U{vK5L^BS{5+ z3Q{Z#$-jy*@`9^6YSszb=M7@&zF2}GhgBLXT@E7~GL*Pu&5Aks)3D+47vOS~yWbi?*^cw%LDZhee$%zXJf=lO&E zUw!r9JYVHe$z_jYy}3o{G;d1gN+5^DRw20}s0fc`e#sEl@Y2y$sVihPHx8$rDMfIVV)~wZ-YrzOtZ(r+^Z(ERx&!F{J1J&%8~GH z>h4NX&R-ucdlt)H@?MumLm31+xhR9Rm-VyuRwFZ3HDR3HRrOQ&0eY2fWL=wj-8Cj= z+LFQE+-hO%Tl(3#rUYKH4q5JO4d3m9MRZC+9cGoIn18uVv90%m20?eXWR}SFi`?JB zzq>z`*7pzFQ$fzVOHb$_oEH~1<@`ixF*~t&0~;vI(PI&fhQd-N%AB%ReB=~U#ZTc* z(n2wrSz27OvZ~=UD7a@e7J4O&Y0r=n&dxR^Up&Se@1uDlH}9vmhuBH<5`Dxj;sGKQ z)^5^&cLdaT5pH6T5O!V(wv-}$39nK|>Tywbzy9 zw=nzdsm#{w3ooAZbtRd-+Z-~xckg`WYi)Bk$Imct>&PD8Gbx^JVA=aD?1{Y@iqr7| zye$rhb&9XGz@lD=fkm_5(w4Yi{#aJzqmvQL@xuzWHWF`Y75URiu%QEO%yDeRpq zbSgL*0Nc0Iq?k^f)~a$cCc(!JtbVK#ufVbr^D#AQ#0~W-r zl&ti-mdKZ`qGtiOug2rkU-?)m;&s1PD|t%_5UJ=?i|g1Yh#;5`2p> zp{F4jF~?T)a7Q(+Qa5izZ5ZEEhR^unN;)8&w0dd+10UFmLVm0oQCg8RdY*I>KH=|ILEMVdUgz%-W z;XR&G0ylrY4w-n2A>kVSbQP7e(K^~BuL23Gtr7k(K3a-Feoqb7U;39;XDW*^p#y7^ zZlW}xglEGYS%X6;=ewI=Vg7ihsPYz-JFdZE<40`e#~aTzAH4bVywzrJzLEJC&DLB_ z%fyFiNG3%`kgy#Y$C>9YD<5iv5vPO&R+}-K6%}NUG@)KrPn$76g5TGOJT + diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs index c69dd742..023f8a33 100644 --- a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs +++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/CoatiPluginPackage.cs @@ -14,6 +14,7 @@ using System.Net.Sockets; using System.Net; using System.Text; using System.Threading; +using System.Collections.Generic; using EnvDTE; using EnvDTE80; diff --git a/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs new file mode 100644 index 00000000..adedc713 --- /dev/null +++ b/ide_plugins/vs/vs2012/CoatiPlugin/CoatiPlugin/SolutionUtility.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using EnvDTE; + +namespace CoatiSoftware.CoatiPlugin +{ + class SolutionUtility + { + public static List GetSolutionProjects(DTE dte) + { + List projectNames = new List(); + + EnvDTE.Solution solution = dte.Solution; + EnvDTE.Projects projects = solution.Projects; + + foreach (EnvDTE.Project project in projects) + { + projectNames.Add(project.Name); + } + + return projectNames; + } + + public static List> GetSolutionProjectItems(DTE dte) + { + List> projectItems = new List>(); + + EnvDTE.Solution solution = dte.Solution; + EnvDTE.Projects projects = solution.Projects; + + foreach (EnvDTE.Project project in projects) + { + EnvDTE.ProjectItems items = project.ProjectItems; + + List pItems = new List(); + + foreach(EnvDTE.ProjectItem item in items) + { + for (short i = 0; i < item.FileCount; i++) + { + pItems.Add(item.get_FileNames(i)); + } + } + + projectItems.Add(pItems); + } + + return projectItems; + } + } +} diff --git a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp index 2d697424..c4a49b9f 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphNodeExpandToggle.cpp @@ -10,8 +10,6 @@ #include "qt/utility/utilityQt.h" #include "qt/view/graphElements/QtGraphNodeData.h" -#include - QtGraphNodeExpandToggle::QtGraphNodeExpandToggle(bool expanded, int invisibleSubNodeCount) : m_invisibleSubNodeCount(invisibleSubNodeCount) , m_expanded(expanded)