db_autobackups:

- fixes #2811 (Db_autobackups: выводить подсказку о том, когда случится следующий бэкап);
- code cleaning;
- version bump

1 files changed, 26 insertions, 26 deletions

diff --git a/plugins/Db_autobackups/res/db_autobackups.rc b/plugins/Db_autobackups/res/db_autobackups.rc
index a4f2ca9d8a..695d07024a 100644
--- a/plugins/Db_autobackups/res/db_autobackups.rc
+++ b/plugins/Db_autobackups/res/db_autobackups.rc
@@ -23,35 +23,36 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 // Dialog

 //

 

-IDD_OPTIONS DIALOGEX 0, 0, 271, 229

+IDD_OPTIONS DIALOGEX 0, 0, 271, 226

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

     GROUPBOX        "Automatic backups",IDC_STATIC,6,4,258,215,WS_GROUP

-    CONTROL         "Disabled",IDC_RAD_DISABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,19,128,10

-    CONTROL         "When Miranda starts",IDC_RAD_START,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,32,153,10

-    CONTROL         "When Miranda exits",IDC_RAD_EXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,45,156,10

-    CONTROL         "Every:",IDC_RAD_PERIODIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,58,43,10

-    EDITTEXT        IDC_ED_PERIOD,116,57,30,12,ES_NUMBER,WS_EX_RIGHT

-    CONTROL         "",SPIN_PERIOD,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,136,58,10,12

-    COMBOBOX        IDC_PT,148,57,46,30,CBS_DROPDOWNLIST | WS_TABSTOP

-    LTEXT           "Number of backups to keep:",IDC_STATIC,17,79,147,8

-    EDITTEXT        IDC_ED_NUMBACKUPS,171,77,36,12,ES_NUMBER,WS_EX_RIGHT

-    CONTROL         "",SPIN_NUMBACKUPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,205,77,12,12

-    LTEXT           "Backup to folder:",IDC_STATIC,18,102,124,11

-    EDITTEXT        IDC_ED_FOLDER,17,115,177,13,ES_AUTOHSCROLL

-    PUSHBUTTON      "Browse...",IDC_BUT_BROWSE,199,114,49,14

+    CONTROL         "Disabled",IDC_RAD_DISABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,19,128,10

+    CONTROL         "When Miranda starts",IDC_RAD_START,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,31,153,10

+    CONTROL         "When Miranda exits",IDC_RAD_EXIT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,43,156,10

+    CONTROL         "Every:",IDC_RAD_PERIODIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,56,43,10

+    EDITTEXT        IDC_ED_PERIOD,177,55,30,13,ES_NUMBER,WS_EX_RIGHT

+    CONTROL         "",SPIN_PERIOD,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,201,56,10,12

+    COMBOBOX        IDC_PT,209,55,46,30,CBS_DROPDOWNLIST | WS_TABSTOP

+    LTEXT           "",IDC_NEXTTIME,29,71,225,11,0,WS_EX_STATICEDGE

+    LTEXT           "Number of backups to keep:",IDC_STATIC,13,89,180,8

+    EDITTEXT        IDC_ED_NUMBACKUPS,211,87,36,12,ES_NUMBER,WS_EX_RIGHT

+    CONTROL         "",SPIN_NUMBACKUPS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,245,87,12,12

+    LTEXT           "Backup to folder:",IDC_STATIC,13,102,124,11

+    EDITTEXT        IDC_ED_FOLDER,13,115,177,13,ES_AUTOHSCROLL

+    PUSHBUTTON      "Browse...",IDC_BUT_BROWSE,207,114,49,14

     CONTROL         "Go to the ""Options -> Customize -> Folders"" to change settings",IDC_LNK_FOLDERS,

-                    "Hyperlink",NOT WS_VISIBLE | WS_TABSTOP,17,111,231,17

-    LTEXT           "Backup file mask:",IDC_STATIC,17,135,231,8

-    EDITTEXT        IDC_FILEMASK,17,145,231,14,ES_AUTOHSCROLL

-    CONTROL         "Compress backup to zip-archive",IDC_CHK_USEZIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,165,231,10

-    CONTROL         "Backup profile folder",IDC_BACKUPPROFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,177,176,10

-    CONTROL         "Disable progress bar",IDC_CHK_NOPROG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,191,231,10

-    CONTROL         "Use CloudFile",IDC_CLOUDFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,203,105,10

-    COMBOBOX        IDC_CLOUDFILESEVICE,131,201,117,30,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "Backup NOW",IDC_BUT_NOW,173,19,75,14

+                    "Hyperlink",NOT WS_VISIBLE | WS_TABSTOP,13,112,243,17

+    LTEXT           "Backup file mask:",IDC_STATIC,13,135,243,8

+    EDITTEXT        IDC_FILEMASK,13,145,243,14,ES_AUTOHSCROLL

+    CONTROL         "Compress backup to zip-archive",IDC_CHK_USEZIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,165,243,10

+    CONTROL         "Backup profile folder",IDC_BACKUPPROFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,26,178,176,10

+    CONTROL         "Disable progress bar",IDC_CHK_NOPROG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,191,243,10

+    CONTROL         "Use CloudFile",IDC_CLOUDFILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,203,105,10

+    COMBOBOX        IDC_CLOUDFILESEVICE,139,200,117,30,CBS_DROPDOWNLIST | CBS_SORT | WS_DISABLED | WS_VSCROLL | WS_TABSTOP

+    PUSHBUTTON      "Backup NOW",IDC_BUT_NOW,181,19,75,14

 END

 

 IDD_COPYPROGRESS DIALOGEX 0, 0, 186, 58

@@ -77,9 +78,8 @@ BEGIN
     BEGIN

         LEFTMARGIN, 6

         RIGHTMARGIN, 264

-        VERTGUIDE, 17

-        VERTGUIDE, 193

-        VERTGUIDE, 248

+        VERTGUIDE, 13

+        VERTGUIDE, 256

         TOPMARGIN, 4

         BOTTOMMARGIN, 219

     END