diff options
| -rw-r--r-- | src/core/modules.cpp | 2 | ||||
| -rw-r--r-- | src/core/stduserinfo/main.cpp | 2 | ||||
| -rw-r--r-- | src/core/stduserinfo/resource.rc | 18 | ||||
| -rw-r--r-- | src/core/stduserinfo/stduserinfo_10.vcxproj | 1 | ||||
| -rw-r--r-- | src/core/stduserinfo/stduserinfo_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/miranda32_10.vcxproj | 1 | ||||
| -rw-r--r-- | src/miranda32_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | src/modules/clist/contacts.cpp (renamed from src/core/stduserinfo/contacts.cpp) | 0 | ||||
| -rw-r--r-- | src/resource.rc | 18 |
9 files changed, 24 insertions, 24 deletions
diff --git a/src/core/modules.cpp b/src/core/modules.cpp index a1fd29b5c3..5969fdcd0e 100644 --- a/src/core/modules.cpp +++ b/src/core/modules.cpp @@ -44,6 +44,7 @@ int LoadIgnoreModule(void); // protocol filter: ignore int LoadDbintfModule(void);
int LoadEventsModule(void);
+int LoadContactsModule(void);
int LoadContactListModule(void);// ui: clist
int LoadDatabaseModule(void);
int LoadOptionsModule(void); // ui: options dialog
@@ -142,6 +143,7 @@ int LoadDefaultModules(void) NetlibInitSsl();
if ( LoadProtocolsModule()) return 1;
LoadDbAccounts(); // retrieves the account array from a database
+ if ( LoadContactsModule()) return 1;
if ( LoadContactListModule()) return 1;
if ( LoadAddContactModule()) return 1;
if ( LoadNewPluginsModule()) return 1; // will call Load(void) on everything, clist will load first
diff --git a/src/core/stduserinfo/main.cpp b/src/core/stduserinfo/main.cpp index 0d24ab924d..60e983c796 100644 --- a/src/core/stduserinfo/main.cpp +++ b/src/core/stduserinfo/main.cpp @@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "commonheaders.h"
-int LoadContactsModule(void);
int LoadUserInfoModule(void);
CLIST_INTERFACE* pcli;
@@ -71,7 +70,6 @@ extern "C" int __declspec(dllexport) Load(void) enableThemeDialogTexture = (pfnEnableThemeDialogTexture)GetProcAddress(hThemeAPI, "EnableThemeDialogTexture");
}
- LoadContactsModule();
LoadUserInfoModule();
return 0;
}
diff --git a/src/core/stduserinfo/resource.rc b/src/core/stduserinfo/resource.rc index f09774a786..0549262a85 100644 --- a/src/core/stduserinfo/resource.rc +++ b/src/core/stduserinfo/resource.rc @@ -187,16 +187,6 @@ BEGIN CONTROL "",IDC_WEBPAGE,"Hyperlink",WS_TABSTOP,57,109,160,8
END
-IDD_OPT_CONTACT DIALOGEX 0, 0, 199, 147
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- GROUPBOX "Contact Display Options",IDC_STATIC,13,7,176,133
- LTEXT "Instead of displaying contacts by their nickname, drag to choose another order:",IDC_STATIC,19,17,165,27
- CONTROL "Tree1",IDC_NAMEORDER,"SysTreeView32",TVS_NOTOOLTIPS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,19,48,164,86
-END
-
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -282,14 +272,6 @@ BEGIN TOPMARGIN, 5
BOTTOMMARGIN, 86
END
-
- IDD_OPT_CONTACT, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 192
- TOPMARGIN, 7
- BOTTOMMARGIN, 140
- END
END
#endif // APSTUDIO_INVOKED
diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj b/src/core/stduserinfo/stduserinfo_10.vcxproj index ebe44ebd76..7f87d1c5fb 100644 --- a/src/core/stduserinfo/stduserinfo_10.vcxproj +++ b/src/core/stduserinfo/stduserinfo_10.vcxproj @@ -213,7 +213,6 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="contactinfo.cpp" />
- <ClCompile Include="contacts.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="stdinfo.cpp" />
<ClCompile Include="userinfo.cpp" />
diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters index abd2924e59..ac101b1384 100644 --- a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters +++ b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters @@ -30,9 +30,6 @@ <ClCompile Include="userinfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="contacts.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\stdplug.h">
diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj index 8816b492d2..df71547cef 100644 --- a/src/miranda32_10.vcxproj +++ b/src/miranda32_10.vcxproj @@ -289,6 +289,7 @@ <ClCompile Include="modules\button\button.cpp">
<PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
+ <ClCompile Include="modules\clist\contacts.cpp" />
<ClCompile Include="modules\crypt\encrypt.cpp">
<PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>
</ClCompile>
diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters index 8e7af8606f..dd95088c4f 100644 --- a/src/miranda32_10.vcxproj.filters +++ b/src/miranda32_10.vcxproj.filters @@ -569,6 +569,9 @@ <ClCompile Include="modules\crypt\encrypt.cpp">
<Filter>Modules\crypt</Filter>
</ClCompile>
+ <ClCompile Include="modules\clist\contacts.cpp">
+ <Filter>Modules\clist</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="resource.rc">
diff --git a/src/core/stduserinfo/contacts.cpp b/src/modules/clist/contacts.cpp index 03c546b64c..03c546b64c 100644 --- a/src/core/stduserinfo/contacts.cpp +++ b/src/modules/clist/contacts.cpp diff --git a/src/resource.rc b/src/resource.rc index 77fd829f58..cef16ba39d 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -74,6 +74,16 @@ BEGIN LTEXT "This will erase all history and settings for this contact!",IDC_STATIC,7,18,239,14
END
+IDD_OPT_CONTACT DIALOGEX 0, 0, 199, 147
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ GROUPBOX "Contact Display Options",IDC_STATIC,13,7,176,133
+ LTEXT "Instead of displaying contacts by their nickname, drag to choose another order:",IDC_STATIC,19,17,165,27
+ CONTROL "Tree1",IDC_NAMEORDER,"SysTreeView32",TVS_NOTOOLTIPS | TVS_FULLROWSELECT | WS_BORDER | WS_HSCROLL | WS_TABSTOP,19,48,164,86
+END
+
IDD_PROFILEMANAGER DIALOGEX 0, 0, 400, 211
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Miranda NG Profile Manager"
@@ -736,6 +746,14 @@ BEGIN BOTTOMMARGIN, 88
END
+ IDD_OPT_CONTACT, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 192
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 140
+ END
+
IDD_FINDADD, DIALOG
BEGIN
LEFTMARGIN, 5
|