partial revert of [16116] (this breaks clist menu display)

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

8 files changed, 116 insertions, 0 deletions

diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc
index eee64237d4..3bf1dfe332 100644
--- a/plugins/Clist_blind/res/resource.rc
+++ b/plugins/Clist_blind/res/resource.rc
@@ -311,6 +311,33 @@ IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\mir_app\\res\\
 IDC_DROP                CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drag_copy.cur"

 IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drop_user.cur"

 

+///////////////////////////////////////////////////////////////////////////// 

+// 

+// Menu 

+// 

+

+IDR_CLISTMENU MENU 

+BEGIN 

+	POPUP "&Main menu" 

+	BEGIN 

+		MENUITEM SEPARATOR 

+		MENUITEM "E&xit",                       ID_ICQ_EXIT 

+	END 

+	POPUP "&Status" 

+	BEGIN 

+		MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED 

+		MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE 

+		MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY 

+		MENUITEM "&N/A\tCtrl+3",                ID_STATUS_NA 

+		MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED 

+		MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND 

+		MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT 

+		MENUITEM "&Invisible\tCtrl+7",          ID_STATUS_INVISIBLE 

+		MENUITEM "On the &phone\tCtrl+8",       ID_STATUS_ONTHEPHONE 

+		MENUITEM "Out to &lunch\tCtrl+9",       ID_STATUS_OUTTOLUNCH 

+	END 

+END

+

 #endif    // Русский (Россия) resources

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

 

diff --git a/plugins/Clist_blind/src/resource.h b/plugins/Clist_blind/src/resource.h
index 260e667fef..5f07d6caf0 100644
--- a/plugins/Clist_blind/src/resource.h
+++ b/plugins/Clist_blind/src/resource.h
@@ -5,6 +5,7 @@
 #define IDD_OPT_CLIST                   126

 #define IDC_DROP                        183

 #define IDD_OPT_HOTKEY                  184

+#define IDR_CLISTMENU                   199

 #define IDC_HYPERLINKHAND               214

 #define IDC_DROPUSER                    215

 #define IDD_OPT_CLUI                    218

@@ -133,6 +134,7 @@
 #define IDC_T_GROUP                     1663

 #define IDC_T_DIVIDER                   1664

 #define IDC_T_INFO                      1665

+#define ID_ICQ_EXIT                     40001

 

 // Next default values for new objects

 // 

diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index ad65f79189..27120d60ee 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -793,6 +793,34 @@ IDR_TGA_DEFAULT_SKIN    TGA                     "Back.tga"
 

 IDR_MSF_DEFAULT_SKIN    MSF                     "skin.msf"

 

+///////////////////////////////////////////////////////////////////////////// 

+// 

+// Menu 

+// 

+ 

+IDR_CLISTMENU MENU 

+BEGIN 

+	POPUP "&Main menu" 

+	BEGIN 

+		MENUITEM SEPARATOR 

+		MENUITEM "E&xit",                       ID_ICQ_EXIT 

+	END 

+	POPUP "&Status" 

+	BEGIN 

+		MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED 

+		MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE 

+		MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY 

+		MENUITEM "&N/A\tCtrl+3",                ID_STATUS_NA 

+		MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED 

+		MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND 

+		MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT 

+		MENUITEM "&Invisible\tCtrl+7",          ID_STATUS_INVISIBLE 

+		MENUITEM "On the &phone\tCtrl+8",       ID_STATUS_ONTHEPHONE 

+		MENUITEM "Out to &lunch\tCtrl+9",       ID_STATUS_OUTTOLUNCH

+    END 

+END 

+

+

 #ifdef APSTUDIO_INVOKED

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

 //

diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index 6e06415b66..7110650081 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -19,6 +19,7 @@
 #define IDI_DELETE                      175

 #define IDC_DROP                        183

 #define IDI_SENDEMAIL                   193

+#define IDR_CLISTMENU                   199

 #define IDI_BLANK                       200

 #define IDD_OPT_ICONS                   207

 #define IDI_FILE                        207

@@ -487,6 +488,7 @@
 #define IDC_SELECTMODE                  19126

 #define IDC_CONFIGUREMODES              19127

 #define IDC_USEGROUPS                   19128

+#define ID_ICQ_EXIT                     40001

 #define POPUP_NEWSUBGROUP               40004

 #define POPUP_GROUPSHOWOFFLINE          40019

 #define IDC_FRAME_META                  40054

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index efe8fd4708..eb2d46a1f4 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -573,6 +573,33 @@ IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\mir_app\\res\\
 IDC_DROP                CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drag_copy.cur"

 IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drop_user.cur"

 

+// Menu 

+// 

+

+IDR_CLISTMENU MENU 

+BEGIN 

+	POPUP "&Main menu" 

+	BEGIN 

+		MENUITEM SEPARATOR 

+		MENUITEM "E&xit",                       ID_ICQ_EXIT 

+	END 

+	POPUP "&Status" 

+	BEGIN 

+		MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED 

+		MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE 

+		MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY 

+		MENUITEM "&N/A\tCtrl+3",                ID_STATUS_NA 

+		MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED 

+		MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND 

+		MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT 

+		MENUITEM "&Invisible\tCtrl+7",          ID_STATUS_INVISIBLE 

+		MENUITEM "On the &phone\tCtrl+8",       ID_STATUS_ONTHEPHONE 

+		MENUITEM "Out to &lunch\tCtrl+9",       ID_STATUS_OUTTOLUNCH 

+	END 

+END 

+

+///////////////////////////////////////////////////////////////////////////// 

+// 

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

 //

 // DESIGNINFO

diff --git a/plugins/Clist_nicer/src/resource.h b/plugins/Clist_nicer/src/resource.h
index b8ffd38589..6f09070cb1 100644
--- a/plugins/Clist_nicer/src/resource.h
+++ b/plugins/Clist_nicer/src/resource.h
@@ -16,6 +16,7 @@
 #define IDI_CLVM_OPTIONS                176

 #define IDI_CLVM_SELECT                 177

 #define IDC_DROP                        183

+#define IDR_CLISTMENU                   199

 #define IDI_BLANK                       200

 #define IDI_ADDCONTACT                  210

 #define IDC_HYPERLINKHAND               214

diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc
index 60020cbfac..61a0b54819 100644
--- a/src/core/stdclist/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
@@ -459,6 +459,33 @@ IDC_HYPERLINKHAND       CURSOR                  "hyperlin.cur"
 IDC_DROP                CURSOR                  "dragcopy.cur"

 IDC_DROPUSER            CURSOR                  "dropuser.cur"

 

+///////////////////////////////////////////////////////////////////////////// 

+// 

+// Menu 

+// 

+

+IDR_CLISTMENU MENU  

+BEGIN 

+	POPUP "&Main menu" 

+	BEGIN 

+		MENUITEM SEPARATOR 

+		MENUITEM "E&xit",                       ID_ICQ_EXIT 

+	END 

+	POPUP "&Status" 

+	BEGIN 

+		MENUITEM "&Offline\tCtrl+0",            ID_STATUS_OFFLINE, CHECKED 

+		MENUITEM "On&line\tCtrl+1",             ID_STATUS_ONLINE 

+		MENUITEM "&Away\tCtrl+2",               ID_STATUS_AWAY 

+		MENUITEM "&N/A\tCtrl+3",                ID_STATUS_NA 

+		MENUITEM "Occ&upied\tCtrl+4",           ID_STATUS_OCCUPIED 

+		MENUITEM "&DND\tCtrl+5",                ID_STATUS_DND 

+		MENUITEM "&Free for chat\tCtrl+6",      ID_STATUS_FREECHAT 

+		MENUITEM "&Invisible\tCtrl+7",          ID_STATUS_INVISIBLE 

+		MENUITEM "On the &phone\tCtrl+8",       ID_STATUS_ONTHEPHONE 

+		MENUITEM "Out to &lunch\tCtrl+9",       ID_STATUS_OUTTOLUNCH 

+	END 

+END

+

 #endif    // English (U.S.) resources

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

 

diff --git a/src/core/stdclist/src/resource.h b/src/core/stdclist/src/resource.h
index 33bc91cb83..0a90d6898f 100644
--- a/src/core/stdclist/src/resource.h
+++ b/src/core/stdclist/src/resource.h
@@ -5,6 +5,7 @@
 #define IDD_OPT_CLIST                   126

 #define IDC_DROP                        183

 #define IDD_OPT_HOTKEY                  184

+#define IDR_CLISTMENU                   199

 #define IDC_HYPERLINKHAND               214

 #define IDC_DROPUSER                    215

 #define IDD_OPT_CLUI                    218

@@ -135,6 +136,7 @@
 #define IDC_WINCOLOUR                   1659

 #define IDC_ICONBLINK                   1660

 #define IDC_STMSDELAY                   1661

+#define ID_ICQ_EXIT                     40001

 

 // Next default values for new objects

 //