From f89d027a0980bf551e64f4bf01055689f425c956 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Tue, 21 Jul 2020 11:16:51 +0930
Subject: [PATCH] Project64-input: Update the layout

---
 Source/Project64-input/InputConfigUI.cpp  |  18 ------------------
 Source/Project64-input/Project64-input.rc | Bin 17156 -> 16870 bytes
 Source/Project64-input/resource.h         | Bin 8550 -> 9354 bytes
 3 files changed, 18 deletions(-)

diff --git a/Source/Project64-input/InputConfigUI.cpp b/Source/Project64-input/InputConfigUI.cpp
index 525ce7901..e4d6c4e0b 100644
--- a/Source/Project64-input/InputConfigUI.cpp
+++ b/Source/Project64-input/InputConfigUI.cpp
@@ -23,7 +23,6 @@ public:
         COMMAND_HANDLER_EX(IDC_BTN_DEFAULTS, BN_CLICKED, DefaultBtnClicked)
         COMMAND_HANDLER_EX(IDC_BTN_SETUP, BN_CLICKED, SetupBtnClicked)
         COMMAND_HANDLER_EX(IDC_CHK_PLUGGED_IN, BN_CLICKED, ItemChanged)
-        COMMAND_HANDLER_EX(IDC_CMB_DEVICE, CBN_SELCHANGE, ItemChanged)
         NOTIFY_HANDLER_EX(IDC_TACK_RANGE, NM_RELEASEDCAPTURE, ItemChangedNotify);
         MESSAGE_HANDLER(WM_HSCROLL, OnScroll)
         MESSAGE_HANDLER(CScanButton::WM_SCAN_SUCCESS, OnScanSuccess)
@@ -54,7 +53,6 @@ private:
     int32_t m_SetupIndex;
     CBitmapPicture m_ControllerImg;
     CButton m_PluggedIn;
-    CComboBox m_cmbDevice;
     CTrackBarCtrl m_Range;
     CScanButton m_ButtonUDPad, m_ButtonDDPad, m_ButtonLDPad, m_ButtonRDPad;
     CScanButton m_ButtonCUp, m_ButtonCDown, m_ButtonCLeft, m_ButtonCRight;
@@ -92,17 +90,11 @@ CControllerSettings::CControllerSettings(uint32_t ControllerNumber) :
 
 BOOL CControllerSettings::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
 {
-    GetDlgItem(IDC_BTN_LOAD).EnableWindow(false);
-    GetDlgItem(IDC_BTN_SAVE).EnableWindow(false);
     m_Range.Attach(GetDlgItem(IDC_SLIDER_RANGE));
     m_Range.SetTicFreq(1);
     m_Range.SetRangeMin(1);
     m_Range.SetRangeMax(100);
     m_PluggedIn.Attach(GetDlgItem(IDC_CHK_PLUGGED_IN));
-    m_cmbDevice.Attach(GetDlgItem(IDC_CMB_DEVICE));
-    m_cmbDevice.SetItemData(m_cmbDevice.AddString(L"None"), PLUGIN_NONE);
-    m_cmbDevice.SetItemData(m_cmbDevice.AddString(L"Mem Pak"), PLUGIN_MEMPAK);
-    m_cmbDevice.SetItemData(m_cmbDevice.AddString(L"Rumble Pak"), PLUGIN_RUMBLE_PAK);
 
     m_ControllerImg.SubclassWindow(GetDlgItem(IDC_BMP_CONTROLLER));
     m_ControllerImg.SetBitmap(MAKEINTRESOURCE(IDB_CONTROLLER));
@@ -141,7 +133,6 @@ bool CControllerSettings::OnApply()
     CONTROL & ControlInfo = g_InputPlugin->ControlInfo(m_ControllerNumber);
     Controller.Range = (uint8_t)m_Range.GetPos();
     ControlInfo.Present = (m_PluggedIn.GetCheck() == BST_CHECKED) ? 1 : 0;
-    ControlInfo.Plugin = m_cmbDevice.GetItemData(m_cmbDevice.GetCurSel());
 
     return g_InputPlugin->SaveController(m_ControllerNumber);
 }
@@ -213,15 +204,6 @@ void CControllerSettings::DisplayController(void)
 {
     N64CONTROLLER & Controller = g_InputPlugin->Controllers(m_ControllerNumber);
     CONTROL & ControlInfo = g_InputPlugin->ControlInfo(m_ControllerNumber);
-    m_cmbDevice.SetCurSel(0);
-    for (DWORD i = 0, n = m_cmbDevice.GetCount(); i < n; i++)
-    {
-        if (m_cmbDevice.GetItemData(i) == (DWORD)ControlInfo.Plugin)
-        {
-            m_cmbDevice.SetCurSel(i);
-            break;
-        }
-    }
     m_PluggedIn.SetCheck(ControlInfo.Present != 0 ? BST_CHECKED : BST_UNCHECKED);
     m_Range.SetPos(Controller.Range);
     CWindow(GetDlgItem(IDC_LABEL_RANGE)).SetWindowText(stdstr_f("%d%%", m_Range.GetPos()).ToUTF16().c_str());
diff --git a/Source/Project64-input/Project64-input.rc b/Source/Project64-input/Project64-input.rc
index 6a85d28d226d9926bcf8d9e3bd533cfe06c332ab..3171fccd5f77d0f5add0baf8f9ae526a58d76c52 100644
GIT binary patch
delta 1199
zcmZ`(O>7fa5T4Z%D|XDX{z;s~W@8-VkT@i}>y2$B6dDt%A}SK|r>asRQ2;@rHnl=p
zPA#ZOD-H<M?@$$qN>LBo5GYp;Z7-E7aq6v?a_SMmokG9&b|Vg`vUcCRH{XoEZ)V<Z
zd~5vkjq&JJ+^mbg{U)9<urRp`ZqEl9Uz##50iQ$S^UXa@B!7?B^v;v1?fmX8gRnZC
zo_;r_p=|t}_E6Z<G6R{y;+_?*0ru54amF6hcE|oXP9L!~dfJ&2xRMGz3YAFjppM{j
zdfA+kI{r+rn+<Vcl-qD}X*|p%jXFBz@9>A-#o{5!x*S5sUc^Gd!B{4Z<=zBdXJclQ
zIkpO6>~gPdG~rdkScP!<Vm#>#En#{jjB|4deCTwWuK0M`w{Ez&T~zooPdvQLJup3%
zqdgjCeBGbrzJWW%P23x(XuD%8_9c`DPntEdS|41al0YjsoG;L>5f41iTllTk!Xvvx
z*3(+$R-qHAdzQDp->V6BsS=0c9H*`YJ?(4bFvHIeCGZQ$Hkn?fJU^7y_RHK&d{wY;
zy_m$^{#chUN{%9}qOKRS6yq}D0p%@bmvC>NZxX{o4dCNs5%1YaWJ@>n*$<^vy|zbl
zC=OrNO}RC^)09<?PgBdkalpol;TWv_-IVa_z)U2}!Lwl-P9+%+2WF=sR;3j2-h_&E
zDv6$eJZl^drAIY$dZZOKq7AEJ<L-e3o{uCV_A0I%Dd--3KWfaET<e<A{FrJ8hlQE`
z8VktWN2<EQ)x+1-Exjt=#(1Drq^h5w|DZ*?K|k;$vQ<MJHfdsFyr-f0aRk_rHxrBT
zQ*uex_*_HE?Zw7qHbSV1H;6c*tMHRM%ki)24lGnHyzr8k_Yyqwc|E{=pTUbVzJz5z
zL_YREjl5ghGlP$kCHBQa5S+@?nO)sWSKm?&AXTR9$=!4Exm=U0vMQg+nqrinlX*EK
z$7N1V%4vP=LIpnm`QM2dHK@53@#~DZC`Fm2mM@rLNiN}jdZ5~3<XOhf@^?(mG1F15
z>iViag&zRcLb1WkLGSec<dPB*$C=}(T#&apFT9gge@688N7Y!VY;OM;tXTg6*drmo

delta 1399
zcmbVMO=whC6h6aX$^5+;-()&TW+r_ZV>EW0&U<fuyRn%>RGcQ7NCZLJ5GyT78?8+$
zD2<`jKp9HYkM4>frIdoSk!++3EnT?OW>egViXeg_xM?>9``!CyQnD?Nch9-!p7WjW
z-gEAK{JHOoOTN{A0{)7)YcB(FUuvIB$%pcuSTe$KK|YXa$~QSbfq3ZPU`2AGeura?
z(v_-2B*=B|8<sJ7Tk0}~d$DBX08xhJ9saao#_pbQThT?v+SHY-P|MM$E)(<}k#S-i
zq8yW>GAa!@K>HEmpXYy6`%H2i)_x6X;GUJj$DvyRg{PPm*M`Dde4JKw5(i_E?!YEu
zi<^k)q<dwOiH2n_V_Xtav5u5ERw;8Ns`UR&aufX{cxpvpM)UYGQumjnj60DT$`V%c
z7xBB%qxFZGY1E@{1-Q=4t`sqpIEX)^-m3CE8}oF#YYKnG_WR3H!O+%ue^qSEWe=m7
zFp)OHoEPvgdl9Q<uh!SiEB+dNqbbklZal_$S^J#o%xZnzoWj-Zy*Ly%aXAr0A<^Nt
z#l?&5DyE;h)56s2p_)D=n<qzmW(f~o9q>C+!_6IDj@e|V&%yodGFh0IO@=oj9I3+Y
z`h|Ng;8E8Z?xLjGznd~}z1!fts56cBq_w_oF5+2_rFR)ko!;2pXpe!9QbAbhj@B-x
z&`g*0P8Dl~x0((jpXs2jq%m(~EKkpTuXm@|D!)^`;XqNhrNgtlmRN>D|N6B~dfD9H
zG=f&a&pzQ9cH=_G!p}w+zlMTnS_|5~rEgBln>&*Ds_&$(&EI|P+RXVXSV}G9`9KVR
zWM9GgZ5_1SF_$o!jiK2e4tTxSuF`MXYHF@m`hV2Yt5CgFm3g1X^Z9_PjpFEGSv!r8
zhsDb1dVI<{EG3t5W2dT61qx^XV37=6EDp|4dX-J*3|!cy&fmexu5bB9)VO{emtHr>
zRaG*bOVe5<!X7k@EWXR-TDcr4@PtqA*7it4=J>3fki7bEcv~Xb;N>3T6<2-jUH?rH
zQT6zoWX!zG$|rJ0#bA7Q=LWh%u5I)Q`Yq7^KlBM=PquDy8{Lcefn8SAJ$ZZ3_$F_J
zO06Q72)L5}iOa4&kjrn3@Zzc0$)!bIJO*q%#<?RU-RerJ7~o04XvOWpXQ3=x!NB|W
Tc)XpupmEgeR9-vh&KUm!SC>qT

diff --git a/Source/Project64-input/resource.h b/Source/Project64-input/resource.h
index 109bdf0bc880b2605ec56f97f02dd71412066de0..40ef4bd23806e1abb47610661f4290cc0d18a4a0 100644
GIT binary patch
delta 331
zcmaFn)a5zhg?Jc)D?<=NFoP$9KZ74bJcBQg<;UPZnUPVQS%JY|@<T>ZX>>I~Ks{kV
zbwFK{1tnD(!Kx%7s^Wn%AQR&mT!6F_Lnwp$<cET)Ftf1O=g8m%v2PL!%j8Fl5*y#x
z2~M6R%s06~kdM)5@<B%V$y`DTKoK5cC!ixkfzERQ8xC@U^W;JS$;l5CST=JBy<wbu
zkA;KRpCN!D1nQq)pxw$~>1)C|+>?*7ND0GCfH)9l21t<%)C-8f06E{2!H2;G<OQJf
cSdAG>84Nc6m3zrJ`2nNY<OK>MlLZvR0D5OkzW@LL

delta 42
zcmV+_0M-ABN#;V3=(9iqLJ^bB2@11B6v6?M?j0DjdKUBwvnC?s0h7cb7Ly<(YI{Hs
AqyPW_