CrashDumper:

- fixes #2043 (CrashDumper: add option to disable VI popup);
- massive cleaning of options-related code;
- version bump

1 files changed, 37 insertions, 22 deletions

diff --git a/plugins/CrashDumper/res/crshdmp.rc b/plugins/CrashDumper/res/crshdmp.rc
index 310ccfa235..d38fcc97cd 100644
--- a/plugins/CrashDumper/res/crshdmp.rc
+++ b/plugins/CrashDumper/res/crshdmp.rc
@@ -8,19 +8,16 @@
 // Generated from the TEXTINCLUDE 2 resource.

 //

 #include "afxres.h"

-#include "richedit.h"

-

+#include "richedit.h"


 /////////////////////////////////////////////////////////////////////////////

 #undef APSTUDIO_READONLY_SYMBOLS

 

 /////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

+// English (United States) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

 #pragma code_page(1252)

-#endif //_WIN32

 

 #ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

@@ -60,26 +57,28 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,302,215,66,14

     PUSHBUTTON      "Copy To Clipboard",IDC_CLIPVER,142,215,95,14

     PUSHBUTTON      "To File",IDC_FILEVER,6,215,66,14

-    CONTROL         "",IDC_VIEWVERSIONINFO,"RichEdit50W",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,7,7,361,203,WS_EX_CLIENTEDGE

+    CONTROL         "",IDC_VIEWVERSIONINFO,"RichEdit50W",WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP | 0x8c4,7,7,361,203,WS_EX_CLIENTEDGE

 END

 

-IDD_OPTIONS DIALOGEX 0, 0, 209, 195

+IDD_OPTIONS DIALOGEX 0, 0, 267, 173

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Support for vi.miranda-ng.org",IDC_STATIC,7,7,195,94

+    GROUPBOX        "Support for vi.miranda-ng.org",IDC_STATIC,7,7,253,62

     LTEXT           "Username",IDC_STATIC,14,20,107,8

-    EDITTEXT        IDC_USERNAME,14,33,108,14,ES_AUTOHSCROLL

-    LTEXT           "Password",IDC_STATIC,14,52,107,8

-    EDITTEXT        IDC_PASSWORD,14,65,107,14,ES_PASSWORD | ES_AUTOHSCROLL

-    CONTROL         "Upload automatically when changed",IDC_UPLOADCHN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,84,161,10

-    GROUPBOX        "Crash reports",IDC_STATIC,7,104,195,54

-    CONTROL         "Generate crash reports",IDC_CATCHCRASHES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,113,169,10

+    EDITTEXT        IDC_USERNAME,152,18,108,14,ES_AUTOHSCROLL

+    LTEXT           "Password",IDC_STATIC,14,39,107,8

+    EDITTEXT        IDC_PASSWORD,153,35,107,14,ES_PASSWORD | ES_AUTOHSCROLL

+    CONTROL         "Upload automatically when changed",IDC_UPLOADCHN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,54,245,10

+    GROUPBOX        "Crash reports",IDC_STATIC,7,70,253,52

+    CONTROL         "Generate crash reports",IDC_CATCHCRASHES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,83,237,10

     CONTROL         "Create reports in subfolders naming as current date",IDC_DATESUBFOLDER,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,127,180,10

-    CONTROL         "Use classic dates",IDC_CLASSICDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,141,157,10

-    LTEXT           "* You need to restart Miranda NG to apply changes",IDC_RESTARTNOTE,9,160,186,22,NOT WS_VISIBLE

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,95,237,10

+    CONTROL         "Use classic dates",IDC_CLASSICDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,107,237,10

+    LTEXT           "* You need to restart Miranda NG to apply changes",IDC_RESTARTNOTE,7,145,251,22,NOT WS_VISIBLE

+    CONTROL         "Display popups about successful actions",IDC_SUCCESSPOPUPS,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,129,253,10

 END

 

 

@@ -102,9 +101,9 @@ BEGIN
     IDD_OPTIONS, DIALOG

     BEGIN

         LEFTMARGIN, 7

-        RIGHTMARGIN, 202

+        RIGHTMARGIN, 260

         TOPMARGIN, 7

-        BOTTOMMARGIN, 189

+        BOTTOMMARGIN, 167

     END

 END

 #endif    // APSTUDIO_INVOKED

@@ -135,12 +134,29 @@ END
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_VI                  ICON                    "Vi.ico"

+

 IDI_VISHOW              ICON                    "Vi show.ico"

+

 IDI_VITOCLIP            ICON                    "Vi to clipboard.ico"

+

 IDI_VITOFILE            ICON                    "Vi to file.ico"

+

 IDI_VIUPLOAD            ICON                    "Vi upload.ico"

+

 IDI_LINKTOCLIP          ICON                    "Vi link to clipboard.ico"

-#endif    // English (U.S.) resources

+

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// AFX_DIALOG_LAYOUT

+//

+

+IDD_OPTIONS AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

+#endif    // English (United States) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

@@ -150,8 +166,7 @@ IDI_LINKTOCLIP          ICON                    "Vi link to clipboard.ico"
 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

-

-

+


 /////////////////////////////////////////////////////////////////////////////

 #endif    // not APSTUDIO_INVOKED