summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordartraiden <wowemuh@gmail.com>2017-09-13 03:56:37 +0300
committerdartraiden <wowemuh@gmail.com>2017-09-13 03:56:37 +0300
commit450c006be8f950a6bdfd20160d8e10d3eec3f853 (patch)
tree1bf42d248f8f72bb3898b7f08210ba27d2e9fff2
parent2b8358694bdbe12eb2506e41d9dcfe8c6e13ba69 (diff)
partially remove ModernOpt stuff
-rw-r--r--plugins/Clist_modern/res/resource.rc41
-rw-r--r--plugins/Clist_modern/src/resource.h6
-rw-r--r--plugins/TabSRMM/res/resource.rc60
-rw-r--r--plugins/TabSRMM/src/resource.h23
-rw-r--r--protocols/IcqOscarJ/src/icq_proto.h1
5 files changed, 0 insertions, 131 deletions
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 905cb7ee6a..e49c8dcb26 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -77,47 +77,6 @@ IDC_REGROUP CURSOR "neo_meta_move.cur"
// Dialog
//
-IDD_MODERNOPTS DIALOGEX 0, 0, 369, 173
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
- LTEXT "Transparency:",IDC_TXT_TITLE2,0,78,184,8
- LTEXT "Window behavior:",IDC_TXT_TITLE1,1,0,182,8
- LTEXT "List sorting:",IDC_TXT_TITLE4,184,88,183,8
- LTEXT "Status bar:",IDC_TXT_TITLE5,0,39,184,8
- LTEXT "List content:",IDC_TXT_TITLE3,184,0,183,8
- CONTROL "Show counts of number of contacts in a group",IDC_SHOWGROUPCOUNTS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,13,176,10
- CONTROL "Hide group counts when there are none online",IDC_HIDECOUNTSWHENEMPTY,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,25,176,10
- RTEXT "1st:",IDC_STATIC,184,102,27,12,SS_CENTERIMAGE
- RTEXT "2nd:",IDC_STATIC,184,118,27,12,SS_CENTERIMAGE
- RTEXT "3rd:",IDC_STATIC,184,134,27,12,SS_CENTERIMAGE
- COMBOBOX IDC_CLSORT1,214,102,155,146,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_CLSORT2,214,118,155,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- COMBOBOX IDC_CLSORT3,214,134,155,140,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,174,10
- CONTROL "Hide contact list after",IDC_AUTOHIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,97,10
- EDITTEXT IDC_HIDETIME,110,24,31,12,ES_RIGHT | ES_NUMBER
- CONTROL "",IDC_HIDETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,132,23,11,14
- LTEXT "seconds",IDC_STATIC01,150,26,35,8
- CONTROL "Fade contact list in/out",IDC_FADEINOUT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,91,174,10
- CONTROL "Transparent contact list",IDC_TRANSPARENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,174,10
- LTEXT "Inactive opacity:",IDC_STATIC11,30,119,57,8
- CONTROL "",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,89,116,64,14
- LTEXT "000%",IDC_INACTIVEPERC,159,119,24,8,SS_NOPREFIX
- LTEXT "Active opacity:",IDC_STATIC12,30,134,57,8
- CONTROL "",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | WS_TABSTOP,89,131,64,14
- LTEXT "000%",IDC_ACTIVEPERC,159,134,24,8,SS_NOPREFIX
- CONTROL "Show avatars",IDC_SHOW_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,49,175,10
- CONTROL "Animate avatars",IDC_SHOW_ANIAVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,213,61,155,10
- CONTROL "Show contact time in list",IDC_SHOW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,73,175,10
- CONTROL "Compact mode",IDC_MINIMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,37,175,10
- CONTROL "Show protocol names",IDC_SHOWPROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,52,174,10
- CONTROL "Show status text",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,64,174,10
-END
-
IDD_OPT_CLIST_LISTBKG DIALOGEX 0, 0, 234, 184
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index ba772b5bc4..69804972ef 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -62,7 +62,6 @@
#define IDD_OPT_SKIN 251
#define IDD_OPT_META_CLC 279
#define IDI_ACCMGR 281
-#define IDD_MODERNOPTS 288
#define IDC_DEFAULTSUB 293
#define IDC_DROPMETA 295
#define IDC_REGROUP 296
@@ -251,17 +250,12 @@
#define IDC_METASUBEXTRA_IGN 1615
#define IDC_MIN_ROW_HEIGHT 1616
#define IDC_MIN_ROW_HEIGHT_SPIN 1617
-#define IDC_TXT_TITLE1 1617
#define IDC_ROW_BORDER 1618
-#define IDC_TXT_TITLE2 1618
#define IDC_ROW_BORDER_SPIN 1619
#define IDC_AVATAR_SIZE 1620
-#define IDC_TXT_TITLE4 1620
#define IDC_AVATAR_SIZE_SPIN 1621
#define IDC_AVATAR_CUSTOM_CORNER_SIZE 1622
-#define IDC_TXT_TITLE5 1622
#define IDC_AVATAR_CUSTOM_CORNER_SIZE_SPIN 1623
-#define IDC_TXT_TITLE3 1623
#define IDC_AVATAR_WIDTH 1624
#define IDC_AVATAR_WIDTH_SPIN 1625
#define IDC_BUTTON1 1633
diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index c5b4705d84..0255bcfecc 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -606,56 +606,6 @@ BEGIN
CONTROL "",IDC_WARNGROUP,"Static",SS_ENHMETAFILE,0,74,297,2
END
-IDD_MODERNOPTS DIALOGEX 0, 0, 369, 210
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- LTEXT "Message sending:",IDC_TXT_TITLE2,0,64,185,8
- LTEXT "Window:",IDC_TXT_TITLE1,1,0,182,8
- CONTROL "Esc closes sessions (minimizes window if disabled)",IDC_CLOSEONESC,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,174,10
- CONTROL "Always pop up and activate new windows",IDC_ALWAYSPOPUP,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,174,10
- CONTROL "Create new windows in minimized state",IDC_CREATEMIN,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,37,174,10
- CONTROL "Check1",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,10,49,174,10
- CONTROL "Send on Shift+Enter",IDC_SENDSHIFTENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,89,174,10
- CONTROL "Send message on 'Enter'",IDC_SENDENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,101,174,10
- CONTROL "Send message on double 'Enter'",IDC_SENDDBLENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,113,174,10
- CONTROL "Minimize the message window on send",IDC_MINSEND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,125,174,10
- LTEXT "Tabs:",IDC_TXT_TITLE4,184,0,183,8
- CONTROL "Use tabbed interface",IDC_USETABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,13,173,10
- CONTROL "Create new tabs without activating them",IDC_CREATENOACTIVATE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,25,173,10
- CONTROL "Pop up minimized window when a new tab is created",IDC_POPUPONCREATE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,37,173,10
- CONTROL "Automatically switch tabs in minimized windows",IDC_AUTOSWITCHTABS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,49,173,10
- LTEXT "History:",IDC_TXT_TITLE5,1,140,367,8
- CONTROL "Load unread events only",IDC_LOADUNREAD,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,10,153,135,10
- CONTROL "Load number of previous events",IDC_LOADCOUNT,"Button",BS_AUTORADIOBUTTON,10,166,138,10
- CONTROL "Load previous events less than",IDC_LOADTIME,"Button",BS_AUTORADIOBUTTON,10,179,138,10
- CONTROL "Always trim message log to",IDC_ALWAYSTRIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,192,146,10
- EDITTEXT IDC_LOADCOUNTN,164,164,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED
- CONTROL "",IDC_LOADCOUNTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,203,163,10,14
- EDITTEXT IDC_LOADTIMEN,164,177,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED
- CONTROL "",IDC_LOADTIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,175,10,14
- EDITTEXT IDC_TRIM,164,190,39,12,ES_RIGHT | ES_NUMBER | WS_DISABLED
- CONTROL "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,189,10,14
- LTEXT "events",IDC_STATIC,206,192,82,8
- LTEXT "minutes old",IDC_STMINSOLD,206,179,83,8,WS_DISABLED
- LTEXT "Notifications:",IDC_TXT_TITLE3,184,64,183,8
- CONTROL "Don't announce when dialog is open",IDC_NOOPENNOTIFY,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,77,173,10
- CONTROL "Message events",IDC_NOTIFYMSG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,89,173,10
- CONTROL "File events",IDC_NOTIFYFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,101,173,10
- CONTROL "URL events",IDC_NOTIFYURL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,113,173,10
- CONTROL "Other events",IDC_NOTIFYOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,125,173,10
- CONTROL "Send message on Ctrl+Enter (always enabled)",IDC_SENDCTRLENTER,
- "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,10,77,174,10
-END
-
/////////////////////////////////////////////////////////////////////////////
//
@@ -949,16 +899,6 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 98
END
-
- IDD_MODERNOPTS, DIALOG
- BEGIN
- VERTGUIDE, 10
- VERTGUIDE, 184
- VERTGUIDE, 194
- BOTTOMMARGIN, 207
- HORZGUIDE, 59
- HORZGUIDE, 64
- END
END
#endif // APSTUDIO_INVOKED
diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 721f082359..e22594ffd1 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -48,7 +48,6 @@
#define IDD_POPUP_OPT 278
#define IDR_ACCEL 283
#define IDR_TABCONTEXT 286
-#define IDD_MODERNOPTS 288
#define IDD_SELECTCONTAINER 299
#define IDD_CONTAINEROPTIONS 300
#define IDD_OPT_CONTAINERS 301
@@ -251,7 +250,6 @@
#define IDC_HIDETAB 1195
#define IDC_O_DONTREPORT 1196
#define IDC_USEDEFERRED 1197
-#define IDC_AUTOSWITCHTABS 1198
#define IDC_USEINDIVIDUALBKG 1199
#define IDC_SINGLEWINDOWMODE 1200
#define IDC_FLATBUTTONS 1201
@@ -459,44 +457,28 @@
#define IDC_CUT_TITLEMAXSPIN 1420
#define IDC_HELP_CONTAINERS 1421
#define IDC_HELP_GENERAL 1422
-#define IDC_CLOSEONESC 1423
#define IDC_ALWAYSPOPUP 1424
#define IDC_AEROEFFECT 1424
-#define IDC_CREATEMIN 1425
#define IDC_ESCMODE 1425
-#define IDC_CHECK5 1426
#define IDC_TABMODE 1426
-#define IDC_SENDSHIFTENTER 1427
#define IDC_O_TABMODE 1427
-#define IDC_SENDENTER 1428
#define IDC_O_SBARLAYOUT 1428
#define IDC_PANELVISIBILITY 1428
-#define IDC_SENDDBLENTER 1429
#define IDC_SBARLAYOUT 1429
#define IDC_PANELSIZE 1429
-#define IDC_MINSEND 1430
#define IDC_IPCONFIG_TITLE 1430
-#define IDC_SENDCTRLENTER 1431
#define IDC_NOSYNC 1431
-#define IDC_USETABS 1432
#define IDC_IPCONFIG_FOOTER 1432
#define IDC_NOOPENPOPUP 1433
-#define IDC_NOOPENNOTIFY 1433
#define IDC_GROUP_SCOPE 1433
-#define IDC_CREATENOACTIVATE 1434
#define IDC_GROUP_SIZE 1434
-#define IDC_NOTIFYMSG 1435
#define IDC_GROUP_OTHER 1435
-#define IDC_POPUPONCREATE 1436
#define IDC_SIZE_TIP 1436
#define IDC_IPCONFIG_PRIVATECONTAINER 1437
#define IDC_EXPLAINMSGLOGSETTINGS 1437
-#define IDC_NOTIFYFILE 1438
#define IDC_PANELPICTUREVIS 1438
#define IDC_SKINNAME 1438
-#define IDC_NOTIFYURL 1439
#define IDC_SKINROOTFOLDER 1439
-#define IDC_NOTIFYOTHER 1440
#define IDC_SKIN_WARN 1440
#define IDC_QMGR_LIST 1441
#define IDC_QMGR_FILTER 1442
@@ -522,11 +504,6 @@
#define IDC_O_STATIC_OWNAVATAR 1502
#define IDC_USEAERO 1531
#define IDC_USEAEROPEEK 1532
-#define IDC_TXT_TITLE1 1617
-#define IDC_TXT_TITLE2 1618
-#define IDC_TXT_TITLE4 1620
-#define IDC_TXT_TITLE5 1622
-#define IDC_TXT_TITLE3 1623
#define IDC_O_EXPLAINGLOBALNOTIFY 1624
#define IDC_O_AUTOHIDE 1625
#define IDC_O_AUTOHIDESECONDS 1626
diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 353d3e70ec..e8d58150bc 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -124,7 +124,6 @@ struct CIcqProto : public PROTO<CIcqProto>
//====| Events |======================================================================
void __cdecl OnAddContactForever(DBCONTACTWRITESETTING *cws, MCONTACT hContact);
int __cdecl OnIdleChanged(WPARAM, LPARAM);
- int __cdecl OnModernOptInit(WPARAM, LPARAM);
int __cdecl OnModulesLoaded(WPARAM, LPARAM);
int __cdecl OnOptionsInit(WPARAM, LPARAM);
int __cdecl OnPreShutdown(WPARAM, LPARAM);