1 files changed, 23 insertions, 31 deletions

diff --git a/popup/resource.h b/popup/resource.h
index 4ab7ccb..f6124bb 100644
--- a/popup/resource.h
+++ b/popup/resource.h
@@ -2,39 +2,39 @@
 // Microsoft Visual C++ generated include file.

 // Used by resource.rc

 //

-#define IDD_OPT_POPUP                   107

-#define IDD_OPT_POPUP_ADVANCED          117

+#define IDD_OPT_POPUP                   101

+#define IDD_OPT_POPUP_ADVANCED          102

+#define IDD_OPT_SKIN2                   103

+#define IDD_OPT_ACTIONS                 104

+#define IDD_OPT_NOTIFICATIONS           105

+#define IDD_OPT_CONTACTS                106

+#define IDD_OPT_POPUP_GENERAL           107

+#define IDD_HISTORY                     108

+#define IDD_POSITION                    109

+#define IDB_NOAVATAR                    110

+#define IDR_WHATSNEW                    111

 #define IDI_POPUP                       118

 #define IDI_NOPOPUP                     120

-#define IDD_OPT_SKIN2                   178

-#define IDD_HISTORY                     183

 #define IDI_HISTORY                     184

 #define IDI_RELOAD                      185

-#define IDB_NOAVATAR                    186

-#define IDR_WHATSNEW                    187

 #define IDI_MB_STOP                     189

 #define IDI_MB_INFO                     191

 #define IDI_MB_WARN                     194

-#define IDD_POSITION                    195

 #define IDI_RESIZE                      196

 #define IDI_OPT_CHECK_OFF               198

-#define IDD_OPT_ACTIONS                 198

 #define IDI_OPT_CHECK_ON                199

-#define IDD_OPT_NOTIFICATIONS           199

 #define IDI_OPT_RADIO_OFF               200

-#define IDD_OPT_CONTACTS                200

 #define IDI_OPT_RADIO_ON                201

-#define IDD_OPT_POPUP_PAGE1             202

 #define IDI_ACT_INFO                    203

 #define IDI_ACT_MENU                    204

 #define IDI_ACT_MESSAGE                 205

 #define IDI_ACT_OK                      206

-#define IDI_OPT_SHOWDEF                 206

 #define IDI_ACT_ADD                     207

 #define IDI_ACT_CLOSE                   208

 #define IDI_ACT_PINNED                  209

 #define IDI_ACT_PIN                     210

 #define IDI_ACT_COPY                    211

+#define IDI_OPT_SHOWDEF                 212

 #define IDI_OPT_GROUP                   213

 #define IDI_OPT_FULLSCREEN              215

 #define IDI_OPT_BLOCK                   216

@@ -60,14 +60,10 @@
 #define IDC_MULTIMONITOR_DESC           1036

 #define IDC_MIRANDAWND                  1037

 #define IDC_ACTIVEWND                   1038

-#define IDC_GRP_MULTIMONITOR2           1040

 #define IDC_AVT_BORDER                  1050

 #define IDC_AVT_PNGBORDER               1051

-#define IDC_AVT_RADIUSTXT1              1052

 #define IDC_AVT_RADIUS                  1053

 #define IDC_AVT_RADIUS_SPIN             1054

-#define IDC_AVT_RADIUSTXT2              1055

-#define IDC_AVT_SIZETXT1                1056

 #define IDC_AVT_SIZE_SLIDE              1057

 #define IDC_AVT_SIZE                    1058

 #define IDC_AVT_REQUEST                 1059

@@ -99,33 +95,32 @@
 #define IDC_SDND2                       1116

 #define IDC_TREE1                       1117

 #define IDC_SKINLIST                    1118

-#define IDC_SFREE4CHAT2                 1118

 #define IDC_SINVISIBLE2                 1119

 #define IDC_SPHONE2                     1120

 #define IDC_SLUNCH2                     1121

 #define IDC_TXT_TIMEOUT_SEC             1122

 #define IDC_PREVIEWBOX                  1123

-#define IDC_TXT_TIMEOUT_DEFAULT         1123

 #define IDC_TXT_TIMEOUT_INFINITE        1124

+#define IDC_SFREE4CHAT2                 1125

+#define IDC_TXT_TIMEOUT_DEFAULT         1126

 #define IDC_POPUP_LIST                  1134

 #define IDC_SHOWHISTORY                 1135

 #define IDC_ENABLE_HISTORY              1137

 #define IDC_HPPLOG                      1138

 #define IDC_BTN_RELOAD                  1144

 #define IDC_MAXPOPUPS                   1145

-#define IDC_FONTS_STATIC                1146

-#define IDC_HISTORYSIZE                 1146

 #define IDC_HISTORY_STATIC1             1147

 #define IDC_HISTORY_STATIC2             1148

+#define IDC_HISTORYSIZE                 1149

 #define IDC_TITLE                       1150

-#define IDC_TXT_TOP                     1164

+#define IDC_TXT_TOP                     1163

 #define IDC_TIMEOUT_SPIN                1164

 #define IDC_TXT_LEFT                    1165

 #define IDC_TXT_RIGHT                   1166

-#define IDC_LIST                        1166

 #define IDC_TXT_BOTTOM                  1167

-#define IDC_ACTIONS                     1167

 #define IDC_TXT_SPACING                 1168

+#define IDC_LIST                        1169

+#define IDC_ACTIONS                     1170

 #define IDC_CHK_ENABLEACTIONS           1175

 #define IDC_CHK_IMCONTACTSONLY          1176

 #define IDC_CHK_LARGEICONS              1177

@@ -135,19 +130,16 @@
 #define IDC_RD_RIGHTICONS               1181

 #define IDC_RD_LEFTICONS                1182

 #define IDC_ICO_INFO                    1183

-#define IDC_GRP_GENERAL                 1184

 #define IDC_GRP_CUSTOMACTIONS           1185

 #define IDC_GRP_SIZEPOSITION            1186

 #define IDC_GRP_ACTIONS                 1187

-#define IDC_TXT_INFO                    1188

 #define IDC_TXT_CUSTOMACTIONS           1189

 #define IDC_TXT_POSITION                1190

 #define IDC_ICO_RESTART                 1191

-#define IDC_TXT_POSITION2               1191

 #define IDC_TXT_RESTART                 1192

 #define IDC_MORE                        1193

-#define IDC_GRP_SIZEPOSITION2           1193

 #define IDC_TXT_TITLE1                  1194

+#define IDC_TXT_POSITION2               1195

 #define IDC_TXT_TITLE3                  1196

 #define IDC_TXT_TITLE4                  1197

 #define IDC_ENABLE                      1198

@@ -159,7 +151,8 @@
 #define IDC_ICO_FULLSCREEN              1204

 #define IDC_ICO_BLOCK                   1205

 #define IDC_ICO_AUTO                    1206

-#define IDC_ICO_OK                      1206

+#define IDC_GRP_SIZEPOSITION2           1207

+#define IDC_ICO_OK                      1208

 #define IDC_CB_RIGHT                    1213

 #define IDC_CB_MIDDLE                   1214

 #define IDC_CB_LEFT                     1215

@@ -178,15 +171,14 @@
 #define IDC_USEMAXIMUMWIDTH             1229

 #define IDC_MAXIMUMWIDTH                1230

 #define IDC_MAXIMUMWIDTH_SPIN           1231

-#define IDC_WHERE_TEXT                  1232

 #define IDC_WHERE                       1233

 #define IDC_CUSTOMPOS                   1234

-#define IDC_LAYOUT_TEXT                 1235

 #define IDC_LAYOUT                      1236

 #define IDC_REORDERPOPUPS               1238

 #define IDC_POPUPENABLED                1240

 #define IDC_DISABLEINFS                 1241

 #define IDC_STATUSES                    1242

+#define IDC_GETSKINS                    1243

 #define IDC_CHK_OFFLINE                 40071

 #define IDC_CHK_ONLINE                  40072

 #define IDC_CHK_NA                      40075

@@ -200,7 +192,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NEXT_RESOURCE_VALUE        224

 #define _APS_NEXT_COMMAND_VALUE         40001

-#define _APS_NEXT_CONTROL_VALUE         1249

+#define _APS_NEXT_CONTROL_VALUE         1244

 #define _APS_NEXT_SYMED_VALUE           101

 #endif

 #endif