UserInfo -> UI classes

6 files changed, 63 insertions, 5 deletions

diff --git a/src/mir_app/mir_app.vcxproj b/src/mir_app/mir_app.vcxproj
index cf8eec0f0c..6845887cac 100644
--- a/src/mir_app/mir_app.vcxproj
+++ b/src/mir_app/mir_app.vcxproj
@@ -160,6 +160,7 @@
     <ClCompile Include="src\usedIcons.cpp" />

     <ClCompile Include="src\utils.cpp" />

     <ClCompile Include="src\visibility.cpp" />

+    <ClCompile Include="W:\miranda-ng\src\mir_app\src\userInfo.cpp" />

     <ClInclude Include="src\chat.h" />

     <ClInclude Include="src\clc.h" />

     <ClInclude Include="src\database.h" />

diff --git a/src/mir_app/mir_app.vcxproj.filters b/src/mir_app/mir_app.vcxproj.filters
index 0a5e9fb1c5..d09bf9ff5a 100644
--- a/src/mir_app/mir_app.vcxproj.filters
+++ b/src/mir_app/mir_app.vcxproj.filters
@@ -398,6 +398,9 @@
     <ClCompile Include="src\pluginopts.cpp">

       <Filter>Source Files\Plugins</Filter>

     </ClCompile>

+    <ClCompile Include="W:\miranda-ng\src\mir_app\src\userInfo.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="src\filter.h">

diff --git a/src/mir_app/src/CMPluginBase.cpp b/src/mir_app/src/CMPluginBase.cpp
index 3561132c44..ee5628f1d0 100644
--- a/src/mir_app/src/CMPluginBase.cpp
+++ b/src/mir_app/src/CMPluginBase.cpp
@@ -257,10 +257,10 @@ HANDLE CMPluginBase::addTTB(const struct TTBButton *pButton)
 	return (HANDLE)CallService(MS_TTB_ADDBUTTON, (WPARAM)pButton, (LPARAM)this);
 }
 
-int CMPluginBase::addUserInfo(WPARAM wParam, OPTIONSDIALOGPAGE *odp)
+int CMPluginBase::addUserInfo(WPARAM wParam, USERINFOPAGE *uip)
 {
-	odp->pPlugin = this;
-	return CallService("UserInfo/AddPage", wParam, (LPARAM)odp);
+	uip->pPlugin = this;
+	return CallService("UserInfo/AddPage", wParam, (LPARAM)uip);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index df78be57f1..6b3cc265a2 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -535,7 +535,7 @@ Contact_GetStatus @609
 ?addSound@CMPluginBase@@QAEHPBDPB_W11@Z @623 NONAME

 GetInstByAddress @625

 GetPluginByInstance @626

-?addUserInfo@CMPluginBase@@QAEHIPAUOPTIONSDIALOGPAGE@@@Z @627 NONAME

+?addUserInfo@CMPluginBase@@QAEHIPAUUSERINFOPAGE@@@Z @627 NONAME

 ?addOptions@CMPluginBase@@QAEHIPAUOPTIONSDIALOGPAGE@@@Z @628 NONAME

 ?openOptions@CMPluginBase@@QAEXPB_W00@Z @629 NONAME

 ?openOptionsPage@CMPluginBase@@QAEXPB_W00@Z @630 NONAME

@@ -791,3 +791,10 @@ Srmm_GetButtonGap @883
 ?addPopupOption@CMPluginBase@@QAEHPBDAAV?$CMOption@_N@@@Z @884 NONAME

 ?addPopupOption@CMPluginBase@@QAEHPB_WAAV?$CMOption@_N@@@Z @885 NONAME

 Srmm_CreateHotkey @886 NONAME

+??0CUserInfoPageDlg@@QAE@$$QAV0@@Z @887 NONAME

+??0CUserInfoPageDlg@@QAE@AAVCMPluginBase@@H@Z @888 NONAME

+??0CUserInfoPageDlg@@QAE@ABV0@@Z @889 NONAME

+??1CUserInfoPageDlg@@UAE@XZ @890 NONAME

+??_7CUserInfoPageDlg@@6B@ @891 NONAME

+?OnRefresh@CUserInfoPageDlg@@UAE_NXZ @892 NONAME

+?SetContact@CUserInfoPageDlg@@QAEXI@Z @893 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 8239aaa864..229b99bbc1 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -535,7 +535,7 @@ Contact_GetStatus @609
 ?addSound@CMPluginBase@@QEAAHPEBDPEB_W11@Z @623 NONAME

 GetInstByAddress @625

 GetPluginByInstance @626

-?addUserInfo@CMPluginBase@@QEAAH_KPEAUOPTIONSDIALOGPAGE@@@Z @627 NONAME

+?addUserInfo@CMPluginBase@@QEAAH_KPEAUUSERINFOPAGE@@@Z @627 NONAME

 ?addOptions@CMPluginBase@@QEAAH_KPEAUOPTIONSDIALOGPAGE@@@Z @628 NONAME

 ?openOptions@CMPluginBase@@QEAAXPEB_W00@Z @629 NONAME

 ?openOptionsPage@CMPluginBase@@QEAAXPEB_W00@Z @630 NONAME

@@ -791,3 +791,10 @@ Srmm_GetButtonGap @883
 ?addPopupOption@CMPluginBase@@QEAAHPEBDAEAV?$CMOption@_N@@@Z @884 NONAME

 ?addPopupOption@CMPluginBase@@QEAAHPEB_WAEAV?$CMOption@_N@@@Z @885 NONAME

 Srmm_CreateHotkey @886 NONAME

+??0CUserInfoPageDlg@@QEAA@$$QEAV0@@Z @887 NONAME

+??0CUserInfoPageDlg@@QEAA@AEAVCMPluginBase@@H@Z @888 NONAME

+??0CUserInfoPageDlg@@QEAA@AEBV0@@Z @889 NONAME

+??1CUserInfoPageDlg@@UEAA@XZ @890 NONAME

+??_7CUserInfoPageDlg@@6B@ @891 NONAME

+?OnRefresh@CUserInfoPageDlg@@UEAA_NXZ @892 NONAME

+?SetContact@CUserInfoPageDlg@@QEAAXI@Z @893 NONAME

diff --git a/src/mir_app/src/userInfo.cpp b/src/mir_app/src/userInfo.cpp
new file mode 100644
index 0000000000..c7e6bfa647
--- /dev/null
+++ b/src/mir_app/src/userInfo.cpp
@@ -0,0 +1,40 @@
+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org),
+Copyright (c) 2000-12 Miranda IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "stdafx.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// User info page base dialog
+
+CUserInfoPageDlg::CUserInfoPageDlg(class CMPluginBase &pPlug, int idDialog) :
+	CDlgBase(pPlug, idDialog)
+{
+	m_forceResizable = true;
+}
+
+bool CUserInfoPageDlg::OnRefresh()
+{
+	return false;
+}
+