From 9a0f8881a752f0d9b132c854f0de777bdbbd9348 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Tue, 2 Feb 2010 23:01:14 -0600 Subject: [PATCH] Added build configuration for portable edition. Fixes for portable edition. Added missing Icons directory. New build script to make release ZIPs and installer EXE. --- .gitignore | 2 +- BUILD.CMD | 32 +++++ Installer/mRemote.nsi | 6 +- mRemoteV1.sln | 6 + mRemoteV1/App/App.Info.vb | 7 +- mRemoteV1/Config/Config.Settings.Providers.vb | 26 ++-- mRemoteV1/Icons/Anti Virus.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Backup.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Build Server.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Database.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Domain Controller.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/ESX.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Fax.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/File Server.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Finance.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Firewall.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Linux.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Log.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Mail Server.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Remote Desktop.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Router.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/SSH.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/SharePoint.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Switch.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Tel.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Telnet.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Terminal Server.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Test Server.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Virtual Machine.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Web Server.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/WiFi.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Windows.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/Workstation.ico | Bin 0 -> 1150 bytes mRemoteV1/Icons/mRemote.ico | Bin 0 -> 3750 bytes mRemoteV1/My Project/AssemblyInfo.vb | 4 +- mRemoteV1/My Project/Resources.Designer.vb | 9 ++ mRemoteV1/My Project/Resources.resx | 3 + mRemoteV1/UI/UI.Window.About.vb | 6 + mRemoteV1/confConsNew.xml | 2 +- mRemoteV1/mRemoteV1.vbproj | 120 ++++++++++++++++-- 40 files changed, 195 insertions(+), 28 deletions(-) create mode 100644 BUILD.CMD create mode 100644 mRemoteV1/Icons/Anti Virus.ico create mode 100644 mRemoteV1/Icons/Backup.ico create mode 100644 mRemoteV1/Icons/Build Server.ico create mode 100644 mRemoteV1/Icons/Database.ico create mode 100644 mRemoteV1/Icons/Domain Controller.ico create mode 100644 mRemoteV1/Icons/ESX.ico create mode 100644 mRemoteV1/Icons/Fax.ico create mode 100644 mRemoteV1/Icons/File Server.ico create mode 100644 mRemoteV1/Icons/Finance.ico create mode 100644 mRemoteV1/Icons/Firewall.ico create mode 100644 mRemoteV1/Icons/Linux.ico create mode 100644 mRemoteV1/Icons/Log.ico create mode 100644 mRemoteV1/Icons/Mail Server.ico create mode 100644 mRemoteV1/Icons/Remote Desktop.ico create mode 100644 mRemoteV1/Icons/Router.ico create mode 100644 mRemoteV1/Icons/SSH.ico create mode 100644 mRemoteV1/Icons/SharePoint.ico create mode 100644 mRemoteV1/Icons/Switch.ico create mode 100644 mRemoteV1/Icons/Tel.ico create mode 100644 mRemoteV1/Icons/Telnet.ico create mode 100644 mRemoteV1/Icons/Terminal Server.ico create mode 100644 mRemoteV1/Icons/Test Server.ico create mode 100644 mRemoteV1/Icons/Virtual Machine.ico create mode 100644 mRemoteV1/Icons/Web Server.ico create mode 100644 mRemoteV1/Icons/WiFi.ico create mode 100644 mRemoteV1/Icons/Windows.ico create mode 100644 mRemoteV1/Icons/Workstation.ico create mode 100644 mRemoteV1/Icons/mRemote.ico diff --git a/.gitignore b/.gitignore index edf9e18b..f07583ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -Installer/bin +Release mRemoteV1/bin mRemoteV1/obj mRemoteV1/publish diff --git a/BUILD.CMD b/BUILD.CMD new file mode 100644 index 00000000..ccfb4485 --- /dev/null +++ b/BUILD.CMD @@ -0,0 +1,32 @@ +@echo off + +SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" +SET DEVENV="devenv.exe" +SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe" +SET RAR="%ProgramFiles%\WinRAR\Rar.exe" +SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip" +SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip" + +call %VCVARSALL% x86 + +rmdir /s /q "%~dp0\mRemoteV1\bin" +rmdir /s /q "%~dp0\mRemoteV1\obj" + +%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release" +%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable" + +mkdir "%~dp0\Release" + +%MAKENSIS% "%~dp0\Installer\mRemote.nsi" + +del /f /q %BINARYZIP% + +%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*" +%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*" +%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT" + +del /f /q %PORTABLEZIP% + +%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*" +%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*" +%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT" diff --git a/Installer/mRemote.nsi b/Installer/mRemote.nsi index cea4aa23..8d12bea9 100644 --- a/Installer/mRemote.nsi +++ b/Installer/mRemote.nsi @@ -3,7 +3,7 @@ !insertmacro VersionCompare !DEFINE PRODUCT_VERSION_MAJOR 1 -!DEFINE PRODUCT_VERSION_MINOR 62 +!DEFINE PRODUCT_VERSION_MINOR 63 !DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}" !DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0" @@ -13,7 +13,7 @@ Var InstallDotNET ; Basic Config Name "mRemoteNG ${PRODUCT_VERSION}" -OutFile "bin\mRemoteNG-Installer-${PRODUCT_VERSION}.exe" +OutFile "..\Release\mRemoteNG-Installer-${PRODUCT_VERSION}.exe" SetCompressor /SOLID lzma InstallDir "$PROGRAMFILES\mRemoteNG" InstallDirRegKey HKLM "Software\mRemoteNG" "InstallPath" @@ -106,7 +106,7 @@ Section "" ; Install WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayName" "mRemoteNG" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "Publisher" "mRemoteNG" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayIcon" "$INSTDIR\mRemoteNG.exe" - WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 5816 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "EstimatedSize" 6464 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "DisplayVersion" ${PRODUCT_VERSION} WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\mRemoteNG" "VersionMajor" ${PRODUCT_VERSION_MAJOR} diff --git a/mRemoteV1.sln b/mRemoteV1.sln index b31f9527..5cf6d34f 100644 --- a/mRemoteV1.sln +++ b/mRemoteV1.sln @@ -5,12 +5,18 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "mRemoteV1", "mRemoteV1\mRem EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug Portable|Any CPU = Debug Portable|Any CPU Debug|Any CPU = Debug|Any CPU + Release Portable|Any CPU = Release Portable|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.ActiveCfg = Debug Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug Portable|Any CPU.Build.0 = Debug Portable|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.ActiveCfg = Release Portable|Any CPU + {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release Portable|Any CPU.Build.0 = Release Portable|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.ActiveCfg = Release|Any CPU {4934A491-40BC-4E5B-9166-EA1169A220F6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection diff --git a/mRemoteV1/App/App.Info.vb b/mRemoteV1/App/App.Info.vb index 0bcee326..5b898675 100644 --- a/mRemoteV1/App/App.Info.vb +++ b/mRemoteV1/App/App.Info.vb @@ -14,10 +14,11 @@ Namespace App End Class Public Class Settings - 'Exchange to make portable/normal +#If Not PORTABLE Then Public Shared ReadOnly SettingsPath As String = GetFolderPath(SpecialFolder.LocalApplicationData) & "\" & My.Application.Info.ProductName - 'Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath - +#Else + Public Shared ReadOnly SettingsPath As String = My.Application.Info.DirectoryPath +#End If Public Shared ReadOnly LayoutFileName As String = "pnlLayout.xml" Public Shared ReadOnly ExtAppsFilesName As String = "extApps.xml" End Class diff --git a/mRemoteV1/Config/Config.Settings.Providers.vb b/mRemoteV1/Config/Config.Settings.Providers.vb index 7df61d14..7be706f5 100644 --- a/mRemoteV1/Config/Config.Settings.Providers.vb +++ b/mRemoteV1/Config/Config.Settings.Providers.vb @@ -6,15 +6,13 @@ Namespace Config Namespace Settings Namespace Providers Public Class ChooseProvider - 'Exchange to make portable/normal +#If Not PORTABLE Then Inherits LocalFileSettingsProvider - 'Inherits PortableSettingsProvider +#Else + Inherits PortableSettingsProvider +#End If End Class - - - - Public Class PortableSettingsProvider Inherits SettingsProvider @@ -145,13 +143,17 @@ Namespace Config End Try 'Check to see if the node exists, if so then set its new value - If Not SettingNode Is Nothing Then - SettingNode.InnerText = propVal.SerializedValue.ToString + If SettingNode IsNot Nothing Then + If propVal.SerializedValue IsNot Nothing Then + SettingNode.InnerText = propVal.SerializedValue.ToString + End If Else If IsRoaming(propVal.Property) Then 'Store the value as an element of the Settings Root Node SettingNode = SettingsXML.CreateElement(propVal.Name) - SettingNode.InnerText = propVal.SerializedValue.ToString + If propVal.SerializedValue IsNot Nothing Then + SettingNode.InnerText = propVal.SerializedValue.ToString + End If SettingsXML.SelectSingleNode(SETTINGSROOT).AppendChild(SettingNode) Else 'Its machine specific, store as an element of the machine name node, @@ -169,10 +171,14 @@ Namespace Config End If SettingNode = SettingsXML.CreateElement(propVal.Name) - SettingNode.InnerText = propVal.SerializedValue.ToString + If propVal.SerializedValue IsNot Nothing Then + SettingNode.InnerText = propVal.SerializedValue.ToString + End If MachineNode.AppendChild(SettingNode) End If End If + + End Sub Private Function IsRoaming(ByVal prop As SettingsProperty) As Boolean diff --git a/mRemoteV1/Icons/Anti Virus.ico b/mRemoteV1/Icons/Anti Virus.ico new file mode 100644 index 0000000000000000000000000000000000000000..815d01c4ca6731897807f18d27dae729877da68b GIT binary patch literal 1150 zcmYjROH5Ny5S=QD@e_*}{Qs&VdlDDAg@s!U>cVy7#^}a0E?l{BY5YNHsUTvjwgvkC z@Ct?|Hd>%kX^5nvM58T9sfY`@8E5A9J$%i)JH2zyx#!NEc>pH*nax1&<8ZwJpalTh z$Y_dY)I1IHH17al)1Q!kD+auPJ~!a2LBN*-fP;O215PrBvi@E`mmRRL2hjNxu=fes zV>L!bb|Q0(zS-ay>L(7D;$g1mbuQ)*JYjntDT@V~F*35t;PBRUxJd_VVXmQPbxov) zHSqq7?|ulF2pvG?SXy);Kgoy%GwCkzXQyrWA!8L^f32<-MT3q{Mve+cap8e13HmnU z+p%`>r{7yKpR?&uV-yW^2Ht-xYQbdq2!1ZyGvd0Fp6I|&9~FLmy`oP`F7-2Lu~Ve^ z7#3!4OFTV(9t-(9;9K)@l_D`Zi&;l9hSJ>p7Uvx&+TPq{UiMi=LDm^1|OMGqS$AGDY|X;o^zh zloi+h6eX5PTP25_gH*gt&cHdW)v6Nb*K#?9q2X=D|96v}Sgz-ACTo-0=6h85R=LMS z_%OzUEf@{#!RY92sY|Z!@bGr3&qnGK6Z$=>PhL<>a(^&B6+c57)IBCb2Ze)cQg{MQ z#APNf?vqBNPdwCX%)wZNSNF)Z#5Elc?h_u?6ASJouBJN27U9tQg!kn; literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Backup.ico b/mRemoteV1/Icons/Backup.ico new file mode 100644 index 0000000000000000000000000000000000000000..3e9165148afa707fbeb8715c65cdc872ba4249ff GIT binary patch literal 1150 zcmZ8hOH5Ni6deP_U;Zl%#)S!lkkFl_fj!HXf>x>jR-s_q*YZhp z0V*m)Wg#IkN+We+0+?ttM0Dlqde43BvvHdH?!1{f=bo84uS%WZUrvtV=UL@Esni*z zl$nEvctjuPB<=Jmr4X4`Ru-nh!dWUP2$IEeo6P1Ll%Ic{;~IzG2$SgwnM~6hQnKTc$5Prsj19)J)5_NS^s;YXJ#c?mK7MQTU&za>!Z9EU5DL1Cp_4b-F{!VY_>aG|0-2h2Bdawu7}#&6BLPjq)ag-&iXmn4;0s(!k+r1(0ySv}%;NTY_yIkus zrfIv92L|Gzp}TvDVlf@>^}dz4v9S%oZEby#ytek4papGz|Cr;aaRxm-%cN;K9`lEX zzvV2G$sZJtrwBP1d~e{fW_9&b`X0QLjnC8{AK#=<=!0Of-tB(L_!sCJ_2C8FfsRkf z-1hcY$xi1w`TaYh9RvOSj|{w~C1uUvV1n_J)Z4o(wNj}g+S@y#a5za;>jI68Jd^s+ zUsNm8o9>v9T?9UK;;%?gG z@Z&TA4-L4-*48*RG{mU3Hp-rfh%e!9aDfLp{(UF#w?B1Q0w6y3P@FaL@Y9dr! z9U<_5BjZnt>93&uYu)Ub0j#8uuhe(waE0KZ( z8jCV%f~|Cr!VT#_a+TDR`DXprF{EOwZ{NImJKvl4=35hm)C3*uR?Jlj%_o{*O7^j-Dy?DHW_%eplFeD{^4|GA0@f2tIqba61MYyngGc6bh6`r}onuUXOsZeL zEOX*bLVY~!1zYn+*GGA1bts5uzht?1Uex*4*Db#{Pl;{UX4GTMn)CM`TOZ@${IChv zjoMe~tyik$;RWxz7xdw3e(o?A?4LeJv$Iz_bK$h0cc8kc_5u0017q%?%f~;Db&7ld zhVv&s_;-Q1>ErmuIFGE2Af%Q*%5&*gNqzKU^8KXxxc}fTFUm|+EyXwEj2f=m{*Qfb ze$~uPFPnJh+fJ~oeR!SlwJm2rK5D=j`g8ppTZwT;s)O5?+Etg(cgsSH@`Rp;YTpU8 zEqX-$#Kr`hKK5pNl>@p4kCn1GvJ_$Ppq9FCO*oJXm_9&D&|}w1m-3*V&UB~pfTLl) rp^gLlA{TcE9YD{0**@g}Pj{wUxxj%saF+0kFq3FXzj^aVaKrI0`oK&7 literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Database.ico b/mRemoteV1/Icons/Database.ico new file mode 100644 index 0000000000000000000000000000000000000000..0926231a4d7f4b89cd9a16655d742fe42064b63b GIT binary patch literal 1150 zcmaJ>%TLom5MC2+UPw$ld-T+&*7%4T6(1;#f)Wq@0qR9hNaC5wqYxEQp#QoN4y&Gy&+PEPafPWHFoH?zAlRcagm%E}avyVbSrO6^ig z?P2f|ujqB2#CGmb3NY-DFG{Yb!}(}H za&fe?*29q2K_19~;|sr`gDM7N1dZ(G7Mbny`fqZFCaC`9qIp^T-tm$4hi7Oluj4nH`EORp!+?Q*J2o%=&y5`OyX6ekBeQg2I9}v?Q>*mO zi2t_47h++kjV9zBERCJ?KmJ|t88F1Jo7VATU%!#HrHA8dKJLKC-qPC#gr=LCxr#oWY1M8+e%e zzD9@rQNnwe4RulJAJg^7wFEwLz!}aDP1EUt7@Z7H(ecov)FtZsNMJ&=_Di3P>ON@; ziU#paQWxkD+y8b{-;R32-gvb)W6@b)<>jd-b~w~>-iT*w|bVYQI#4b|VJ$+Bm z-{@)059jOXdKe_F(JneClYXj6UXy!*Sjuhp1RBOD{OdEIj_4)y^qEvZbf9&b`x`ol zrDBlpD>Te|g8o4dAcx?ipKCb=XlMjP3mS+6XQ>#xM2Dk3x${cx>LNw+M!gdWh^n zkooYpJw*i~Hj<9Tidj6od4lF-}n2S>o=k^`md&j^lu|Q zJWEtZM9sSBCf$;^>q=H_B@sle&dw@sYcp_btASfu3~aR;*kY+*v-zZ$Oce|<8vlvI zQOp110FM&ISB~%LxynxGr2+?HP;np@6_1Lk9PjZou;OTMuPn)>oa;0WzyA)et-aym z6^Yn+e}6|zx!g~lnThh=UVc9|=HsocRXLlQigF;(%pQED;YuZaW8y^n~et6iVkHKRY`qzLATnV=*3=4-dca!a`hd_@vXTk|XfpuwCr&_@h(t@Q+>| z9DJ60st%|n@XO2dl0&iokr6X*ZoZfMOH0q$?Y_+0+aF|~O1%<|7|;_eO`8{u{E5~L>MGQ9Vj@yf1K<$@`snlB;=aCmnJ1U4PI5s#(G&F5 zW;<7SCu){}4}~m@J`N5x@xVZ1fdg~d-F-!J0uMOUTT^olEChWB1n%lF+-A&lfB$vi zK|H;^*MtWg9UT{hL(Mk)0vin86FlbG>%A!)d7c}>1rF2}xfH(>BCVR}zW#UM&k=q9 oLG;y0IRpKjFSF&jsVYZ%FJ#5D~4##zsX{5IeInve ztXAtgSS%JYo6QW9$wUf~NQC~UVYk~^2UZnx=ry)qELSS)J(Y&N4%C`8-smU*Mm zNb?(w1|gsIdd+iKiyD+lB|4waJU5@uDI5+{GMS|DcubGS;~jsq+30br)nb0RT-JPi zyx;G1I2?Fgv)R<^|BgQ#4*%gJKF(sbS}|`h7-)XIUgtjQp!SdapW`cjwOXaOw>QmQ zE|=8n^>|#X)pY&gyJ!Alv7l%)$~Aze0)YU-@Avb$Dv!cX@DhB0SeMI1$3h2tKpk-w z0JM~b%jIHEDKCMK9B_`=Y?f;ePa+TKJZnKil|R-gBqZvT&OFebecjGw0rWrb?aSPg|Sf=XrJWv{L7kQWrRQ ziC6SGzhs;}qZGo7)zA~hFE9UUfcyqV~4a?E=kQ(~|~c)&I5)?DBK9@tRVU5V_}7-ga(O^%n|mJVnE zS90i4Lz7c9;C$eN9QnA949C&I9$|dg$kXC@H!Y00sGNN*Yk2&r*_25{M1$Zv?@(bj z(BwF(?91Mdn+00(_0n?KBj1nfzi2D6c^@9&y$AeWQlZ7D51)qS}4Up&rV3A&}O2K%|ZLF+Fp=?8of>uKjcw(te3b-v(3 zgS3;H7x+)^%jQx-=HK_fh_^J}LB(W<^>YolR`%gH+4E_qB!0+EkIVP^k1B09@CUo^ z#S5q*YEVjsB?r{du4=r1__50UgBCNuQ{esZ6mo!{1uq)VN5Aw@{1h7%U&7z%h=;lK zJ%KN9PZI1&Z~$Loe5;Qw4)7Q*xhKqF?#c6!F5v*y;Ek8y>D-K0w7^$ct^;_$vBGr) zhq)&>S9?JFK>OJ*e$qUe3mh5F3Aq>!+hC-D`4z!@~#3-##m0-!77M^N1sKwW*`W5-s3*a4F$w zVm;7+`hq_@L(3y20*4;u$hPSC`R!0r&$2H`uWRdjdK=9RSTw@;%vf1C^beI-jUv|_ zgV}a=&Dt%#(%UHHOOc=Ps}mJk8QnDbYTTu0e~u2m|B~GE+@8VLHyUPN$Y;wLvVkqi zjF(Nmns6z8BX97v{A;t`X~BmFmpuIBmS`{pym-6&!C?Ntm)@9dz>l^EDf<`xak4J= zsr9=p^&3z34Sr!L{ZD+tS1|S6!jb;{7w-iB`Qulb=nRR69Il@YR1EKv)D9&FABhI^ z0fBzvPT@Sh#fG_RgBBh3zi+RAI-wDnE z4hQv{XV4npX>jORy2F~7r}eGrcY?aOL-Y`M@w0zZJS{v;E^t7H^p<<7`>Fp2{&)Tj DdN3BF literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Firewall.ico b/mRemoteV1/Icons/Firewall.ico new file mode 100644 index 0000000000000000000000000000000000000000..2343ae6a671ae1a475a41084ddc31e6adbb6a828 GIT binary patch literal 1150 zcmZ{kTZm0j7{~w06RA_mlj22r9FxeH*kO#p2)T~S9AX%9%`LaKyJ?8XwLHkZG$ko{ zI*-cBC`u_!2@MhDQ7ym!*=vnc_)fpQzV+?Be&^fktd2B@PpKrXqqT9cG(yr?phTsp zGgM>vP{|C$nh?|hov;md!d^H4hv68Ugf2J>=iwq;hAXfN>{t(*U<=r>2lj&`y4{$bwM5dW~XBPYcckID8}qMYYsvV8BCAQ^|SU>T+bQE z@H@8OFUIn%V$7ehW*^wm2sj)$_caIR!NL&AoDqlGx%Vi962FHde@bl^*f9xkI4Um- zM}CLz=KOg-9BPAhSj%tlp86AVpH(|10*>!LtB(#`?8xsGQ!U|{=%~D*{+Rh@uwy(# zM|v0Uhi1ZT@VhL4i;6WZIq^5lZK6yn%_yS a&!z6WQrjVE%qZ!_FR5v=)HOuvss9a@tHZ$n literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Linux.ico b/mRemoteV1/Icons/Linux.ico new file mode 100644 index 0000000000000000000000000000000000000000..cb8f13a90ff4dce2ace2024522ff4d25dbca9f77 GIT binary patch literal 1150 zcma)+dq`7Z7{*T-Ei6mCEK6;sSccd|vWs~k(Ml^bBubI~s8B1^%81NbYKC2`)KU}0 zOVg=snRzEmmd#vRp{QXh>qxYkBb}{nCmnk_XJIVcAH9d~ocDXq^LyWq_rM{DIrL>| zNzivEB6c1@unB^2qZcjF%5R;17{YoXK`_fWv}%>7bg)0Ep|&>venq1;`C9(Zj+f%f zp`oD!#h5(d!-%x&$^(;Y;GWhFyW1aO9oK>lUVaGl z^F@%4H@1Yv!kXI$_St3}vt^*z*Q6 zQBmIxn+M}qQBS{b&>_Bk3`*r>2*XR&a2Lsu%-B$XTrc3kf*|0v!3#x2#o@** zlaGD*9I`Jc5RU}{1EW%@{^AAvax7Y44)2X#Xls4;56{%NayjK~;^{;KuhZ%N^k$N@ zlvK`3xjw%e4z{-7m6W!b@|x04M#l*EC*>mKmH@|+(&4e% z4gB&7p((E^Eh-{XcsM)^K5N|(9}@$Y6;5bwZ2E6Lm3vv}K+oFB!V*iZY!Kk%?8c{WGrW#ovEs&vU!Ar0uZQbG zjoROR6yf!ocN3~MRF~=ZlL~+9VMv{KL^dIQwOQ>mqXs_zVG1VK?5~2#Lr+^VoYmC% zE`2M~8Hd{6dmQC;{^Jy0z0UD^;{Ow!`Pqj>3Z zw%`i1`imO%RI#Q=OQgd)xqgNB#Osuvh@(Bc4z}=G=4uPBgtf04r@V&7N!z4nEp-sV zq5T{q=Y~ literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Mail Server.ico b/mRemoteV1/Icons/Mail Server.ico new file mode 100644 index 0000000000000000000000000000000000000000..9f0d180691b6228041f69ec4e718e4b842620c69 GIT binary patch literal 1150 zcmZuxyKY)R5Zy@W(pZX=I%WDu`GfpGf_Z~@+t`?=dHM^GC@n!r1LEZeNECo%Hz1xB z0z`=^ffDM;o=NVN9W&_c?wz~m?Ci{3g!mwTCnrLVU&Z-HA-)J9zDY=z^!)Y9iS6?z zApphB&d$i`bdt?xBdgU)X0w@$MkB*uFpvVhUQarmj-l0R>GbrJFkf6;&@l~@$)xH) z4?2nlxC#P+09{^QzSFQ+EF25sQDTAyVo=W4XfzZKhpE@=5$x{nj^^_@JwHD);47EQ ze6OdcCp@xEr&IFzd<1?p8l`@}&;C}cMXS|{#^W)KMkDrBDiylDz2!AD8jS|8A0Ho? zpGYKVFc`3}+wIbJyQRfq!EwM@tyU?Y&+~i4RVtNu-RX2V2gzho03SI(9j~viDHsfr-|y%CKwqN2 zyA=4cx`;cB?%l#CQ2uV3r6<1pcjm$yqCb8Sk)1FY)8m K`lnp~7JmRD5YUcTXds>CKRKh8{;3i-gCcxrN(LQ+%Ge8&YU}Qrb_MLUrCALey{4@sni~& z)IJU#;t_3}leFEtltSn&VzSa`brTI$HPWD=o8)fiyRk9tLc2H zk9D>@0BH%18TtjN$&|6Tb{i~o7s1id%H@bHD=mKXK3r= z8ZE`AW&T0$8G0Vm@Hhv(h8bT#=2zzK)7R{K(SSOj100V|_80JrdHihf6onlgsbR*~ zDf54R{FMB7U`Wmq_*@Zwp7&pjC1j1>4LjOM$A5UbK)=?%(E8G=B7C;6|9o#>0Y4W! zEfmR~-v978gGhZdpF@_mKCRKqiKMK3ScHETo!rKEbm?*=KN$?utwy`x^$Gn>Uc|Tc ze}0{&kjX+Rf468zv>p4$3*d+}*hCBbImUMqW^ce3@RaT)!LtV3Xy*i$# literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Router.ico b/mRemoteV1/Icons/Router.ico new file mode 100644 index 0000000000000000000000000000000000000000..b1cd8e60c913a0ffb4c163ba05d1f2c85f355d82 GIT binary patch literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|>)F<&3=lqnP|K=w8v?f#FhAEXYZ z2bX@3ILMBs`4w>eU<089%pP?8$Z9U#Jr8yZy8SS-L1_YAKg`_q2UlRYAK7eT*iT+P z0=s`S?UA4Ms1bGy3@?Qk7>>PRU|9T_fnfq01H%_!38M3WfuZCF0|WOW28Kx-3=CV% d85sDA7#Q5nFfi18V_vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|>)_%I3oVqnPqAIQshL ze-HrCpzzE+vjEHo5g@kX-j@F#etiSWfoKpPIouz8eFNr$)En=p0-FJRbYESX2Q$@3qT2&I+z^H zZ`+<-0ILVN8RmYFSs?Ww08$SE$ofHIu<(QFhuIHO3o-|!9%cu&@B^7Kib)RxSUEr% JeW)C!9ss2aiZ0o) zIV{^}(jqH{85K#Iyg5NPAB>LsTYftHeNqeV2loIuEZ=X^lIj%AMIA2O`la{UH=|{k z49jn?MZ44FE<H&4pGj!IQ+xf8jk#-yWtW29&Ey_6t|E0 zxdt`orB08c8LB)f^=o~Zp|cMEjr+nne(|&TF+(d3n6wl%SY0FE@9fJ`)hY4cdzhxs zHOKc`r7ppyPco0FLE%AD=fE|*bbCDij@~Sl9vP%_*Tt^`$1RLLy35fAo^AAz{Tu`5 zFn?Ey^0z06`!Icr%q7n^_hizhgszA3eYDO=mu9ekWzZzMkK6}l@Juqty){WLh&jwq ze*2v8EOcov`|UpREb&aw+L6>8X3g9t9A-?|U@@$7!rx^t*O2Fc=XqY0FqkvDQdrF3 uI5?NwQk-``dcbF1)#9%p1f78zAun_qIsr96N1=M?7{u!a#Cz65wdz01Xq@H% literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Switch.ico b/mRemoteV1/Icons/Switch.ico new file mode 100644 index 0000000000000000000000000000000000000000..acb7482ad1373303792d2613b1fe24cb58124cdb GIT binary patch literal 1150 zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|>)F-i%5AM=@n#u;Spp z|L9=q=Jo%(*RB8ypTBz>9L69T1VG~W!u-w05C4x|yZnFm`7>bkUw`}ns|V2_u<686 z6#X!Jz>-h`WIsqf%nXnlVSJGJ$o7Nm0s&+(kbV#VnSJBQBd}hO`(bt=`vE2f)&M0y zc0GFa5^N^Oy&wQ{H%J`hE@b;g*_5S0a>I{-;iV7*!?8CE42wTAFic=$VE6(oL3AE4 tFqHgYVBlWFz%Yq}fnlpT0|Q?X1B2Tc28OzC3=D5W85mB5Gce?E0074*;YIg6q}5bc4@HW^shc*BV&njbUaF6_cCgZC{e-uHchsJVd{t6(6S3mR!^XlPhl zuZC)5W|)?z-PQG8*H`^Mjk)8`{k`GuALjQLW4;?>9vB?r$ZMQ`WPJN-44@;M%~C3r zqIf(`(P)&y;V=b*LGt_k7CxVkyk0MPJRWkp-Q;q)EDD7JK_i(=zSDpX5C{ZB3mVFI zI-LZR%VqjVBNB;7EvP3H3fY=a1I`E6;c!r`RuheWzfU^q^}585$D@X5x7$&%ShQL%ZE3oHrVc>|UqSq0{MP*E*TaW;&%zCL?_0;=Egax7($|;UKv<|8lv= z{4@S|Jhs~4Z#ElQFPBTYUavCm^?Ekv?fGx{sOx+_+x*F7B7N2X__#;pp$E5o+$B7P z8~}F(f8kzrU>{yWt=sKZ!}fQzT2U^S6CLED-{`ZBd_FIJ248y!{c5!;eu7uvO8~jh zKpnVCyeIG^-VyKty+`;_HQ?=1sU-NwVK^T rI;w$Zxz#Y{ng0p`3^(H+vYhz#zuJz@P!dKp~(AL>x$gfiO1%0|>*wnp&g(qnNTVc=z<$ z|LuLg;BbVo{{sO?48(_lO>GV+YGC31<=qpweh~Y{q4{7fApOX4*wll>kkx?LAOI6X z=98-*<~MBmVQvN43GyGvzn6DS0@K+1|MJcWkWw%>v>H+YG Bm|Oq= literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Terminal Server.ico b/mRemoteV1/Icons/Terminal Server.ico new file mode 100644 index 0000000000000000000000000000000000000000..c19c6ba6724f072d8c8e98700c21323a73320422 GIT binary patch literal 1150 zcmZWpOH5Ni6dhBHzZi*Bke@9EXbT!q1pm6SiCax53)jlV=)w)S)yTq~3lrl`UAZ*= zt3VM!MHD}6U;C<2qXtufXuB{mxt??T-fN9R&YNLo&Y3&++^I23@K;@J@C}-QDr0Jm zF<}5xm?_Pp(^j*}7{YC-;0j4L`s7uEPo4u)^*(tFB-Z<6%)u!75#S;40Jv9IM!J2C zP~%;N#-yV`9bz1y7ByV{9cU2Nrdmmdsy&UDP8?6cVJy^o0#JtN-En#~a{RBCd1USX4fr8`N>m;qwmmo{(gBZ1iH# z4frIRs#GI)s7F5ZN98NHe-`I;**ZNS_mKzX?+qh{R>^E@);xIp=B4Uuy2CF8CkC#~ z;XceGeYnf>U4Hk5|M`ev;achbJp28znEF9}{2xAYustBw<~sLyNx_RGVsOv?bUY?M zoj6|iMU_tlKTlj6h(@JPN5osdjdgXAw=kivLe7U5y#9au}sM-1vC?m!Iv(D?_|QMN9FJDDEkN>R0DNQ9SixlA~mW*4fmZqb2Myn3C9PmCDb(IrjBYMuhh}E z7Fezt?mJ=qkjosh4z!-(CEtajt5LP+jmE*dz?-+udo`vTKLtmDQ@}}Qd>DNnz@BT| O(+~7kj1OXb#QX()pmV4I literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Test Server.ico b/mRemoteV1/Icons/Test Server.ico new file mode 100644 index 0000000000000000000000000000000000000000..6159d9f8ca52b9ed04119dfb78b42f198e35e1f1 GIT binary patch literal 1150 zcma)6OHWfl7(ET85FS!mQr;lt)hIrz65|UaA`*PCD5eQ(aN)`rOVdPMxFD<)-4KG5 zHl>?lG>A31xCJ%-1rifiCQ4#7#@*+fDRUc}nmEmwJM-Op&YYR=n*t8?bGxDXy}0QF zd;kIpDx@O0xO(X3tpo_uTqj(DBM=-`IHYh;;ebM45$snnVqYFrr>f+i8q_f`dIfy% zfLE$dSLZe8!T6vTT~@cemEM|w4LueLjUw(>Z2GxolV>8GncWaF+HE2n-+qNI?QV!zvp_7 zq~GNDiB}16pLNSbY(jHpeQaA z)qA22HSD{#Ti4_g%wxxBhqMm23TwK4uwLuXPu=-CtwW8{!Bmv)VL*g3qfW_*e)?qU*{=6ITS$ z7I3uuf~QBfh!!sP2?I{bm@P!H3=H{!3=4}_TZzhc_=Qv3ze z-seo7F4N9C8DnJ(sIh?MeV>U*;z0~p z-{^z9>_URU7#Nx6Li64I#^LW%X2`k`HLdT?5Qmc!I@Tae_cLC7F<}@##{U+|*=|pX z{*UT}1+&{6PNj7nt3l#&2YLM^hgS(BYpLJLu^)`(^kBj4d&%rHwi+eRvWJbA9o~9P z`FQ!XU*ijOrgQp0$1kG`1jqietDzAt)Vo!#;oi8rVh%kI^6tN^Ar3s$rUZS7sLVv z4C~IQ8fN>xo&(0L=Fg^U++K7|*Vbagi{{KcMyL zeP`|l^jpMnj%(@?yjPOT=uyurWFKI_m!4M^7>EOVDLy9qI2zUaO6Bq?@QBxlS7-Va V((V>Vi+7l_M|@jBe~0vU(m!v0_kREY literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Web Server.ico b/mRemoteV1/Icons/Web Server.ico new file mode 100644 index 0000000000000000000000000000000000000000..d2aa024d74b24e077f6f1b55a6d1c1e18a5cbfe3 GIT binary patch literal 1150 zcmZ`(OH7kN5MBsA;v*I@_(ptlGA1Totr|~Wj3kIsK}E2L0)n7`1Th#z;X+KjaPXig zVALXlVxUS}`V^H$0U=af z-k4=R_G<_|<91x}>G}IHyX0?m<)EfFN#gOTkEk8U#ORN=GEaAep>eoWVw>Tw`Zd1X zp?!U@6g7PoSu-%%iT+6^K1_BP_;56iXngNCJJ`4n9_3E$8wlU_xmt4mu{!+xJ%RQw zH)LMfy_4`4B@Wf`Km7RAC|W;N$=cifR`FHA-6*89`AWU>unm>|-G6xEwd5)t`!M+3 zOXflSV6NoKy0(aK8o30%Pc}XazSoK_UH4_W1G&d~g_1xViUS*Q-nZr-E%05Qbj?ME zYmR6u-4Tw|7YeKk))Z@-wZ!-fflYFc1-@0t^+c1N79-2ONOZ~iW-jL8I#?I{PFR!7 z!T6HEW)%B3NDcYk6$VF?@MOCqk?l4?-U)HAE?8G7q)Fyrtl+7KLjPLQ<7(+6&$Co` zxSlhfCBzXa99HKn&0)L~-k19?@~=1WG069>6b^nHdERAUF3n+*US_@%rMA&ufrTuG ZEZd0plTRRH&%g1SM6&HO;yo0{t3SNOpy~hs literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/WiFi.ico b/mRemoteV1/Icons/WiFi.ico new file mode 100644 index 0000000000000000000000000000000000000000..8607574599462d1f4c539af6076e08a803670c1e GIT binary patch literal 1150 zcmZuxSxi$w6dm)3YmALlj5`_^)IY!c^1~1J9khsuM5wY=Vl*)oK|}>as36Er*^Du% z#9$CUl)8e(#2N)m#DD~2qScUs5X;x~p8MLSF-~(jxAWdPb7tmDm72mIgF*3kxJn99 zDoiOA!Qdet(Z{)y7CK8Qz~9Pdn5aaHq#|uU6=-`YPuopbv|V&r+ZjL(*O#;%l&x*2 zi;OI78)Y)km(Mvu&?x>#<0@-F#}DX11AK5VXj=tUVewR9hz)2IYWu`TzP3laz)x-!HAr)MhG_`jexJ{*3&Vy2uz! z4pXkwJ&xz}G`&`8uV;c9R;7^p-5_~K#;K>~5k2(r`-Av4<6*jI$_wz{7Pdcj_!be z40KxSWgPsm;h!|g-km8`gtM@lZ?1M@aAw_$av&gVSWEj3G~aW`rfC6H)AgMDBv!S_U|SpF-pGR`tAj17!4 XjC4jCBaxBJFf%ZIj)8YJGGf(Vz+jMx literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/Windows.ico b/mRemoteV1/Icons/Windows.ico new file mode 100644 index 0000000000000000000000000000000000000000..3a9752badb8b0a67faf03481463445e087d33a93 GIT binary patch literal 1150 zcmchVX-HLJ5QfJE+|!J#>?R^nf&`VAShgtsNC`8{g@R1QFhmov&|Gg}q$wdmiltJf z6hxw=5p7yz23Dk!2qsce*Q9KrK-2s5o$G>DQvGQT&zZxV?|oVyl?kG;61p^vN`G|csx z^3cxBhkf09q#JafAskqvFzuktGZkDpN@w~uS~J6WQgnbX0Uo>)p>)$0Hs3U0)-ZVXKa|rFN#hHe7m3LiY%VyZSla*+*bwJ2B^)=jx}mTCPcl&{Y_8i)qs9 zP3KN_6tcc~H_Pi|a4XqGbao7WSt0X#D4*{Q)%10=5!Rx|wKW)v!FXh(81tb*9Ge1( zuGlk2pHgs#eaUAiudOAgx`*KSSA>R_5m}dj{k;g}bs92WhHwpe6l>}~dj{W(H^~0y ztUT0C3~rc)={ zGxPDdt!951guINyVxkHeEk&+}5gg<{v%|(y;GGT53SFwwyBk?(-pfv}1S0C=+1r~< zlHnq`vFkJxm@OW zyR%JRaX`RXl2Evl&$?6|QZ!+w6zK zA$2+(j(58qZMR$6Y&N`iI2?R7&cy--y5Yfv)$8?WG#YWdTrTN!I?;SS=Y6qQWIS)= z16qNHCM@)X_YQx(UTHF!aDF@hd(P*&m z_xta7=*1nxVln1I3{LEu%_aep&1R|9YLTKSRIAk}olaA!RAR&X#o5q{9uTYVFq6qp zGMS`EBtn=4b)L*-Gnq^#G8&CMTUxD_@%OV1d@7Yf2LJ#7 literal 0 HcmV?d00001 diff --git a/mRemoteV1/Icons/mRemote.ico b/mRemoteV1/Icons/mRemote.ico new file mode 100644 index 0000000000000000000000000000000000000000..02b38ac0bfce86bb8589e89cf184c65a102593cf GIT binary patch literal 3750 zcmb`Je{9ru8OPsOde`dxgbIxjvKL%ShYMNV?!pN!^*ANxTu_(VBJifl)vY*-KWS{#SXEEDwwKLBt z|9wjZ0s-X(3zSzhSHWP=>(PP*3sg~2Az!s4)zzq?(oscCwJMg@D9})=;x(LWYm*$u zQEhFlsv1@*91g3ou~AJ;O{(Z(;H>v15m#(Wr6`?3OR_tcv5`RPDaqTK3&%Grc<* zmxhjb{R{qSQ01e)(DKyJ)i(CJHl97LzPDc2!Gi}CkH>ZV_;C#m4r*vT?WN8kOX#PT)SH%?)R&^K>XlYT zrRKQwC9^j}U(dn}{_=ntd+G5X)2e*^tH)AZHo+j^zGsPs%+8W@yLqJK3l_8HPy z^nXVGH}ro;e;NJNY5MwVskdE6wuT3m89&=)RbOD>Q$Mds#ILdHK^4ZQJd2Glq}RI3rA&< zZ_8qbWr>$$$=}IRQ~j%#gMKyoC((Zi{T}oK=#QcQ3Ho25A4bnJ6K|s*N1vX2ey!^D zX(~KTh5c0Ew&^q#{z`>($nFU`bFqhpl?OL3H=WAyU~9K z{SQN?AB9aXM@+BAOd|=?+eyxj0pHcGs2%6EGt~_$h?vz)S3VIqq)AK73CER7k^~! zC;a}J>c@SW8(viRp=HZk*ZBO6HI7v9v5z(^t*`BBThp|rk*4RbUj6Y^D?hxkyR)OU zDGyVhL*#@uw)z8~Y+fRt-;2_XUCk})Iv?}pW_CNjlW1=&&du)UQG%WM@7}NDR80%a z>aO?w|N87g&kyeNtE;PP@#4jp>iYxr?I6lcaIXR3KoZKA}C*zC^TpzxODX~zQw z$=o7{VhVp?kVY~`^icQtIp1L>%bL6)2AYN%IL zP*8B1*E6ttsO4&0EpGW9ZM4}eS4-;*DrdD^E$?A~YLIH6YOrd+YS3!nYVc|RJ9#eL z5CdA{9(h`>rU9-&u7R$>t^uz>uYs?@uK}=ezs-Ff3>y#|6q~CB1p{P*WCLY`Wdmk| zW&>w~F@sBkEw2Vl8&Dfmds=#6fNhX%plz^iz-`cN;BD}20B#U&Anw%y5`%L0pD}L% zxW@G_A1_5<_=iJsQozq>ccH@Kf#!2-+R?-_vM0EPt^9$?UI zxIpIJIRp1>?zJ*@;2DCa!4eElFlaYi!8<> - - + + diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb index adcbae33..f428d743 100644 --- a/mRemoteV1/My Project/Resources.Designer.vb +++ b/mRemoteV1/My Project/Resources.Designer.vb @@ -834,6 +834,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Portable Edition. + ''' + Friend ReadOnly Property strPortableEdition() As String + Get + Return ResourceManager.GetString("strPortableEdition", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Released under the GNU General Public License (GPL). ''' diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx index 111bfc7c..3d8d7c38 100644 --- a/mRemoteV1/My Project/Resources.resx +++ b/mRemoteV1/My Project/Resources.resx @@ -487,4 +487,7 @@ Do not show this message again. + + Portable Edition + \ No newline at end of file diff --git a/mRemoteV1/UI/UI.Window.About.vb b/mRemoteV1/UI/UI.Window.About.vb index 81a50059..f301a417 100644 --- a/mRemoteV1/UI/UI.Window.About.vb +++ b/mRemoteV1/UI/UI.Window.About.vb @@ -56,6 +56,7 @@ Namespace UI ' Me.lblEdition.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lblEdition.BackColor = System.Drawing.Color.Black + Me.lblEdition.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblEdition.ForeColor = System.Drawing.Color.White Me.lblEdition.Location = New System.Drawing.Point(512, 112) Me.lblEdition.Name = "lblEdition" @@ -243,10 +244,15 @@ Namespace UI End Sub Private Sub ApplyEditions() +#If PORTABLE Then + lblEdition.Text = My.Resources.strPortableEdition + lblEdition.Visible = True +#Else If App.Editions.Spanlink.Enabled Then lblEdition.Text = "Spanlink Communications" lblEdition.Visible = True End If +#End If End Sub Private Sub FillLinkLabel(ByVal llbl As LinkLabel, ByVal Text As String, ByVal URL As String) diff --git a/mRemoteV1/confConsNew.xml b/mRemoteV1/confConsNew.xml index 670b316e..6ab6e5cf 100644 --- a/mRemoteV1/confConsNew.xml +++ b/mRemoteV1/confConsNew.xml @@ -1,2 +1,2 @@  - \ No newline at end of file + \ No newline at end of file diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj index 6e3c2058..5c6dc8c1 100644 --- a/mRemoteV1/mRemoteV1.vbproj +++ b/mRemoteV1/mRemoteV1.vbproj @@ -68,6 +68,25 @@ false x86 + + true + bin\Release Portable\ + true + 41999,42016,42017,42018,42019,42032,42036 + None + x86 + PORTABLE + + + true + true + true + bin\Debug Portable\ + 41999,42016,42017,42018,42019,42032,42036 + full + x86 + PORTABLE + False @@ -92,6 +111,7 @@ False References\MagicLibrary.dll + True False @@ -583,9 +603,9 @@ PreserveNewest - - - + + + PreserveNewest @@ -618,8 +638,8 @@ - - + + @@ -685,7 +705,7 @@ - + @@ -696,11 +716,95 @@ - - + + PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest +