summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-23 16:24:58 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-23 16:24:58 +0000
commit88e36d3c7260f27225e4e4f16943dbd0c6439484 (patch)
tree4eebe28a3d4ba9d0bb86ce2d508aa32fb5a7ecbf
parentbf737d86dbb6a4091086e8488f397db9ac120eb3 (diff)
ICQ+ specific option deleted
git-svn-id: http://svn.miranda-ng.org/main/trunk@2450 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/CSList/res/cslist.rc15
-rw-r--r--plugins/CSList/src/cslist.cpp4
-rw-r--r--plugins/CSList/src/resource.h1
3 files changed, 6 insertions, 14 deletions
diff --git a/plugins/CSList/res/cslist.rc b/plugins/CSList/res/cslist.rc
index 39dbf08faa..71f2eefa6b 100644
--- a/plugins/CSList/res/cslist.rc
+++ b/plugins/CSList/res/cslist.rc
@@ -83,13 +83,11 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
GROUPBOX "List settings",IDC_STATIC,4,4,292,73
CONTROL "Confirm deletion of items",IDC_CONFIRM_DELETION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,20,253,10
- CONTROL "Delete entries in ICQ Custom status menu after Import",IDC_DELETE_AFTER_IMPORT,
+ CONTROL "Delete entries in Custom status menu after Import",IDC_DELETE_AFTER_IMPORT,
"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,24,32,253,10
- CONTROL "Allow extra ICQ Custom status items (ICQ Plus only)",IDC_ALLOW_EXTRA_ICONS,
- "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,24,44,253,10
CONTROL "Remember last window position",IDC_REMEMBER_POSITION,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,56,253,10
- CTEXT "Note: Menu items are only visible when at least one ICQ account is properly set. Check if you have at least one account with UIN filled in.",IDC_STATIC,6,80,283,23
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,44,253,10
+ CTEXT "Note: Menu items are only visible when at least one account is properly set. Check if you have at least one account with UIN filled in.",IDC_STATIC,6,68,283,23
END
@@ -148,17 +146,17 @@ END
// TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"..\\src\\resource.h\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\0"
END
@@ -179,4 +177,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index 47abad2db2..f0d824fb7c 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -1030,9 +1030,6 @@ INT_PTR CALLBACK CSOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
CheckDlgButton( hwnd, IDC_REMEMBER_POSITION,
getByte( "RememberWindowPosition", DEFAULT_REMEMBER_WINDOW_POSITION ) ?
BST_CHECKED : BST_UNCHECKED );
-
- EnableWindow(GetDlgItem( hwnd, IDC_ALLOW_EXTRA_ICONS ), TRUE);
- CheckDlgButton(hwnd, IDC_ALLOW_EXTRA_ICONS, getByte( "AllowExtraIcons", DEFAULT_ALLOW_EXTRA_ICONS));
return TRUE;
case WM_NOTIFY:
@@ -1040,7 +1037,6 @@ INT_PTR CALLBACK CSOptionsProc( HWND hwnd, UINT message, WPARAM wparam, LPARAM l
case PSN_APPLY:
setByte( "ConfirmDeletion", IsDlgButtonChecked( hwnd, IDC_CONFIRM_DELETION ) ? 1 : 0 );
setByte( "DeleteAfterImport", IsDlgButtonChecked( hwnd, IDC_DELETE_AFTER_IMPORT ) ? 1 : 0 );
- setByte( "AllowExtraIcons", IsDlgButtonChecked( hwnd, IDC_ALLOW_EXTRA_ICONS ) ? 1 : 0 );
setByte( "RememberWindowPosition", IsDlgButtonChecked( hwnd, IDC_REMEMBER_POSITION ) ? 1 : 0 );
pcli->pfnReloadProtoMenus();
diff --git a/plugins/CSList/src/resource.h b/plugins/CSList/src/resource.h
index cec164739d..6a9a6f540d 100644
--- a/plugins/CSList/src/resource.h
+++ b/plugins/CSList/src/resource.h
@@ -34,7 +34,6 @@
#define IDC_CONFIRM_DELETION 1051
#define IDC_DELETE_AFTER_IMPORT 1052
#define IDC_IMPORT 1071
-#define IDC_ALLOW_EXTRA_ICONS 1204
#define IDC_REMEMBER_POSITION 1207
// Next default values for new objects