fixes #2019 (WUMF: delete non-existing settings)

3 files changed, 8 insertions, 15 deletions

diff --git a/plugins/WhoUsesMyFiles/res/resource.rc b/plugins/WhoUsesMyFiles/res/resource.rc
index c077b8bc72..2302cc6e05 100644
--- a/plugins/WhoUsesMyFiles/res/resource.rc
+++ b/plugins/WhoUsesMyFiles/res/resource.rc
@@ -34,7 +34,7 @@ BEGIN
     CONTROL         "List1",IDC_CONNLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_TABSTOP,4,4,322,200,WS_EX_CLIENTEDGE

 END

 

-IDD_OPTIONS DIALOGEX 0, 0, 330, 246

+IDD_OPTIONS DIALOGEX 0, 0, 330, 185

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

@@ -46,7 +46,7 @@ BEGIN
     LTEXT           "Background color",IDC_STATIC,231,26,76,8,SS_CENTERIMAGE | NOT WS_GROUP

     CONTROL         "",IDC_COLOR_TEXT,"ColourPicker",WS_TABSTOP,187,39,39,12

     LTEXT           "Text color",IDC_STATIC,231,42,76,8,SS_CENTERIMAGE | NOT WS_GROUP

-    PUSHBUTTON      "Previe&w",IDC_PREVIEW,270,231,50,15

+    PUSHBUTTON      "Previe&w",IDC_PREVIEW,270,164,50,15

     CONTROL         "Show infinitely",IDC_DELAY_INF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,50,137,10

     CONTROL         "Default",IDC_DELAY_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,61,137,10

     CONTROL         "Custom",IDC_DELAY_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,17,39,137,10

@@ -54,20 +54,13 @@ BEGIN
     CONTROL         "Use Windows colors",IDC_COLOR_WIN,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,63,125,10

     CONTROL         "Use default colors",IDC_COLOR_DEF,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,74,125,10

     CONTROL         "Use custom colors",IDC_COLOR_SET,"Button",BS_AUTORADIOBUTTON | BS_NOTIFY | WS_TABSTOP,187,52,125,10

-    GROUPBOX        "File access filter && logging settings",IDC_STATIC,9,106,311,101

+    GROUPBOX        "File access filter && logging settings",IDC_STATIC,9,106,311,53

     EDITTEXT        IDC_FILE,83,123,210,12,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES

     PUSHBUTTON      "...",IDC_SEL_FILE,299,123,14,12

     CONTROL         "Log into text file",IDC_LOG_INTO_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,123,64,12

     CONTROL         "Log folders access",IDC_LOG_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,143,140,12

     CONTROL         "Alerts on folders access",IDC_ALERT_FOLDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,165,143,147,12

-    CONTROL         "Log files and folders in UNC format",IDC_LOG_UNC,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,163,140,12

-    CONTROL         "Alert files && folders in UNC format",IDC_ALERT_UNC,

-                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165,163,147,12

-    CONTROL         "Log computer name with username",IDC_LOG_COMP,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,14,183,140,10

-    CONTROL         "Alert computer name with username",IDC_ALERT_COMP,

-                    "Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,165,183,147,10

-    LTEXT           "Disabled options will be available in the next version",IDC_STATIC,83,194,199,9

-    PUSHBUTTON      "Show current connections",IDC_CONN,162,231,104,15

+    PUSHBUTTON      "Show current connections",IDC_CONN,162,164,104,15

 END

 

 

@@ -94,6 +87,7 @@ BEGIN
         VERTGUIDE, 154

         VERTGUIDE, 187

         VERTGUIDE, 312

+        BOTTOMMARGIN, 179

     END

 END

 #endif    // APSTUDIO_INVOKED

@@ -132,7 +126,6 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-

 IDI_DRIVE               ICON                    "drive.ico"

 

 #endif    // English (United States) resources

diff --git a/plugins/WhoUsesMyFiles/src/resource.h b/plugins/WhoUsesMyFiles/src/resource.h
index 54b8a30c84..9ce164f144 100644
--- a/plugins/WhoUsesMyFiles/src/resource.h
+++ b/plugins/WhoUsesMyFiles/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by ..\res\resource.rc

+// Used by w:\miranda-ng\plugins\WhoUsesMyFiles\res\resource.rc

 //

 #define IDD_OPTIONS                     101

 #define IDI_DRIVE                       106

@@ -34,7 +34,7 @@
 #ifdef APSTUDIO_INVOKED

 #ifndef APSTUDIO_READONLY_SYMBOLS

 #define _APS_NO_MFC                     1

-#define _APS_3D_CONTROLS                     1

+#define _APS_3D_CONTROLS                1

 #define _APS_NEXT_RESOURCE_VALUE        109

 #define _APS_NEXT_COMMAND_VALUE         40081

 #define _APS_NEXT_CONTROL_VALUE         1063

diff --git a/plugins/WhoUsesMyFiles/src/version.h b/plugins/WhoUsesMyFiles/src/version.h
index f5696f4df3..31c3626c5f 100644
--- a/plugins/WhoUsesMyFiles/src/version.h
+++ b/plugins/WhoUsesMyFiles/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0
 #define __MINOR_VERSION          1
 #define __RELEASE_NUM            0
-#define __BUILD_NUM              3
+#define __BUILD_NUM              4
 
 #include <stdver.h>