From 92e8bb03050786f409a5ecbe262a917822583422 Mon Sep 17 00:00:00 2001
From: Kirill Volinsky <mataes2007@gmail.com>
Date: Mon, 26 May 2014 13:47:06 +0000
Subject: added label with skin folder path
git-svn-id: http://svn.miranda-ng.org/main/trunk@9317 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/Clist_modern/clist_modern_12.vcxproj | 45 +++++
.../Clist_modern/clist_modern_12.vcxproj.filters | 130 +++++++++++++
plugins/Clist_modern/res/resource.rc | 212 +++++----------------
plugins/Clist_modern/src/modern_skinopt.cpp | 9 +-
plugins/Clist_modern/src/resource.h | 99 +++++-----
5 files changed, 273 insertions(+), 222 deletions(-)
(limited to 'plugins/Clist_modern')
diff --git a/plugins/Clist_modern/clist_modern_12.vcxproj b/plugins/Clist_modern/clist_modern_12.vcxproj
index 9dc5cbd90d..33378c83f0 100644
--- a/plugins/Clist_modern/clist_modern_12.vcxproj
+++ b/plugins/Clist_modern/clist_modern_12.vcxproj
@@ -288,6 +288,51 @@
<ResourceCompile Include="res\resource.rc" />
<ResourceCompile Include="res\version.rc" />
</ItemGroup>
+ <ItemGroup>
+ <Image Include="res\1.ico" />
+ <Image Include="res\2.ico" />
+ <Image Include="res\3.ico" />
+ <Image Include="res\4.ico" />
+ <Image Include="res\5.ico" />
+ <Image Include="res\6.ico" />
+ <Image Include="res\7.ico" />
+ <Image Include="res\8.ico" />
+ <Image Include="res\addgoupp.ico" />
+ <Image Include="res\Away.ico" />
+ <Image Include="res\Back.tga" />
+ <Image Include="res\chat.ico" />
+ <Image Include="res\DND.ico" />
+ <Image Include="res\hide_avatar.ico" />
+ <Image Include="res\invisible.ico" />
+ <Image Include="res\listening_to.ico" />
+ <Image Include="res\lunch.ico" />
+ <Image Include="res\MicroAway.ico" />
+ <Image Include="res\Microchat.ico" />
+ <Image Include="res\MicroDND.ico" />
+ <Image Include="res\Microinvisible.ico" />
+ <Image Include="res\Microlunch.ico" />
+ <Image Include="res\MicroNA.ico" />
+ <Image Include="res\Microoccupied.ico" />
+ <Image Include="res\Microoffline.ico" />
+ <Image Include="res\Microphone.ico" />
+ <Image Include="res\NA.ico" />
+ <Image Include="res\occupied.ico" />
+ <Image Include="res\offline.ico" />
+ <Image Include="res\phone.ico" />
+ <Image Include="res\rate_high.ico" />
+ <Image Include="res\rate_low.ico" />
+ <Image Include="res\rate_med.ico" />
+ <Image Include="res\rate_none.ico" />
+ <Image Include="res\reset_view.ico" />
+ <Image Include="res\set_view.ico" />
+ <Image Include="res\show_avatar.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\neo_meta_create.cur" />
+ <None Include="res\neo_meta_default.cur" />
+ <None Include="res\neo_meta_move.cur" />
+ <None Include="res\skin.msf" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/plugins/Clist_modern/clist_modern_12.vcxproj.filters b/plugins/Clist_modern/clist_modern_12.vcxproj.filters
index 203bcf0f48..89e8c12b7e 100644
--- a/plugins/Clist_modern/clist_modern_12.vcxproj.filters
+++ b/plugins/Clist_modern/clist_modern_12.vcxproj.filters
@@ -16,6 +16,9 @@
<Filter Include="Source Files\CLUIFrames">
<UniqueIdentifier>{826d2dcb-6f27-428e-a2bf-4825dc88ce32}</UniqueIdentifier>
</Filter>
+ <Filter Include="Resource Files\Icons">
+ <UniqueIdentifier>{98fc57bd-a27d-420a-9870-d3026a9d89bc}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\init.cpp">
@@ -266,4 +269,131 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
+ <ItemGroup>
+ <Image Include="res\1.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\2.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\3.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\4.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\5.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\6.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\7.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\8.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\addgoupp.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Away.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\chat.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\DND.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\hide_avatar.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\invisible.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\listening_to.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\lunch.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\MicroAway.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Microchat.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\MicroDND.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Microinvisible.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Microlunch.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\MicroNA.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Microoccupied.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Microoffline.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Microphone.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\NA.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\occupied.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\offline.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\phone.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\rate_high.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\rate_low.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\rate_med.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\rate_none.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\reset_view.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\set_view.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\show_avatar.ico">
+ <Filter>Resource Files\Icons</Filter>
+ </Image>
+ <Image Include="res\Back.tga">
+ <Filter>Resource Files</Filter>
+ </Image>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="res\neo_meta_create.cur">
+ <Filter>Resource Files\Icons</Filter>
+ </None>
+ <None Include="res\neo_meta_default.cur">
+ <Filter>Resource Files\Icons</Filter>
+ </None>
+ <None Include="res\neo_meta_move.cur">
+ <Filter>Resource Files\Icons</Filter>
+ </None>
+ <None Include="res\skin.msf">
+ <Filter>Resource Files</Filter>
+ </None>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/plugins/Clist_modern/res/resource.rc b/plugins/Clist_modern/res/resource.rc
index 8a2f349f3a..16b2c886a0 100644
--- a/plugins/Clist_modern/res/resource.rc
+++ b/plugins/Clist_modern/res/resource.rc
@@ -144,22 +144,23 @@ BEGIN
CONTROL "Use Windows colors",IDC_USEWINCOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,33,213,10
END
-IDD_OPT_SKIN DIALOGEX 0, 0, 303, 220
+IDD_OPT_SKIN DIALOGEX 0, 0, 303, 243
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- GROUPBOX "Available skins",IDC_STATIC,0,5,173,182,WS_DISABLED
- PUSHBUTTON "Rescan",IDC_BUTTON_RESCAN,5,170,48,12
- PUSHBUTTON "Apply",IDC_BUTTON_APPLY_SKIN,61,170,48,12,WS_DISABLED
- PUSHBUTTON "Info",IDC_BUTTON_INFO,118,170,48,12,WS_DISABLED
- CTEXT "\n\n\nPlease select one of available skins. \n\nOr browse for skin not in list.",IDC_STATIC_INFO,180,30,108,150
- CONTROL "",IDC_PREVIEW,"Static",SS_OWNERDRAW | SS_CENTERIMAGE | SS_REALSIZEIMAGE,180,16,113,167
- GROUPBOX "Skin preview",IDC_STATIC,175,5,123,182,WS_DISABLED
- LTEXT "WARNING: \tSkins can modify your current profile. Rollback is not possible. \n\t\tPlease BACKUP your database before applying skin.",IDC_STATIC,3,188,300,17
- LTEXT "* Restart may be required for all changes to take effect",IDC_STATIC,3,210,300,8
- COMBOBOX IDC_COMBO1,177,189,123,76,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
- CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,5,15,161,148
+ GROUPBOX "Available skins",IDC_STATIC,0,25,173,182,WS_DISABLED
+ PUSHBUTTON "Rescan",IDC_BUTTON_RESCAN,5,190,48,12
+ PUSHBUTTON "Apply",IDC_BUTTON_APPLY_SKIN,61,190,48,12,WS_DISABLED
+ PUSHBUTTON "Info",IDC_BUTTON_INFO,118,190,48,12,WS_DISABLED
+ CTEXT "\n\n\nPlease select one of available skins. \n\nOr browse for skin not in list.",IDC_STATIC_INFO,180,50,108,150
+ CONTROL "",IDC_PREVIEW,"Static",SS_OWNERDRAW | SS_CENTERIMAGE | SS_REALSIZEIMAGE,180,36,113,167
+ GROUPBOX "Skin preview",IDC_STATIC,175,25,123,182,WS_DISABLED
+ LTEXT "WARNING: \tSkins can modify your current profile. Rollback is not possible. \n\t\tPlease BACKUP your database before applying skin.",IDC_STATIC,3,208,300,17
+ LTEXT "* Restart may be required for all changes to take effect",IDC_STATIC,3,230,300,8
+ CONTROL "",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,5,35,161,148
+ GROUPBOX "Skin folder",IDC_STATIC,0,0,298,24
+ LTEXT "",IDC_SKINFOLDERLABEL,6,10,290,9
END
IDD_OPT_SKINEDITOR DIALOGEX 0, 0, 305, 222
@@ -693,7 +694,8 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "Right-to-left reading mode (mirror template)",IDC_RTL,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,42,246,8
- CONTROL "Replace smileys in contact list",IDC_REPLACE_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,246,8
+ CONTROL "Replace smileys in contact list",IDC_REPLACE_SMILEYS,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,246,8
CONTROL "Use protocol smileys",IDC_USE_PROTOCOL_SMILEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,94,232,8
CONTROL "Draw smileys on first line",IDC_DRAW_SMILEYS_ON_FIRST_LINE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,119,246,8
@@ -835,236 +837,108 @@ END
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
+ IDD_OPT_SKIN, DIALOG
+ BEGIN
+ END
+
IDD_OPT_SKINEDITOR, DIALOG
BEGIN
- TOPMARGIN, 1
- BOTTOMMARGIN, 219
- HORZGUIDE, 22
- HORZGUIDE, 35
- HORZGUIDE, 55
- HORZGUIDE, 76
- HORZGUIDE, 172
- HORZGUIDE, 201
- HORZGUIDE, 207
+ , 50
END
- IDD_SKIN_TAB, DIALOG
+ "IDD_SKIN_TAB", DIALOG
BEGIN
- RIGHTMARGIN, 298
+ , 50
END
- IDD_TAB, DIALOG
+ "IDD_TAB", DIALOG
BEGIN
- RIGHTMARGIN, 298
+ , 50
END
IDD_OPT_SBAR, DIALOG
BEGIN
- RIGHTMARGIN, 297
- VERTGUIDE, 17
- VERTGUIDE, 27
- VERTGUIDE, 88
- VERTGUIDE, 93
- VERTGUIDE, 150
- VERTGUIDE, 160
- VERTGUIDE, 170
- VERTGUIDE, 178
- VERTGUIDE, 294
- BOTTOMMARGIN, 228
- HORZGUIDE, 19
+ , 50
END
- IDD_DELETECONTACT, DIALOG
+ "IDD_DELETECONTACT", DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 277
- TOPMARGIN, 7
- BOTTOMMARGIN, 85
+ , 50
END
IDD_OPT_CLIST, DIALOG
BEGIN
- LEFTMARGIN, 2
- RIGHTMARGIN, 300
- VERTGUIDE, 10
- VERTGUIDE, 107
- VERTGUIDE, 136
- VERTGUIDE, 146
- VERTGUIDE, 171
- VERTGUIDE, 294
- VERTGUIDE, 300
- TOPMARGIN, 2
- BOTTOMMARGIN, 199
- HORZGUIDE, 86
- HORZGUIDE, 93
+ , 50
END
IDD_OPT_CLUI_2, DIALOG
BEGIN
- LEFTMARGIN, 4
- RIGHTMARGIN, 263
- VERTGUIDE, 13
- VERTGUIDE, 23
- VERTGUIDE, 75
- VERTGUIDE, 124
- VERTGUIDE, 128
- VERTGUIDE, 136
- VERTGUIDE, 142
- VERTGUIDE, 156
- VERTGUIDE, 164
- VERTGUIDE, 252
- VERTGUIDE, 258
- TOPMARGIN, 4
- HORZGUIDE, 14
- HORZGUIDE, 36
- HORZGUIDE, 141
- HORZGUIDE, 148
- HORZGUIDE, 194
+ , 50
END
IDD_OPT_CLC, DIALOG
BEGIN
- LEFTMARGIN, 2
- RIGHTMARGIN, 301
- VERTGUIDE, 11
- VERTGUIDE, 164
- VERTGUIDE, 186
- VERTGUIDE, 216
- VERTGUIDE, 295
- VERTGUIDE, 300
- TOPMARGIN, 2
- BOTTOMMARGIN, 221
- HORZGUIDE, 145
- HORZGUIDE, 163
+ , 50
END
IDD_OPT_TRAY, DIALOG
BEGIN
- LEFTMARGIN, 4
- RIGHTMARGIN, 291
- BOTTOMMARGIN, 149
+ , 50
END
IDD_OPT_META_CLC, DIALOG
BEGIN
- LEFTMARGIN, 2
- RIGHTMARGIN, 220
- VERTGUIDE, 11
- VERTGUIDE, 16
- VERTGUIDE, 212
- TOPMARGIN, 2
- BOTTOMMARGIN, 181
+ , 50
END
IDD_OPT_ITEM_CONTACT_TIME, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 236
- TOPMARGIN, 7
- BOTTOMMARGIN, 35
+ , 50
END
IDD_OPT_CLUI, DIALOG
BEGIN
- LEFTMARGIN, 4
- RIGHTMARGIN, 304
- VERTGUIDE, 13
- VERTGUIDE, 23
- VERTGUIDE, 75
- VERTGUIDE, 115
- VERTGUIDE, 119
- VERTGUIDE, 136
- VERTGUIDE, 142
- VERTGUIDE, 164
- VERTGUIDE, 230
- VERTGUIDE, 234
- VERTGUIDE, 296
- VERTGUIDE, 303
- TOPMARGIN, 4
- BOTTOMMARGIN, 203
- HORZGUIDE, 10
- HORZGUIDE, 36
+ , 50
END
IDD_OPT_ITEM_ROW, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 225
- VERTGUIDE, 108
- VERTGUIDE, 217
- TOPMARGIN, 7
- BOTTOMMARGIN, 211
+ , 50
END
IDD_OPT_ITEM_AVATAR, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 253
- TOPMARGIN, 7
- BOTTOMMARGIN, 184
+ , 50
END
IDD_OPT_ITEM_ICON, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 253
- VERTGUIDE, 243
- TOPMARGIN, 7
- BOTTOMMARGIN, 133
+ , 50
END
IDD_OPT_ITEM_TEXT, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 253
- TOPMARGIN, 7
- BOTTOMMARGIN, 151
+ , 50
END
IDD_OPT_ITEM_SECOND_LINE, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 249
- TOPMARGIN, 7
- BOTTOMMARGIN, 224
+ , 50
END
IDD_OPT_ITEM_THIRD_LINE, DIALOG
BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 249
- TOPMARGIN, 7
- BOTTOMMARGIN, 205
+ , 50
END
- IDD_OPT_EXTFRAMES, DIALOG
+ "IDD_OPT_EXTFRAMES", DIALOG
BEGIN
- LEFTMARGIN, 2
- RIGHTMARGIN, 302
- TOPMARGIN, 4
- BOTTOMMARGIN, 217
+ , 50
END
IDD_OPT_ROWTMPL, DIALOG
BEGIN
- VERTGUIDE, 14
- VERTGUIDE, 77
- VERTGUIDE, 82
- VERTGUIDE, 145
- VERTGUIDE, 151
- VERTGUIDE, 158
- VERTGUIDE, 211
- VERTGUIDE, 282
- TOPMARGIN, 1
- BOTTOMMARGIN, 201
- HORZGUIDE, 7
- HORZGUIDE, 17
- HORZGUIDE, 81
- HORZGUIDE, 157
- HORZGUIDE, 161
- HORZGUIDE, 175
- HORZGUIDE, 179
- HORZGUIDE, 194
+ , 50
END
END
#endif // APSTUDIO_INVOKED
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp
index 9586f0003b..5d7f0955e1 100644
--- a/plugins/Clist_modern/src/modern_skinopt.cpp
+++ b/plugins/Clist_modern/src/modern_skinopt.cpp
@@ -97,10 +97,11 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
case WM_INITDIALOG:
{
- TranslateDialogDefault( hwndDlg );
- HTREEITEM it = FillAvailableSkinList( hwndDlg );
- HWND wnd = GetDlgItem( hwndDlg, IDC_TREE1 );
- TreeView_SelectItem( wnd, it );
+ TranslateDialogDefault(hwndDlg);
+ SetWindowText(GetDlgItem(hwndDlg, IDC_SKINFOLDERLABEL), SkinsFolder);
+ HTREEITEM it = FillAvailableSkinList(hwndDlg);
+ HWND wnd = GetDlgItem(hwndDlg, IDC_TREE1);
+ TreeView_SelectItem(wnd, it);
}
return 0;
case WM_COMMAND:
diff --git a/plugins/Clist_modern/src/resource.h b/plugins/Clist_modern/src/resource.h
index 54d59a9e24..61e5f7b5cb 100644
--- a/plugins/Clist_modern/src/resource.h
+++ b/plugins/Clist_modern/src/resource.h
@@ -2,23 +2,44 @@
// ���������� ����, ��������� � Microsoft Visual C++.
// ������������ D:\MNG_orig\plugins\Clist_modern\res\resource.rc
//
-#define IDR_CONTEXT 180
-#define IDR_CLISTMENU 199
-#define IDR_TGA_DEFAULT_SKIN 413
-#define IDR_MSF_DEFAULT_SKIN 413
+#define IDC_ALWAYS_VISIBLEICON 0
+#define IDC_APPLY 3
#define IDD_OPT_ITEM_CONTACT_TIME 102
+#define IDI_MIRANDA 102
#define IDD_OPT_ROWTMPL 103
+#define IDI_SMS 103
#define IDD_OPT_CLIST 126
#define IDD_OPT_SOUND 134
#define IDD_OPT_HOTKEYS 134
#define IDD_OPT_CLIST_LISTBKG 135
+#define IDI_URL 138
+#define IDI_FINDUSER 161
+#define IDI_OPTIONS 163
+#define IDI_RENAME 173
+#define IDI_DELETE 175
+#define IDR_CONTEXT 180
+#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
+#define IDI_TIMESTAMP 208
+#define IDI_CHANGEFONT 209
+#define IDI_ADDCONTACT 210
+#define IDI_SMALLDOT 211
+#define IDI_FILLEDBLOB 212
#define IDD_READAWAYMSG 213
+#define IDI_EMPTYBLOB 213
#define IDD_OPT_IGNORE 214
#define IDD_OPT_VISIBILITY 215
+#define IDC_DROPUSER 215
#define IDD_SETAWAYMSG 216
+#define IDI_DETAILSLOGO 216
#define IDD_OPT_AWAYMSG 217
+#define IDI_HIDE_AVATAR 217
#define IDD_OPT_CLUI 218
+#define IDI_SHOW_AVATAR 218
#define IDD_INFO_SUMMARY 220
#define IDD_INFO_CONTACT 221
#define IDD_INFO_BACKGROUND 222
@@ -35,42 +56,18 @@
#define IDD_INSTALLINI 235
#define IDD_WARNINICHANGE 236
#define IDD_INIIMPORTDONE 237
+#define IDB_SORTCOLUP 239
+#define IDB_SORTCOLDOWN 240
#define IDD_OPT_NETLIB 246
#define IDD_NETLIBLOGOPTS 247
#define IDD_OPT_SKIN 251
#define IDD_OPT_META_CLC 279
-#define IDD_MODERNOPTS 288
-#define IDD_OPT_ITEMS 385
-#define IDD_OPT_ITEM_ROW 386
-#define IDD_OPT_ITEM_AVATAR 387
-#define IDD_OPT_ITEM_ICON 388
-#define IDD_OPT_ITEM_TEXT 389
-#define IDD_OPT_ITEM_SECOND_LINE 390
-#define IDD_OPT_ITEM_THIRD_LINE 391
-#define IDD_OPT_SKINEDITOR 398
-#define IDD_OPT_CLUI_2 451
-#define IDD_OPT_VIEWMODES 19100
-#define IDI_MIRANDA 102
-#define IDI_SMS 103
-#define IDI_URL 138
-#define IDI_FINDUSER 161
-#define IDI_OPTIONS 163
-#define IDI_RENAME 173
-#define IDI_DELETE 175
-#define IDI_SENDEMAIL 193
-#define IDI_BLANK 200
-#define IDI_FILE 207
-#define IDI_TIMESTAMP 208
-#define IDI_CHANGEFONT 209
-#define IDI_ADDCONTACT 210
-#define IDI_SMALLDOT 211
-#define IDI_FILLEDBLOB 212
-#define IDI_EMPTYBLOB 213
-#define IDI_DETAILSLOGO 216
-#define IDI_HIDE_AVATAR 217
-#define IDI_SHOW_AVATAR 218
#define IDI_ACCMGR 281
#define IDI_NEWGROUP2 283
+#define IDD_MODERNOPTS 288
+#define IDC_DEFAULTSUB 293
+#define IDC_DROPMETA 295
+#define IDC_REGROUP 296
#define IDI_AVATAR_OVERLAY_NA 357
#define IDI_AVATAR_OVERLAY_OCCUPIED 358
#define IDI_AVATAR_OVERLAY_OFFLINE 359
@@ -89,6 +86,14 @@
#define IDI_ICQC6 372
#define IDI_ICQC7 373
#define IDI_ICQC8 374
+#define IDD_OPT_ITEMS 385
+#define IDD_OPT_ITEM_ROW 386
+#define IDD_OPT_ITEM_AVATAR 387
+#define IDD_OPT_ITEM_ICON 388
+#define IDD_OPT_ITEM_TEXT 389
+#define IDD_OPT_ITEM_SECOND_LINE 390
+#define IDD_OPT_ITEM_THIRD_LINE 391
+#define IDD_OPT_SKINEDITOR 398
#define IDI_STATUS_OVERLAY_NA 400
#define IDI_STATUS_OVERLAY_OCCUPIED 401
#define IDI_STATUS_OVERLAY_OFFLINE 402
@@ -99,6 +104,9 @@
#define IDI_STATUS_OVERLAY_INVISIBLE 407
#define IDI_STATUS_OVERLAY_LUNCH 408
#define IDI_STATUS_OVERLAY_CHAT 409
+#define IDR_TGA_DEFAULT_SKIN 413
+#define IDR_MSF_DEFAULT_SKIN 413
+#define IDD_OPT_CLUI_2 451
#define IDI_LISTENING_TO 456
#define IDI_FAVORITE_0 500
#define IDI_FAVORITE_1 501
@@ -106,18 +114,6 @@
#define IDI_FAVORITE_3 503
#define IDI_SETVIEW 504
#define IDI_RESETVIEW 505
-#define IDB_SORTCOLUP 239
-#define IDB_SORTCOLDOWN 240
-#define ID_ICQ_EXIT 40001
-#define ID_TRAY_HIDE 40038
-#define ID_TRAY_EXIT 40040
-#define IDC_ALWAYS_VISIBLEICON 0
-#define IDC_APPLY 3
-#define IDC_DROP 183
-#define IDC_DROPUSER 215
-#define IDC_DEFAULTSUB 293
-#define IDC_DROPMETA 295
-#define IDC_REGROUP 296
#define IDC_TEXT 1019
#define IDC_MIN2TRAY 1073
#define IDC_ONTOP 1074
@@ -451,6 +447,7 @@
#define IDC_STATUSBAR_PER_PROTO 2022
#define IDC_OFFSETICON_RIGHT 2023
#define IDC_OFFSETSPIN_RIGHT 2024
+#define IDC_SKINFOLDERLABEL 2024
#define IDC_OFFSETICON_LEFT 2025
#define IDC_OFFSETSPIN_LEFT 2026
#define IDC_STATUSBAR_PROTO_LIST 2027
@@ -475,6 +472,7 @@
#define IDC_RIGHTMARGINSPIN 11803
#define IDC_TOPMARGINSPIN 11804
#define IDC_BOTTOMMARGINSPIN 11805
+#define IDD_OPT_VIEWMODES 19100
#define IDC_VIEWMODES 19102
#define IDC_PROTOCOLS 19103
#define IDC_ADDVIEWMODE 19104
@@ -502,8 +500,7 @@
#define IDC_SELECTMODE 19126
#define IDC_CONFIGUREMODES 19127
#define IDC_USEGROUPS 19128
-#define IDC_FRAME_META 40054
-#define IDC_FRAME_META2 40055
+#define ID_ICQ_EXIT 40001
#define POPUP_HIDEEMPTYGROUPS 40003
#define POPUP_NEWSUBGROUP 40004
#define POPUP_HIDEOFFLINE 40005
@@ -512,9 +509,13 @@
#define POPUP_DISABLEGROUPS 40008
#define POPUP_HIDEMIRANDA 40017
#define POPUP_GROUPSHOWOFFLINE 40019
+#define ID_TRAY_HIDE 40038
+#define ID_TRAY_EXIT 40040
#define POPUP_NEWGROUP 40050
#define POPUP_RENAMEGROUP 40052
#define POPUP_DELETEGROUP 40053
+#define IDC_FRAME_META 40054
+#define IDC_FRAME_META2 40055
// Next default values for new objects
//
@@ -522,7 +523,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 509
#define _APS_NEXT_COMMAND_VALUE 40022
-#define _APS_NEXT_CONTROL_VALUE 2024
+#define _APS_NEXT_CONTROL_VALUE 2025
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
--
cgit v1.2.3