From c371187edcc407ae7a1927ceefc1fa3c3220adf5 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 6 Jun 2016 09:21:03 +0200 Subject: [PATCH] File names simplified & UI development continues... --- EAPMethods/EAPTTLS/EAPTTLS.vcxproj | 14 +- EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters | 28 +- EAPMethods/EAPTTLS/StdAfx.h | Bin 2604 -> 2572 bytes EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj | 47 +- .../EAPTTLSUI/EAPTTLSUI.vcxproj.filters | 89 +- EAPMethods/EAPTTLSUI/StdAfx.h | Bin 3160 -> 3100 bytes EAPMethods/include/{EAPMethods.h => EAP.h} | Bin 102918 -> 102912 bytes .../include/{EAPSerialize.h => EAPSerial.h} | Bin EAPMethods/include/EAPTLSUI.h | Bin 3684 -> 0 bytes .../include/{EAPMethodsUI.h => EAP_UI.h} | Bin 15138 -> 18728 bytes EAPMethods/include/PAP.h | Bin 7152 -> 7138 bytes EAPMethods/include/{EAPTLS.h => TLS.h} | Bin 11268 -> 11248 bytes EAPMethods/include/TLS_UI.h | Bin 0 -> 10596 bytes EAPMethods/include/{EAPTTLS.h => TTLS.h} | Bin 13828 -> 13802 bytes EAPMethods/include/{EAPTTLSUI.h => TTLS_UI.h} | Bin 10580 -> 11310 bytes EAPMethods/res/wxEAPMethods.cpp | 72 - EAPMethods/res/wxEAPMethods.fbp | 436 ----- EAPMethods/res/wxEAPMethods.h | 67 - EAPMethods/res/wxEAP_UI.cpp | 199 ++ EAPMethods/res/wxEAP_UI.fbp | 1657 +++++++++++++++++ EAPMethods/res/wxEAP_UI.h | 124 ++ EAPMethods/res/{wxEAPTLS.cpp => wxTLS_UI.cpp} | 31 +- EAPMethods/res/{wxEAPTLS.fbp => wxTLS_UI.fbp} | 106 +- EAPMethods/res/{wxEAPTLS.h => wxTLS_UI.h} | 18 +- .../res/{wxEAPTTLS.cpp => wxTTLS_UI.cpp} | 14 +- .../res/{wxEAPTTLS.fbp => wxTTLS_UI.fbp} | 10 +- EAPMethods/res/{wxEAPTTLS.h => wxTTLS_UI.h} | 15 +- EAPMethods/res/wxpass.cpp | 74 - EAPMethods/res/wxpass.fbp | 728 -------- EAPMethods/res/wxpass.h | 55 - EAPMethods/src/{EAPMethods.cpp => EAP.cpp} | Bin EAPMethods/src/EAPMethodsUI.cpp | Bin 3658 -> 0 bytes EAPMethods/src/EAPTLSUI.cpp | Bin 5394 -> 0 bytes EAPMethods/src/EAP_UI.cpp | Bin 0 -> 8434 bytes EAPMethods/src/{MainUI.cpp => Main_UI.cpp} | Bin EAPMethods/src/{EAPTLS.cpp => TLS.cpp} | Bin EAPMethods/src/TLS_UI.cpp | Bin 0 -> 18972 bytes EAPMethods/src/{EAPTTLS.cpp => TTLS.cpp} | Bin 12120 -> 12474 bytes EAPMethods/src/{EAPTTLSUI.cpp => TTLS_UI.cpp} | Bin 10204 -> 14298 bytes 39 files changed, 2201 insertions(+), 1583 deletions(-) rename EAPMethods/include/{EAPMethods.h => EAP.h} (99%) rename EAPMethods/include/{EAPSerialize.h => EAPSerial.h} (100%) delete mode 100644 EAPMethods/include/EAPTLSUI.h rename EAPMethods/include/{EAPMethodsUI.h => EAP_UI.h} (78%) rename EAPMethods/include/{EAPTLS.h => TLS.h} (99%) create mode 100644 EAPMethods/include/TLS_UI.h rename EAPMethods/include/{EAPTTLS.h => TTLS.h} (98%) rename EAPMethods/include/{EAPTTLSUI.h => TTLS_UI.h} (90%) delete mode 100644 EAPMethods/res/wxEAPMethods.cpp delete mode 100644 EAPMethods/res/wxEAPMethods.fbp delete mode 100644 EAPMethods/res/wxEAPMethods.h create mode 100644 EAPMethods/res/wxEAP_UI.cpp create mode 100644 EAPMethods/res/wxEAP_UI.fbp create mode 100644 EAPMethods/res/wxEAP_UI.h rename EAPMethods/res/{wxEAPTLS.cpp => wxTLS_UI.cpp} (68%) rename EAPMethods/res/{wxEAPTLS.fbp => wxTLS_UI.fbp} (88%) rename EAPMethods/res/{wxEAPTLS.h => wxTLS_UI.h} (77%) rename EAPMethods/res/{wxEAPTTLS.cpp => wxTTLS_UI.cpp} (87%) rename EAPMethods/res/{wxEAPTTLS.fbp => wxTTLS_UI.fbp} (98%) rename EAPMethods/res/{wxEAPTTLS.h => wxTTLS_UI.h} (72%) delete mode 100644 EAPMethods/res/wxpass.cpp delete mode 100644 EAPMethods/res/wxpass.fbp delete mode 100644 EAPMethods/res/wxpass.h rename EAPMethods/src/{EAPMethods.cpp => EAP.cpp} (100%) delete mode 100644 EAPMethods/src/EAPMethodsUI.cpp delete mode 100644 EAPMethods/src/EAPTLSUI.cpp create mode 100644 EAPMethods/src/EAP_UI.cpp rename EAPMethods/src/{MainUI.cpp => Main_UI.cpp} (100%) rename EAPMethods/src/{EAPTLS.cpp => TLS.cpp} (100%) create mode 100644 EAPMethods/src/TLS_UI.cpp rename EAPMethods/src/{EAPTTLS.cpp => TTLS.cpp} (97%) rename EAPMethods/src/{EAPTTLSUI.cpp => TTLS_UI.cpp} (69%) diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj index a3f0d25..e0a9c94 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj @@ -79,18 +79,18 @@ - - - - + + + + - - - + + + diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters index fb406e4..6359577 100644 --- a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters +++ b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters @@ -18,10 +18,7 @@ Header Files - - Header Files - - + Header Files @@ -30,10 +27,13 @@ Header Files - + Header Files - + + Header Files + + Header Files @@ -44,16 +44,16 @@ Source Files - - Source Files - - - Source Files - Source Files - + + Source Files + + + Source Files + + Source Files @@ -63,7 +63,7 @@ - + Source Files diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/EAPTTLS/StdAfx.h index f08fbf8ab60bbaa1624ab683af0ffcec69d4b174..25861be55d4ba3c9d68916f4ed626b76cb4507be 100644 GIT binary patch delta 42 qcmZ1@(j&5A3ftsGY;Hho!WzQh!w@`qA)6_C2m_35y?GUT6B7U*bquWl delta 62 zcmeAXStGJx3LCF4Ln=cFLk2@WLkdIjWPf(+$>-R3STh-_7*fGJK6b0geQa!uA(MH5 MazNJRF7_rS02nS1&j0`b diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index a60e218..0de4b61 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -79,32 +79,30 @@ - - - - - + + + + + - - - + + - - + + - - - - - - - - - + + + + + + + + - - + + Create Create @@ -125,10 +123,9 @@ - - - - + + + diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters index fe235d7..6a0781e 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters @@ -27,78 +27,72 @@ Header Files - - Header Files - - - Header Files - - + Header Files Header Files - - Header Files\wx - - - Header Files\wx - - + Header Files - + Header Files - + + Header Files\wx + + + Header Files\wx + + + Header Files\wx + + Header Files - - Header Files\wx + + Header Files - - Header Files\wx + + Header Files Source Files - - Source Files - - - Source Files - - - Source Files - Source Files - + + Source Files\wx + + + Source Files\wx + + + Source Files\wx + + Source Files - + Source Files - - Source Files\wx - - - Source Files\wx - - + Source Files - - Source Files\wx + + Source Files - - Source Files\wx + + Source Files - + + Source Files + + Source Files @@ -111,16 +105,13 @@ Source Files - + Resource Files\wx - + Resource Files\wx - - Resource Files\wx - - + Resource Files\wx diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h index 6f68a58cf2526a3f9bab1150b8fda0ca76d54fd9..fae4a7699cfec04b3c73cbbdc9e3c9f300718462 100644 GIT binary patch delta 118 zcmca1F-Ky{g8Nll9rXfh?2B4jfkOAq+kY!3-cV%gJ^eHk=_02od|q$2dxm wRA^4tMs~$rJgWYu9WJdMo1diMYbHY#Lu#`w$97!~#><@mVDSf! diff --git a/EAPMethods/include/EAPSerialize.h b/EAPMethods/include/EAPSerial.h similarity index 100% rename from EAPMethods/include/EAPSerialize.h rename to EAPMethods/include/EAPSerial.h diff --git a/EAPMethods/include/EAPTLSUI.h b/EAPMethods/include/EAPTLSUI.h deleted file mode 100644 index 3a6b62425e697561fc0a403674e2c6d85a354a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3684 zcmb`KZEqV@5QXP668~WZ5~LNic@caFQKi&0p;Bn0CRNC%$S>=};A|{=(@-J!fBY%n zIWxZ5yRH+Q3a#SZy*qd2%$alN-u&}-*B;x)_K_9Kt7lg>vv)SPiJjYp)r@~_U)opp ztvy*jeaG0YU0P`atQH&2*Q|Z}ikC8y#2kC^j%D%u?>A5KbW&PIg zi{PcQGwir*63}@U6P0sHzrdMjBN;24r8rlK3BUpE^UKlRU!{dx7eIv{zL1m>F6Hr`%6?dd(H9;?%xp zOx}e->?>O79OuX;Xl6#N3EzY}G(2~fYUfE6$m9QH&xz6lK}6cMXCOLoRKgJo-t+gD z*dB370k4=Pv{Igs9%IoXhXa4p=o>~4u{&Z`2fKo&P*m`kqxdjYkC*7QzNFTIoJ*ML zdleRI*8ize?w-e_pR#pLr~{gYvpR~oZ~swc6}c! zU{^h^!oGGTNmoL=LnbxXj6T)ny78-n&kB`vu%GkXbxkxKVZq4LB|ndO7ApOHO6C>$ zPMIq%3;TrX?NY~MDtp9?3r6m;?C`zom5~1%`|Xaony(n@O6p6imfCA7^3_grh?V-> zlohaUUXK`3Uk{~e|9Eac`&+Dm3TA%5gESHI1N#h=eY{`ttEwvJ@*Wm;9Ag(m(n94t zJiWD-PjMeS##7PCJv5YZy7uU)i>WWC9NV5A&QamJRnzB(8?*Zi4APVk{O-TGmu(+O zXMrZy_DDe$#Lfb~=O}2%UG+_CXtVs=K7}WZY^IYfvgrGI*j`pElynA~spI*K@iEoc zjw7EZuKE$!Z#eZtJ=9O6o=2H(q#CWi(lb+sZS(TqaWCy`8C(54UBTxL@3G46Q%jo< ztyZxuB->;+Vc(Im=iaR%n)bvRrJr+;s7*YnzWLh0PwZaGUgsbwRW{mR+rDKn_Sxbo zt)7&TSbf2$)S&av+3m{7^G?>yy+PKjd+omANxA=#)kE)%7UQX4CsVhWIW{rb^qI6@ z^vSCR+Y|3`q1G!H>-z~x*(P3eW>a)^5HXT=^yW;E^fQ8A?LD8nmG&ZT`$mr|_J%W_^4%d6nQEM`@D%O+_(@%_K`OM- zEv1O$r(LgtowCU-&Z$z3cGcDXn9h|sZ}+qD76!F$uZf}4=AYijHdoHpN?&XKcW8IC Q%~@RSEbFl-tF(gu1w(K?Hvj+t diff --git a/EAPMethods/include/EAPMethodsUI.h b/EAPMethods/include/EAP_UI.h similarity index 78% rename from EAPMethods/include/EAPMethodsUI.h rename to EAPMethods/include/EAP_UI.h index caa663dd3fa93e02f95d8d82b367a6a9ef53ff7a..14f91e1d18dbcc34599dc4bb56f04e2fd3d656a3 100644 GIT binary patch delta 1886 zcmcgtOHWf#5S}X33zU>c+FBmrBHFY-E7%sL^$|k_nxH~JjTU!C#r)mG&oz6^0HtW2W+*|kd|Ml;8l_3><21MSR+UC)VC|H6Gv-RtxvETUvE8+=`~-yMqw!dTM;}b zX$~RI7I_#}Ax=Xcr!=`0^bmz$VZQig_0ClfzYjI@R#iiu24@5}Gq9hgI|_dW5lG;1 zuJ7*Wm##X~1K#jB_Pfc$V>Qiu&1&h;6`Bn6h49};F1X7z|6}}hWz-q*ZwC+ar>-Vj zfn0;y1l2ym$M)J{l+o>aH8klw(W!^+ZKigCj0Pvxrmw9&fzhDjtY8`S+}6r< zcI`?*;zf%amUer%yu&;sTB8cx6!2&8+tqeMQs{p1>M-5s4&%uXH+V3gaq8)4b5#%S!>X_>@`<-vEzN!a8P5 zTHVWl37HoKz9w*9TnoZqm};q-S6$9Cf4)Dc*hv1`#&~HzoCO-0WD7J7Ji?dJ4H97z zKcmrhSm(+<`^P|>;(*o48;t^n|;~7GfuwXsK#o| zz{|ijIo8d8GZ*JBrODrHq$UTLNljkI&9-@s&N;TpQf5MvkJu}0PO#d+IJwTTVv>{H g-b(JT7ux6Wlz+Ppugo^+x0OXfT5Zh)2whN*FBvb^) delta 26 hcmaE4{=s~M5F4*ALn=cFLk2@WLkdIjW2bur? diff --git a/EAPMethods/include/EAPTLS.h b/EAPMethods/include/TLS.h similarity index 99% rename from EAPMethods/include/EAPTLS.h rename to EAPMethods/include/TLS.h index ff29c4676ca97ffe68f6844ac133a69acd899f72..1dda441b90e10f391fd7c4cf90f67d042c5dcc1b 100644 GIT binary patch delta 16 XcmZpP_z=E9h;6b0o5AKVwsooiHY5eN delta 36 rcmewm-V(7vh>h2mA(f$oA%h{GA%&rMvLKrwYbHY#L+WNnw)Lt2zak04 diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h new file mode 100644 index 0000000000000000000000000000000000000000..e1dbd7e824b947846660047c3b7ecc94a9ad6560 GIT binary patch literal 10596 zcmeHMZEqVz5Z=#7{D)JKiW^az7r}=RBDKy-Be_m!TtYrsc6?3@j&0da(o(_y<4*z4 zGjo&Ovwe4V2oMG96yM$6?7TiRJG=SwkBZxHAG?oSlw4IebR+lPja|>3y9+nP_?PZ; z_l5h~Jx`v#!PpCT>0;Lg)nv)}oVD+M$IQBG$ed7a1G2~~a$Vf};2kCJBiDj9)MJQm zA&(j;2JUB9p5x}_7>#l3f>$iuC&F*)ZiIjAHo^Nn#;$Nb!`J|K(so3Tsd%J~uhT>~ zYDB7zt6v=2l?ucW6{9-BXWBfQLS6hw1>BW z`wYBdv5gkc>T9`AlJAlG3S((o(pr)O{S|6cg68z6`k!2hLX-In@ANdi+84@2l2<{& zqL|W4#1o^U(YX*UG)@`{*^mKR2!JV zEI7se1W#{pX;z%NZ!t#h)Pdfov{-x`YSsg0Mv&FRH|nhz9*dWz;wMHRl>gf8LP`}H zsH7L}B{ZsuR@6fgyeIE<&>rI=0uC{Y+7fxxv;m4LY^cc_N8e)f2z1AoRR&#zCqB&1i*uvi#X0i6o z;`c6EhgLIlnLFp;Y_VNj$0B%_HEsahsL(Y>-nlipuBnISs@S*E734O6xemu z9Eb*;ul9|gWeeOd@ymG9+BnDlEzz+8jfjGQ*s`7B2cx|PZ{}bJcUE%xPUlbu{xMSO zb$yCbUQooDAFf1Wt9h*A=9e_5)%_aD+U8e^F(r_ z1Kn@XBWXNXeTcYc0oI5#W@{{#u^y-Wat%K0U#=iuSBxR(`P7hz(=%Pn9^c})f$yR8 z(yctRd3By#=ZDCK#eC_{B0Gxxcj=mm54nojrMTD;utmLd1%9|7#6UN&rhgn2)9AK2F zX4lumY<&yuHfn$On)#Z?oOWtSAz0$U|puxkq4p2J?+ z$*dc~V=d_$X|4H%ohqek^s#aoc$H^ogIg+F4X>v)|zU zfV-Ix+1@*bjnzC;!kSsd#g484^rcruMWn?ztW+j#UcRC04K$^;TJ;%gdb~Vxe7&Tc>=kQyFV0q$#kx>haR&bY&-t!F`)O(a>VKhbxX?)M;L)(kCue9u98~stpaT%T14(UNa2Y>4VOhA zl$7rU-4*FNr4ls1X-z(tWi9Z$6`#dcNA4-SsnunCC!1K^S>wn<&z|O^ns41~rJ}Wm zsr6w48KS$t7#YHojL^~#cqbm%9gdOn%=;L5w5$(G=uAy}Mm0kHp~m@I8@|&u!25#u z^ytm!HS2*kVxrycEO)IBVgDIHdp+Ho@2azN!nB|5o-LAT?Jf6g6=IHZO=eerSIcH4 zXZP#*5>~Z@XP4~ZeHHpAtSR0p6vu}B?HIYGnA&sSW8J8)fGXA)_FL>udB$d#@_b9F zJYwD*gPy0>+Iu}s5X|0OPc3;u`3p4Sj*mTTQ>vz(EpyK||DCAp-0lY(nEMWMt0IT{ zw+-k(nR@0&9rDnvGHf@qxK1}=sh;^|)$5{N8u>0>3Aj(utk!dqzt^c)Oo?#6cFguC zMwPAwx?29beMz<^wi+6$8OPbKXPJJaSOR?&c4Fys0`EoB#OlMt=tHvYd+7Z~p620d z%*bccKK_0q+xB&z;ZNz-eMa7nCA%M-?V8qohV>!qJ|p`?#A=eB(XzWKI$^XKHS~C- ze>lBIwnq2egA_}89KA@koncSXPmr)Bc$n{wx22cY-uS;gDJjP8{Jy7n&i|)#$-~3? oq{RNuxb9#ceg|VUYx$Enu62+5%*1@MOdY?^la%G;W}UD61y^}PVgLXD literal 0 HcmV?d00001 diff --git a/EAPMethods/include/EAPTTLS.h b/EAPMethods/include/TTLS.h similarity index 98% rename from EAPMethods/include/EAPTTLS.h rename to EAPMethods/include/TTLS.h index beeefce3e51d90d2be4f4842205ce7088223b4c5..18595fd1e941df615ab6864ebdfba3db2930fff4 100644 GIT binary patch delta 20 acmZq4d6m6Eh;6b0n*k8ZZLVVL(gy%fHwL-@ delta 40 ucmaEr-IB9Gh>h2mA(f$oA%h{GA%&rMvLKrwYbHY#Ln@G^x;cTZOCJF0?FzU6 diff --git a/EAPMethods/include/EAPTTLSUI.h b/EAPMethods/include/TTLS_UI.h similarity index 90% rename from EAPMethods/include/EAPTTLSUI.h rename to EAPMethods/include/TTLS_UI.h index 5e23d1cd68f0e8d3b5c48f67d5ca41520222210d..f04ca7343ab3e04d22478d02a53e41f85882760d 100644 GIT binary patch delta 537 zcmah`Jxc>Y6r8iT^CN)}6i;Fi;zj&8w*RVoQ2Y~9Mx#Cs(MAgmbW!g=8xOM*m@(&olp>QfX`_lJd>o-hT;Qq0RiVC( zIu)0w3mX|Yh+C(MBh#VU!8!6&e4-XS zrs(2~jKba^w~G}7;r$f7Y6$v0YjGq|{_4Cz()}Jp?owCMG)?VNUQ%R delta 135 zcmZ1%aV2O24;!m1gCj%0WNtQHUSEb(h7yJhhJ1z;hT_SVY}S)&G&m-Uu*pr1VUw85 z$EE_Lg?I}X5*dntP!Fh5X|g0~|jeVY|HPRUHZr)jY{OYH - -#include "wxEAPMethods.h" - -/////////////////////////////////////////////////////////////////////////// - -wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* sz_content; - sz_content = new wxBoxSizer( wxVERTICAL ); - - m_banner = new wxEAPBannerPanel( this ); - - sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); - - m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); - - sz_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); - - m_buttons = new wxStdDialogButtonSizer(); - m_buttonsOK = new wxButton( this, wxID_OK ); - m_buttons->AddButton( m_buttonsOK ); - m_buttonsCancel = new wxButton( this, wxID_CANCEL ); - m_buttons->AddButton( m_buttonsCancel ); - m_buttons->Realize(); - - sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); - - - this->SetSizer( sz_content ); - this->Layout(); - sz_content->Fit( this ); - - this->Centre( wxBOTH ); -} - -wxEAPConfigBase::~wxEAPConfigBase() -{ -} - -wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - this->SetMinSize( wxSize( -1,48 ) ); - - wxBoxSizer* sc_content; - sc_content = new wxBoxSizer( wxVERTICAL ); - - m_product_name = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); - m_product_name->Wrap( -1 ); - m_product_name->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); - - sc_content->Add( m_product_name, 0, wxALL|wxEXPAND, 5 ); - - - this->SetSizer( sc_content ); - this->Layout(); - sc_content->Fit( this ); -} - -wxEAPBannerPanelBase::~wxEAPBannerPanelBase() -{ -} diff --git a/EAPMethods/res/wxEAPMethods.fbp b/EAPMethods/res/wxEAPMethods.fbp deleted file mode 100644 index 6ee7834..0000000 --- a/EAPMethods/res/wxEAPMethods.fbp +++ /dev/null @@ -1,436 +0,0 @@ - - - - - ; - C++ - 1 - source_name - 0 - 0 - . - UTF-8 - table - wxEAPMethods - 1000 - none - 1 - EAPMethods - - . - #include <StdAfx.h> - 1 - 1 - 1 - 1 - UI - 1 - 1 - - 0 - wxAUI_MGR_DEFAULT - - wxBOTH - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - wxEAPConfigBase - - - wxDEFAULT_DIALOG_STYLE - ; - EAP Method Configuration - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sz_content - wxVERTICAL - none - - 5 - wxEXPAND|wxBOTTOM - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - wxEAPBannerPanel - 1 - m_banner = new wxEAPBannerPanel( this ); - - 1 - wxEAPBannerPanel *m_banner; - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - class wxEAPBannerPanel; - - 0 - - - 0 - - 1 - m_banner - 1 - - - protected - 1 - - Resizable - - 1 - -1,-1 - ; ../include/EAPMethodsUI.h - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 1 - - 1 - 1 - 1 - 1 - - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_providers - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_buttons - protected - - - - - - - - - - - - - - 0 - wxAUI_MGR_DEFAULT - wxSYS_COLOUR_WINDOW - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - -1,48 - wxEAPBannerPanelBase - - -1,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sc_content - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - ,90,90,14,70,0 - 0 - 0 - wxID_ANY - - - 0 - - - 0 - - 1 - m_product_name - 1 - - - protected - 1 - - Resizable - 1 - - wxALIGN_RIGHT - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EAPMethods/res/wxEAPMethods.h b/EAPMethods/res/wxEAPMethods.h deleted file mode 100644 index 9e5a37f..0000000 --- a/EAPMethods/res/wxEAPMethods.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXEAPMETHODS_H__ -#define __WXEAPMETHODS_H__ - -#include -#include -#include -class wxEAPBannerPanel; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPConfigBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPConfigBase : public wxDialog -{ - private: - - protected: - wxEAPBannerPanel *m_banner; - wxNotebook* m_providers; - wxStdDialogButtonSizer* m_buttons; - wxButton* m_buttonsOK; - wxButton* m_buttonsCancel; - - public: - - wxEAPConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Method Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPConfigBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPBannerPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxEAPBannerPanelBase : public wxPanel -{ - private: - - protected: - wxStaticText* m_product_name; - - public: - - wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); - ~wxEAPBannerPanelBase(); - -}; - -#endif //__WXEAPMETHODS_H__ diff --git a/EAPMethods/res/wxEAP_UI.cpp b/EAPMethods/res/wxEAP_UI.cpp new file mode 100644 index 0000000..d6cbab5 --- /dev/null +++ b/EAPMethods/res/wxEAP_UI.cpp @@ -0,0 +1,199 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "wxEAP_UI.h" + +/////////////////////////////////////////////////////////////////////////// + +wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + this->SetExtraStyle( wxWS_EX_VALIDATE_RECURSIVELY ); + + wxBoxSizer* sz_content; + sz_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_providers = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); + + sz_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 ); + + m_buttons = new wxStdDialogButtonSizer(); + m_buttonsOK = new wxButton( this, wxID_OK ); + m_buttons->AddButton( m_buttonsOK ); + m_buttonsCancel = new wxButton( this, wxID_CANCEL ); + m_buttons->AddButton( m_buttonsCancel ); + m_buttons->Realize(); + + sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( sz_content ); + this->Layout(); + sz_content->Fit( this ); + + this->Centre( wxBOTH ); +} + +wxEAPConfigBase::~wxEAPConfigBase() +{ +} + +wxEAPBannerPanelBase::wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + this->SetMinSize( wxSize( -1,48 ) ); + + wxBoxSizer* sc_content; + sc_content = new wxBoxSizer( wxVERTICAL ); + + m_product_name = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_product_name->Wrap( -1 ); + m_product_name->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); + + sc_content->Add( m_product_name, 0, wxALL|wxEXPAND, 5 ); + + + this->SetSizer( sc_content ); + this->Layout(); + sc_content->Fit( this ); +} + +wxEAPBannerPanelBase::~wxEAPBannerPanelBase() +{ +} + +wxCredentialsConfigPanelBase::wxCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_credentials; + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_credentials_vert; + sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); + + m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Manage your credentials to identify you during the connection attempt."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 446 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + m_allow_save = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("Allow credentials to be &remembered in Credential Manager"), wxDefaultPosition, wxDefaultSize, 0 ); + m_allow_save->SetHelpText( _("Check if you would like to allow saving credentials to Windows Credential Manager") ); + + sb_credentials_vert->Add( m_allow_save, 0, wxALL, 5 ); + + wxBoxSizer* sb_cred_store_btn; + sb_cred_store_btn = new wxBoxSizer( wxHORIZONTAL ); + + m_cred_store_set = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_cred_store_set->SetToolTip( _("Adds a new certificate authority from the file to the list") ); + + sb_cred_store_btn->Add( m_cred_store_set, 0, wxRIGHT|wxLEFT, 5 ); + + m_cred_store_clear = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Clear Credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cred_store_clear->SetToolTip( _("Removes selected certificate authorities from the list") ); + + sb_cred_store_btn->Add( m_cred_store_clear, 0, wxLEFT, 5 ); + + + sb_credentials_vert->Add( sb_cred_store_btn, 0, wxALIGN_RIGHT|wxALL, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + sb_credentials->Add( sb_credentials_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_credentials ); + this->Layout(); + + // Connect Events + m_allow_save->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnAllowSave ), NULL, this ); + m_cred_store_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsSet ), NULL, this ); + m_cred_store_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsClear ), NULL, this ); +} + +wxCredentialsConfigPanelBase::~wxCredentialsConfigPanelBase() +{ + // Disconnect Events + m_allow_save->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnAllowSave ), NULL, this ); + m_cred_store_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsSet ), NULL, this ); + m_cred_store_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsClear ), NULL, this ); + +} + +wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_credentials; + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Session Credentials") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_credentials_vert; + sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); + + m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID and password."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 446 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + wxGridSizer* sb_credentials_tbl; + sb_credentials_tbl = new wxGridSizer( 0, 2, 0, 0 ); + + m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_identity_label, 1, wxEXPAND, 5 ); + + m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); + + sb_credentials_tbl->Add( m_identity, 2, wxEXPAND, 5 ); + + m_password_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_password_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_password_label, 1, wxEXPAND, 5 ); + + m_password = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); + m_password->SetToolTip( _("Enter your password here") ); + + sb_credentials_tbl->Add( m_password, 2, wxEXPAND, 5 ); + + + sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); + + m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember my credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_remember->SetHelpText( _("Check if you would like to save the credentials to Windows Credential Manager") ); + + sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); + + + this->SetSizer( sb_credentials ); + this->Layout(); +} + +wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase() +{ +} diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp new file mode 100644 index 0000000..17af4a3 --- /dev/null +++ b/EAPMethods/res/wxEAP_UI.fbp @@ -0,0 +1,1657 @@ + + + + + ; + C++ + 1 + source_name + 0 + 0 + . + UTF-8 + connect + wxEAP_UI + 1000 + none + 1 + wxEAP_UI + + . + #include <StdAfx.h> + 1 + 1 + 1 + 1 + UI + 1 + 1 + + 0 + wxAUI_MGR_DEFAULT + + wxBOTH + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + wxEAPConfigBase + + + wxDEFAULT_DIALOG_STYLE + ; + EAP Method Configuration + + wxWS_EX_VALIDATE_RECURSIVELY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sz_content + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + wxEAPBannerPanel + 1 + m_banner = new wxEAPBannerPanel( this ); + + 1 + wxEAPBannerPanel *m_banner; + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + class wxEAPBannerPanel; + + 0 + + + 0 + + 1 + m_banner + 1 + + + protected + 1 + + Resizable + + 1 + -1,-1 + ; ../include/EAP_UI.h + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_providers + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_buttons + protected + + + + + + + + + + + + + + 0 + wxAUI_MGR_DEFAULT + wxSYS_COLOUR_WINDOW + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + -1,48 + wxEAPBannerPanelBase + + -1,-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sc_content + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + ,90,90,14,70,0 + 0 + 0 + wxID_ANY + + + 0 + + + 0 + + 1 + m_product_name + 1 + + + protected + 1 + + Resizable + 1 + + wxALIGN_RIGHT + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxCredentialsConfigPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Client Credentials + + sb_credentials + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + sb_credentials_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Icon Resource; ; [32; 32] + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_credentials_icon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_credentials_vert + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Manage your credentials to identify you during the connection attempt. + + 0 + + + 0 + + 1 + m_credentials_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + Check if you would like to allow saving credentials to Windows Credential Manager + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Allow credentials to be &remembered in Credential Manager + + 0 + + + 0 + + 1 + m_allow_save + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnAllowSave + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + + sb_cred_store_btn + wxHORIZONTAL + none + + 5 + wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Set Credentials... + + 0 + + + 0 + + 1 + m_cred_store_set + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Adds a new certificate authority from the file to the list + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCredentialsSet + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Clear Credentials + + 0 + + + 0 + + 1 + m_cred_store_clear + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Removes selected certificate authorities from the list + + wxFILTER_NONE + wxDefaultValidator + + + + + OnCredentialsClear + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxPasswordCredentialsPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Session Credentials + + sb_credentials + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + + sb_credentials_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Icon Resource; ; [32; 32] + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_credentials_icon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_credentials_vert + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Please provide your user ID and password. + + 0 + + + 0 + + 1 + m_credentials_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 2 + 0 + + sb_credentials_tbl + none + 0 + 0 + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + User ID: + + 0 + + + 0 + + 1 + m_identity_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 2 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_identity + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Enter your user name here (user@domain.org, DOMAINUser, etc.) + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Password: + + 0 + + + 0 + + 1 + m_password_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 2 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_password + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_PASSWORD + + 0 + Enter your password here + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + Check if you would like to save the credentials to Windows Credential Manager + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Remember my credentials + + 0 + + + 0 + + 1 + m_remember + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h new file mode 100644 index 0000000..b26b12f --- /dev/null +++ b/EAPMethods/res/wxEAP_UI.h @@ -0,0 +1,124 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __WXEAP_UI_H__ +#define __WXEAP_UI_H__ + +#include +#include +#include +class wxEAPBannerPanel; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPConfigBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPConfigBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxNotebook* m_providers; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsOK; + wxButton* m_buttonsCancel; + + public: + + wxEAPConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Method Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPConfigBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPBannerPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPBannerPanelBase : public wxPanel +{ + private: + + protected: + wxStaticText* m_product_name; + + public: + + wxEAPBannerPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = 0 ); + ~wxEAPBannerPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxCredentialsConfigPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxCredentialsConfigPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxCheckBox* m_allow_save; + wxButton* m_cred_store_set; + wxButton* m_cred_store_clear; + + // Virtual event handlers, overide them in your derived class + virtual void OnAllowSave( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCredentialsSet( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCredentialsClear( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxCredentialsConfigPanelBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxPasswordCredentialsPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxPasswordCredentialsPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxStaticText* m_identity_label; + wxTextCtrl* m_identity; + wxStaticText* m_password_label; + wxTextCtrl* m_password; + wxCheckBox* m_remember; + + public: + + wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxPasswordCredentialsPanelBase(); + +}; + +#endif //__WXEAP_UI_H__ diff --git a/EAPMethods/res/wxEAPTLS.cpp b/EAPMethods/res/wxTLS_UI.cpp similarity index 68% rename from EAPMethods/res/wxEAPTLS.cpp rename to EAPMethods/res/wxTLS_UI.cpp index 64927de..6749e7b 100644 --- a/EAPMethods/res/wxEAPTLS.cpp +++ b/EAPMethods/res/wxTLS_UI.cpp @@ -7,16 +7,10 @@ #include -#include "wxEAPTLS.h" +#include "wxTLS_UI.h" /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( wxEAPTLSConfigPanelBase, wxPanel ) - EVT_LISTBOX_DCLICK( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCADClick ) - EVT_BUTTON( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCAAdd ) - EVT_BUTTON( wxID_ANY, wxEAPTLSConfigPanelBase::_wxFB_OnRootCARemove ) -END_EVENT_TABLE() - wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_server_trust; @@ -42,7 +36,7 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i m_root_ca_lbl->Wrap( -1 ); sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, 5 ); - m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE|wxLB_SORT ); + m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SORT ); m_root_ca->SetToolTip( _("List of certificate authorities server's certificate must be issued by") ); sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, 5 ); @@ -50,10 +44,15 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i wxBoxSizer* sb_root_ca_btn; sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL ); - m_root_ca_add = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA"), wxDefaultPosition, wxDefaultSize, 0 ); - m_root_ca_add->SetToolTip( _("Adds a new certificate authority to the list") ); + m_root_ca_add_store = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from Store..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_add_store->SetToolTip( _("Adds a new certificate authority from the certificate store to the list") ); - sb_root_ca_btn->Add( m_root_ca_add, 0, wxRIGHT, 5 ); + sb_root_ca_btn->Add( m_root_ca_add_store, 0, wxRIGHT, 5 ); + + m_root_ca_add_file = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from File..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_add_file->SetToolTip( _("Adds a new certificate authority from the file to the list") ); + + sb_root_ca_btn->Add( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 ); m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 ); m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") ); @@ -94,8 +93,18 @@ wxEAPTLSConfigPanelBase::wxEAPTLSConfigPanelBase( wxWindow* parent, wxWindowID i this->SetSizer( sb_server_trust ); this->Layout(); + + // Connect Events + m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); } wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() { + // Disconnect Events + m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCADClick ), NULL, this ); + m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCAAddFile ), NULL, this ); + m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); + } diff --git a/EAPMethods/res/wxEAPTLS.fbp b/EAPMethods/res/wxTLS_UI.fbp similarity index 88% rename from EAPMethods/res/wxEAPTLS.fbp rename to EAPMethods/res/wxTLS_UI.fbp index eef3c2b..ad75595 100644 --- a/EAPMethods/res/wxEAPTLS.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -10,12 +10,12 @@ 0 . UTF-8 - table - wxEAPTLS + connect + wxTLS_UI 1000 none 1 - EAPTLS + TLS_UI . #include <StdAfx.h> @@ -410,7 +410,7 @@ Resizable 1 - wxLB_MULTIPLE|wxLB_SORT + wxLB_SORT 0 List of certificate authorities server's certificate must be issued by @@ -457,10 +457,98 @@ sb_root_ca_btn wxHORIZONTAL none - + 5 wxRIGHT 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Add CA from Store... + + 0 + + + 0 + + 1 + m_root_ca_add_store + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Adds a new certificate authority from the certificate store to the list + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxRIGHT|wxLEFT + 0 1 1 @@ -490,7 +578,7 @@ 0 0 wxID_ANY - Add CA + Add CA from File... 0 @@ -498,7 +586,7 @@ 0 1 - m_root_ca_add + m_root_ca_add_file 1 @@ -511,7 +599,7 @@ 0 - Adds a new certificate authority to the list + Adds a new certificate authority from the file to the list wxFILTER_NONE wxDefaultValidator @@ -519,7 +607,7 @@ - OnRootCAAdd + OnRootCAAddFile diff --git a/EAPMethods/res/wxEAPTLS.h b/EAPMethods/res/wxTLS_UI.h similarity index 77% rename from EAPMethods/res/wxEAPTLS.h rename to EAPMethods/res/wxTLS_UI.h index 06537b2..2e57cc2 100644 --- a/EAPMethods/res/wxEAPTLS.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -5,8 +5,8 @@ // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __WXEAPTLS_H__ -#define __WXEAPTLS_H__ +#ifndef __WXTLS_UI_H__ +#define __WXTLS_UI_H__ #include #include @@ -35,21 +35,15 @@ /////////////////////////////////////////////////////////////////////////////// class wxEAPTLSConfigPanelBase : public wxPanel { - DECLARE_EVENT_TABLE() private: - - // Private event handlers - void _wxFB_OnRootCADClick( wxCommandEvent& event ){ OnRootCADClick( event ); } - void _wxFB_OnRootCAAdd( wxCommandEvent& event ){ OnRootCAAdd( event ); } - void _wxFB_OnRootCARemove( wxCommandEvent& event ){ OnRootCARemove( event ); } - protected: wxStaticBitmap* m_server_trust_icon; wxStaticText* m_server_trust_label; wxStaticText* m_root_ca_lbl; wxListBox* m_root_ca; - wxButton* m_root_ca_add; + wxButton* m_root_ca_add_store; + wxButton* m_root_ca_add_file; wxButton* m_root_ca_remove; wxStaticText* m_server_names_label; wxTextCtrl* m_server_names; @@ -57,7 +51,7 @@ class wxEAPTLSConfigPanelBase : public wxPanel // Virtual event handlers, overide them in your derived class virtual void OnRootCADClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRootCAAdd( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCAAddFile( wxCommandEvent& event ) { event.Skip(); } virtual void OnRootCARemove( wxCommandEvent& event ) { event.Skip(); } @@ -68,4 +62,4 @@ class wxEAPTLSConfigPanelBase : public wxPanel }; -#endif //__WXEAPTLS_H__ +#endif //__WXTLS_UI_H__ diff --git a/EAPMethods/res/wxEAPTTLS.cpp b/EAPMethods/res/wxTTLS_UI.cpp similarity index 87% rename from EAPMethods/res/wxEAPTTLS.cpp rename to EAPMethods/res/wxTTLS_UI.cpp index 33627fa..ea00db4 100644 --- a/EAPMethods/res/wxEAPTTLS.cpp +++ b/EAPMethods/res/wxTTLS_UI.cpp @@ -7,16 +7,10 @@ #include -#include "wxEAPTTLS.h" +#include "wxTTLS_UI.h" /////////////////////////////////////////////////////////////////////////// -BEGIN_EVENT_TABLE( wxEAPTTLSConfigPanelBase, wxPanel ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentitySame ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentityEmpty ) - EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigPanelBase::_wxFB_OnOuterIdentityCustom ) -END_EVENT_TABLE() - wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_outer_identity; @@ -76,8 +70,14 @@ wxEAPTTLSConfigPanelBase::wxEAPTTLSConfigPanelBase( wxWindow* parent, wxWindowID this->SetSizer( sb_outer_identity ); this->Layout(); + + // Connect Events + m_outer_identity_custom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTTLSConfigPanelBase::OnOuterIdentityCustom ), NULL, this ); } wxEAPTTLSConfigPanelBase::~wxEAPTTLSConfigPanelBase() { + // Disconnect Events + m_outer_identity_custom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTTLSConfigPanelBase::OnOuterIdentityCustom ), NULL, this ); + } diff --git a/EAPMethods/res/wxEAPTTLS.fbp b/EAPMethods/res/wxTTLS_UI.fbp similarity index 98% rename from EAPMethods/res/wxEAPTTLS.fbp rename to EAPMethods/res/wxTTLS_UI.fbp index 29114fd..d654a3d 100644 --- a/EAPMethods/res/wxEAPTTLS.fbp +++ b/EAPMethods/res/wxTTLS_UI.fbp @@ -10,12 +10,12 @@ 0 . UTF-8 - table - wxEAPTTLS + connect + wxTTLS_UI 1000 none 1 - EAPTTLS + TTLS_UI . #include <StdAfx.h> @@ -356,7 +356,7 @@ - OnOuterIdentitySame + @@ -444,7 +444,7 @@ - OnOuterIdentityEmpty + diff --git a/EAPMethods/res/wxEAPTTLS.h b/EAPMethods/res/wxTTLS_UI.h similarity index 72% rename from EAPMethods/res/wxEAPTTLS.h rename to EAPMethods/res/wxTTLS_UI.h index bb19d33..2f7e513 100644 --- a/EAPMethods/res/wxEAPTTLS.h +++ b/EAPMethods/res/wxTTLS_UI.h @@ -5,8 +5,8 @@ // PLEASE DO "NOT" EDIT THIS FILE! /////////////////////////////////////////////////////////////////////////// -#ifndef __WXEAPTTLS_H__ -#define __WXEAPTTLS_H__ +#ifndef __WXTTLS_UI_H__ +#define __WXTTLS_UI_H__ #include #include @@ -34,14 +34,7 @@ /////////////////////////////////////////////////////////////////////////////// class wxEAPTTLSConfigPanelBase : public wxPanel { - DECLARE_EVENT_TABLE() private: - - // Private event handlers - void _wxFB_OnOuterIdentitySame( wxCommandEvent& event ){ OnOuterIdentitySame( event ); } - void _wxFB_OnOuterIdentityEmpty( wxCommandEvent& event ){ OnOuterIdentityEmpty( event ); } - void _wxFB_OnOuterIdentityCustom( wxCommandEvent& event ){ OnOuterIdentityCustom( event ); } - protected: wxStaticBitmap* m_outer_identity_icon; @@ -52,8 +45,6 @@ class wxEAPTTLSConfigPanelBase : public wxPanel wxTextCtrl* m_outer_identity_custom_val; // Virtual event handlers, overide them in your derived class - virtual void OnOuterIdentitySame( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOuterIdentityEmpty( wxCommandEvent& event ) { event.Skip(); } virtual void OnOuterIdentityCustom( wxCommandEvent& event ) { event.Skip(); } @@ -64,4 +55,4 @@ class wxEAPTTLSConfigPanelBase : public wxPanel }; -#endif //__WXEAPTTLS_H__ +#endif //__WXTTLS_UI_H__ diff --git a/EAPMethods/res/wxpass.cpp b/EAPMethods/res/wxpass.cpp deleted file mode 100644 index df4944b..0000000 --- a/EAPMethods/res/wxpass.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include - -#include "wxpass.h" - -/////////////////////////////////////////////////////////////////////////// - -wxPasswordCredentialsBase::wxPasswordCredentialsBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) -{ - wxStaticBoxSizer* sb_credentials; - sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Session Credentials") ), wxVERTICAL ); - - wxBoxSizer* sb_credentials_horiz; - sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); - - m_credentials_icon = new wxStaticBitmap( sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); - - wxBoxSizer* sb_credentials_vert; - sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); - - m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID and password."), wxDefaultPosition, wxDefaultSize, 0 ); - m_credentials_label->Wrap( 446 ); - sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - - wxGridSizer* sb_credentials_tbl; - sb_credentials_tbl = new wxGridSizer( 0, 2, 0, 0 ); - - m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_identity_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_identity_label, 1, wxEXPAND, 5 ); - - m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); - - sb_credentials_tbl->Add( m_identity, 2, wxEXPAND, 5 ); - - m_password_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_password_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_password_label, 1, wxEXPAND, 5 ); - - m_password = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); - m_password->SetToolTip( _("Enter your password here") ); - - sb_credentials_tbl->Add( m_password, 2, wxEXPAND, 5 ); - - - sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); - - m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember my credentials"), wxDefaultPosition, wxDefaultSize, 0 ); - m_remember->SetHelpText( _("Check if you would like to save the credentials to Windows Credential Manager") ); - - sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); - - - sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); - - - sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); - - - this->SetSizer( sb_credentials ); - this->Layout(); -} - -wxPasswordCredentialsBase::~wxPasswordCredentialsBase() -{ -} diff --git a/EAPMethods/res/wxpass.fbp b/EAPMethods/res/wxpass.fbp deleted file mode 100644 index 61b0315..0000000 --- a/EAPMethods/res/wxpass.fbp +++ /dev/null @@ -1,728 +0,0 @@ - - - - - ; - C++ - 1 - source_name - 0 - 0 - . - UTF-8 - table - wxpass - 1000 - none - 1 - pass - - . - #include <StdAfx.h> - 1 - 1 - 1 - 1 - UI - 1 - 1 - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - - wxPasswordCredentialsBase - - 500,-1 - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY - Session Credentials - - sb_credentials - wxVERTICAL - none - - - 5 - wxEXPAND - 0 - - - sb_credentials_horiz - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - Load From Icon Resource; ; [32; 32] - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_credentials_icon - 1 - - - protected - 1 - - Resizable - 1 - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - sb_credentials_vert - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Please provide your user ID and password. - - 0 - - - 0 - - 1 - m_credentials_label - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - 446 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 2 - 0 - - sb_credentials_tbl - none - 0 - 0 - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - User ID: - - 0 - - - 0 - - 1 - m_identity_label - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_identity - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Enter your user name here (user@domain.org, DOMAINUser, etc.) - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Password: - - 0 - - - 0 - - 1 - m_password_label - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 2 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - - 0 - - 1 - m_password - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_PASSWORD - - 0 - Enter your password here - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - Check if you would like to save the credentials to Windows Credential Manager - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - &Remember my credentials - - 0 - - - 0 - - 1 - m_remember - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/EAPMethods/res/wxpass.h b/EAPMethods/res/wxpass.h deleted file mode 100644 index c07cce4..0000000 --- a/EAPMethods/res/wxpass.h +++ /dev/null @@ -1,55 +0,0 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 17 2015) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __WXPASS_H__ -#define __WXPASS_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxPasswordCredentialsBase -/////////////////////////////////////////////////////////////////////////////// -class wxPasswordCredentialsBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_credentials_icon; - wxStaticText* m_credentials_label; - wxStaticText* m_identity_label; - wxTextCtrl* m_identity; - wxStaticText* m_password_label; - wxTextCtrl* m_password; - wxCheckBox* m_remember; - - public: - - wxPasswordCredentialsBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxPasswordCredentialsBase(); - -}; - -#endif //__WXPASS_H__ diff --git a/EAPMethods/src/EAPMethods.cpp b/EAPMethods/src/EAP.cpp similarity index 100% rename from EAPMethods/src/EAPMethods.cpp rename to EAPMethods/src/EAP.cpp diff --git a/EAPMethods/src/EAPMethodsUI.cpp b/EAPMethods/src/EAPMethodsUI.cpp deleted file mode 100644 index 19b4450e1f2d08915dec75f949834f83472347cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3658 zcmdUyTW=FF5QXO%iT|(y38e^9E&_>*kV2p(BG9S{Dt(G_+0ck&8zoyx1^ht%6!4w# zy4i-H2A+ymsdw%1%$eikvHSDKrrorwcEyt7soRlF?bK#AvJZA>IsNzSj@`8fcDs0c zNMFq+mRb+1`I_@JYummv^R2agPC0IySn`$Fkampkr1+j%7c|0g#8}x!6N}6~TJ<+? zi#X9HdK=;^b?e$t-7$1*e(cqyp6z^n6m4;#hkyw zBTv&ao4Lms(ANV~neP~9i}-<$mLpj3k=PbJ0d*IoBfc`bg|F0eQwGZVlehC?JhA)q zozLYwN_h}pWi%C#i_gHnyh?>J<_6zlTC9%Ua#iHNQNgM;6-&~SRwb;?p`!@vbXXwN zswQYg8r6FA$UcE3@js*;J3~PyqSQeUBGv3Uh?u8BoOnA7vD;O8dqLZ#nzGSA3&%v^CP z|1G=^Sk<9@X2v1&qP1GZyev<|BQ`&yx*Ga>?%EHPa@XHevWu3N3Ar#`g!?h8e34DX zE%tpS2dw`IC%J0BPD`B`xv6gIRJ+KNxRcH*OS6Uai*p!n2NUaHGb7pn<@AZsAyU`x z0=H3&c79H6=z3ioQ!P?fD95ufv}t##7CZKWs!`{=Llvx8Kb&&b4$>uR32_lI^*wi>#foTUlqor<7>ZJ46qr~zu|RTx3?ybZaYmBUqka9 z-WpUYo%Va2{vFyDe_znH`RVj+vKJEjy2h*q`=-YIP+O6YrHi; zqMd&}g9@xav_}P-x&`O>K81DNnJ3IvkN!*P(^p~a4LsEC{aJQl9oCyg({$1ZOXc;Votbw>Fy-vD`%Fm+C?wRt-SVER+L4wMdgjF5i}gpTogmQ WMKwFzzE!RNG$YjHh%tPHzrO(Wr4h{l diff --git a/EAPMethods/src/EAPTLSUI.cpp b/EAPMethods/src/EAPTLSUI.cpp deleted file mode 100644 index 12a5245b01ad78990a7690c3be119f1352e1f8d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5394 zcmd6rT~8ZV5QfinrT&LaD~t(8vGFdZN@TT)+I8|iN}cT(4Ms{3}?OSZB!;y%W9R=l63K4^sFE#Im( zwvd>l-&6CFwQ`@332P&44bA$@?B(g)><`l#wm-7=j{6~N6Yi277>?W+IpAwvU=t!q z4bm!FQ{GOwOL~MI?U&b>d1tailg#l}9?I4fJ^Ah4#g`3Odd2Dn5)+f^!%CL+Kybj* z2^g~^?+#63#&6+~rLzl}ne8)R?Ep+wzGI&k?C*SZ3_;09mR_*psQVy2;cb$>#n#Y# zlLzwpz1?TU_bh$STHTjAN?8zJRWuEdi%;iYR+WXZ=L+v)TC9#ua?#G$$$~{O6-&w| zMa83YY$!ZV#|1(~H6v$~ql(7?-e<5R{zu%$#*pVp)x+0mldON4c8O{i4OPKD_t!lA z%H>tDpB}R&>%t)RwcF4*t|B`jXU^E`gm1#_IXpF%a^p!6sP4a=*4d>E0^g~Xo`Gn~ zPzi@;@C$q2LAJxC4A@0WXq9 zI%{>}R=9I^sU>Epo5Nmlif#bWL^Ebu|81LTfW^qqBj04{PeYIwRDp*TJAD)Hw++ zUs@;L1!2j<;~IM*8GLlG+cvxFVAW3poX*E)!K5-meY?ZE`qmIBWyfS8pJGMmf5F-& zNV=CiXfQKAN{+rwW?lQDH^HVV`}d9;bXrZUa$ z`CJ{wx!tgD1G>rDh2#@*N@tL?{7clKdW>pXjDO(wQ`7UcV9V!bMaAcq(9P1%pz*p_ zpKIE49dpm3sPk1j^^rNWDelPdh%se#SnPqqd(O=)ySB%nw3?+mhID=xO@H5T#roCR zI?rBiOsbB2&Y0kt{z6-vmC+H}NT@q{b?p>79ah3pgL5I!h!=GwO@TeKzeTO8YjvoH zZO&WuJaxfMR`k}g-q_{$9$%#W@KR3=obvRkNvzZ|GwLVqimj@!jGtdR*1}%Y zTD*t-sI^$Xy4Ipv?iAcM$?zE&t-rza*Oo^S12-?FzykHdzbPe;^&Nq&ixCP z>hY_0>&s_J_%P#tG;xCbM#gBq*PP|ML~fQjsg8eJrefg;JlCzw(7P?Z2#d^ c;;MKTp9{fN{2wdc=lgkeqNx96P_K&r0N0%#UjP6A diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp new file mode 100644 index 0000000000000000000000000000000000000000..37be2c0552bba5267cb37221b5b47fcf9c16bf77 GIT binary patch literal 8434 zcmeI1VQ&*h5QgV-rT&LgDSWB`J8`6%Eo#f9))K6sf$NbuBKy3}a^0kn zMh$G8Su>s{v>H7`j@HW-ka^`}Qy-aOtt^zR8S`X!ur9uN2ujcBeaMKZkLrO+V!LRt z&)opWonfJfUkDDX(^0X;$M9-5ALn%XzW zO5HYDAgf<{JI~)IcALIMTNbsH1mRWIrh(?dGvF_&VqskKI?qB{sE&PP)yj2PP~}sh zBtFS2!8-@8Mex%>uA#h|z!`B={@BO*1eApTkap|{1)h{Gd~RE?{*mqA)ebWh1$(s5 zxqHeLqGHeP(I@HBLFj9>)G;n=Hi9!ptTp1D^bQ=JIZB!1BoCC=e{7qq(n5oeF;ALy7}3IpZGTelGkSL!*Jjol;}Y%yqXLd)EiT6D zVXmFxOKeTBIR%-XdtqJ?|9g&If>#2HV@F9o6k9`FD{e;qEChS}`pi=9JI&vVXkE5i zk*nBwf#m4h>O7W!u5#Rz@tHG8ypqO0V@bw!M4npbI`(S~nNwJ@#`qcc>&}THBh2af zHOJ=$_tHwgud#fJy<_GIOUZ8|eSlYo_J$b;%!{MdYR#*1MSXo;6O*mZpC? zhOs)BSeG#~RvW;aK5KMYspqx8O&Fud&&Ulu&x>QSMT&ezUI46gnuo^TTvv;N7z0FP1R9TVo6ohr@_ZMc0_*GnbQEFp69Q- zo@paGU1v|&@05wJ@pcGmsuRST^BFFlmKhr6H*z`GkyIWbnRWDDJvx+SRFfTIXV_Cz z9cmX+RH(Yp4l~X3anxA#VnSpnwnDw8%HlS)_8M)F)!?0?=d1Td3>Y(}UsfhwGj5}S z?zf4vCXv?VZj1b=8sjN7N0+wE-woOhKkfP3L||fntuSkgXl+uJDq^4Vx6LZ509xED zc9T;XBU<^$>xLaPEN}>M9!JDB;?edTA-S9As$T;=10GvBlH!J#)8<)mmoiG3a9W9{ zP?7e(A#Dpyly4R-XxR7mV~(XN?+nRr!CZCvgt_X`$*50XgLjWXp=E!Z*cQC7`pmsk zGq0U+L|86IGh!vq6s!uYRwbR{Rb}Z3^`7cA;odkI88d8@a=Mk&eq~lGRx7f7^hIEB z)MnWlA*;s~!_#7>-$(C5d>Nv@PNXU;bORWk~2 z{_gKzA*JD5*Im>ndM&nPo@n(9Jyd(>UXdcHoA^T2fMWA95>=~e|Cm)sT|_SNIyJ%L zsxx-H0t$7Bs{B5ewA2YOROHgSIP+C`TPK=mo3gq1q!FSfk-54L%DNWO9kmumGU~?}9uV>~?$gSu@5AJRm>bW}2La!+qb;#tu;MJw zhW(%%Suvu@I4z=b(JJMv%(Kkys(Sl1Q8DuBrLHE@UPNxPHms0jr#~bJmZT$j|7r$l};8 zm$-VoT=kq4tAW+B{Qs3>icBN!T%N&Id%>K&K-ufETrP9C4Rc4FjKtgz6N}ZBv`+Ta zk7>?ea>~9R|wUpeHy3vy0$25Uj&2Yr~0ED&5v`UuWN6t)X)Fs z_4!o4{5(;dF0b~f{+8XbpUAE{XRUrZ|9r03*QyV5uCE)fXVtYAKik*UB4&-c+I-CO zz0MK(-~7bC!B?G^msPZ@o?xq12vt$}jI&x5SS4%mo56B9MZFhm@x?P#w6k1O{Ra@$ B>+%2q literal 0 HcmV?d00001 diff --git a/EAPMethods/src/MainUI.cpp b/EAPMethods/src/Main_UI.cpp similarity index 100% rename from EAPMethods/src/MainUI.cpp rename to EAPMethods/src/Main_UI.cpp diff --git a/EAPMethods/src/EAPTLS.cpp b/EAPMethods/src/TLS.cpp similarity index 100% rename from EAPMethods/src/EAPTLS.cpp rename to EAPMethods/src/TLS.cpp diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e5908fbf62a72c4b73c37c8a896e50fab2d7a5ff GIT binary patch literal 18972 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 Py&|s#9mcO8uAlc`_%rD@ literal 0 HcmV?d00001 diff --git a/EAPMethods/src/EAPTTLS.cpp b/EAPMethods/src/TTLS.cpp similarity index 97% rename from EAPMethods/src/EAPTTLS.cpp rename to EAPMethods/src/TTLS.cpp index 740b455b3cd3edb71cce2da3f3a2d2acff25f285..b6eed43762f450e0d4fd8abd31c06f6e27386ca7 100644 GIT binary patch delta 298 zcmXX=I|{;35F8L2#m>S;e2_*-P;0?X!4y_vD?}4DXpAH=VwFSWB7&WV5bP{HinEI> z>~Cgg_Op6=_pe=@V*$5pJL4ijfCw>iRv#l6xX73zgxF!PeTWnB7zc6;mSh-oaYn*j z#47v?QlbgFEw@rdA!W$*juVwsu< zo)Q&lgDE^dG2@lshWYkqMmot`xvB@~tGUH#OKgb8%XTVti>fF3aa+Dyow7NY`~U?~ BID!BG delta 20 ccmdm$cq4AZ1MSU5x>C%OuSrNvE;Dce0AvaXQ~&?~ diff --git a/EAPMethods/src/EAPTTLSUI.cpp b/EAPMethods/src/TTLS_UI.cpp similarity index 69% rename from EAPMethods/src/EAPTTLSUI.cpp rename to EAPMethods/src/TTLS_UI.cpp index 4477fa5d75e8eccdc0551b4015c13f39fad5b374..15674d53ac551d55ff2726d3421b1dad229b8e52 100644 GIT binary patch delta 2550 zcmb_eTW=Fr5S}2KCRVtlu@zz`_^iP<6`atDs!AJ_C|8Ss1CD4BQY*(^Qlk*l^^#De zG%tOuDAGJs;(<$lKuh6`C-@1xRTTp9%3J?IznS%A6BZg&w6b%2&di*d@B3yp&kBFn z?*A0$2k~(K2JN9x>$5~PJS${)_;8%(V|%lUmiWZybnqe+^hX?&l=o<#XM8sgkw*VrhH!fS`oC`(7k;LZ}Vsgunw!x3Hxb@E^F zoBW$K%D2sD{7r8ck6Q^IPaKF$Ba;#>!P=%w(~qB+zK#ukYA&eHlJ)tHeSWo`bhl#i zhBf5#bou5$H0h$2tGMk8MejdwJo=`}XAq@EmtV({Zw&TuDt-`^_UxO*JuaP7G;k-E zOq^5ZlkT$CTOx;__Vw{CE5y%@dJWl#c?CW{&`~-;!TuxsIN3QgPYD{w$E(8tb$RRt z?q_-$nj zvUDhqGaEZDtfbyaoYb)rR5MVfC{os!fu5*!n${ZjDXnvj#|C5kdv~teZl0*x?j{YN zNJRIvQ~<9GTk%8CTTd(iRos@98Xo?UNblM#Qdy~8QHm;C2?jMFt&xTZUDC{>xxS?d zI!)(Q{IWL%8)<^8h~m-$3aM+ERjgLuU{!?0^#gEh20lkcU~m?g&C|T}>BC*gR~_7$ z`jU^NXZUV%|A&&RO%=Wu>WfTz>qd4}6Dvw5k%lG1xUA6^LyPWEof)I!+^avV6}P*c_%|?Br3Mms3gFA3H96r+?Ss zUD02%SHp>nh!w2Xv92q!WwpGBJqLS2w*%WMB8sh8wYf1E8p4GEeTcV&#T5mhsS<;W zC6FX7pv&}=AhNc>wuXWP@deb+VwK&@CU;I^#zEA%JT(SGN delta 173 zcmcbWf5(4Ai~QsR0vwZ#jKwD35$2d2C&)3mMP6j`Eft>00bFd8Hz`b*d_`4a@&jeL z$u){*ldaUmCMgJ UZL*G$(ByAML2R`QybN3n0FKQ#W&i*H