code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@1280 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 19 insertions, 26 deletions

diff --git a/src/core/stdautoaway/commonheaders.h b/src/core/stdautoaway/commonheaders.h
index f6f9aebff7..9ba6ae38cf 100644
--- a/src/core/stdautoaway/commonheaders.h
+++ b/src/core/stdautoaway/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stdaway/commonheaders.h b/src/core/stdaway/commonheaders.h
index f6f9aebff7..9ba6ae38cf 100644
--- a/src/core/stdaway/commonheaders.h
+++ b/src/core/stdaway/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stdemail/commonheaders.h b/src/core/stdemail/commonheaders.h
index f6f9aebff7..9ba6ae38cf 100644
--- a/src/core/stdemail/commonheaders.h
+++ b/src/core/stdemail/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stdhelp/commonheaders.h b/src/core/stdhelp/commonheaders.h
index 06417c2587..c62e8b3aaa 100644
--- a/src/core/stdhelp/commonheaders.h
+++ b/src/core/stdhelp/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stdidle/commonheaders.h b/src/core/stdidle/commonheaders.h
index b6819e579e..39e74a5dc8 100644
--- a/src/core/stdidle/commonheaders.h
+++ b/src/core/stdidle/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stduihist/commonheaders.h b/src/core/stduihist/commonheaders.h
index 06417c2587..c62e8b3aaa 100644
--- a/src/core/stduihist/commonheaders.h
+++ b/src/core/stduihist/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stduserinfo/commonheaders.h b/src/core/stduserinfo/commonheaders.h
index abc805934e..32d9ce8432 100644
--- a/src/core/stduserinfo/commonheaders.h
+++ b/src/core/stduserinfo/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/core/stduserinfo/resource.rc b/src/core/stduserinfo/resource.rc
index 4b2a37b640..f09774a786 100644
--- a/src/core/stduserinfo/resource.rc
+++ b/src/core/stduserinfo/resource.rc
@@ -187,6 +187,16 @@ 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

 

 /////////////////////////////////////////////////////////////////////////////

@@ -272,7 +282,16 @@ 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/stduseronline/commonheaders.h b/src/core/stduseronline/commonheaders.h
index f6f9aebff7..9ba6ae38cf 100644
--- a/src/core/stduseronline/commonheaders.h
+++ b/src/core/stduseronline/commonheaders.h
@@ -72,7 +72,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_message.h>

 #include <m_userinfo.h>

 #include <m_history.h>

-#include <m_addcontact.h>

 #include <m_findadd.h>

 #include <m_file.h>

 #include <m_email.h>

diff --git a/src/resource.rc b/src/resource.rc
index cef16ba39d..77fd829f58 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -74,16 +74,6 @@ 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"

@@ -746,14 +736,6 @@ BEGIN
         BOTTOMMARGIN, 88

     END

 

-    IDD_OPT_CONTACT, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 192

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 140

-    END

-

     IDD_FINDADD, DIALOG

     BEGIN

         LEFTMARGIN, 5