Merge branch 'develop'

docs/README-ru.md

@@ -1,4 +1,4 @@
-Auto Screenshot
+Auto Screenshot
 ===============
 
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/artem78/AutoScreenshot?style=plastic)](https://github.com/artem78/AutoScreenshot/releases/latest)   [![GitHub license](https://img.shields.io/github/license/artem78/AutoScreenshot?style=plastic)](https://github.com/artem78/AutoScreenshot/blob/master/LICENSE.txt)
@@ -14,6 +14,7 @@
 * Возможность приостановки захвата при бездействии пользователя (определяется по движениям мыши и нажатиям клавиш) 
 * Настраиваемые имена выходных файлов с использованием переменных (дата, время, название компьютера/пользователя) и возможностью группировки по папкам (например, по дням или месяцам)
 * Возможность автоматического запуска вместе с Windows
+* Захват с нескольких экранов
 
 ## Снимки экрана
 ![Основное окно программы](images/main_window_ru.png "Основное окно программы")

docs/README.md

@@ -1,4 +1,4 @@
-[![Russian](images/russian_icon.png) RU](README-ru.md "Russian")
+[![Russian](images/russian_icon.png) RU](README-ru.md "Russian")
 
 -------------------------  
 
@@ -16,6 +16,7 @@ Auto Screenshot
 * Pause capture when user is inactive (depending on mouse moves and keyboard events) 
 * Customizable output filenames with variables (date, time, user, computer name) and ability of grouping by folders (for example: by day or month)
 * Automatic capture can be started on Windows startup
+* Multiple screens support
 
 ## Screenshots
 ![Main program window](images/main_window.png "Main program window")

uAbout.dfm

@@ -3,7 +3,7 @@ object AboutForm: TAboutForm
   Top = 124
   BorderStyle = bsDialog
   Caption = 'About'
-  ClientHeight = 191
+  ClientHeight = 209
   ClientWidth = 481
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -16,7 +16,7 @@ object AboutForm: TAboutForm
   OnCreate = FormCreate
   DesignSize = (
     481
-    191)
+    209)
   PixelsPerInch = 96
   TextHeight = 15
   object ProgramNameLabel: TTntLabel
@@ -48,7 +48,7 @@ object AboutForm: TAboutForm
   end
   object LinkLabel: TTntLabel
     Left = 104
-    Top = 112
+    Top = 136
     Width = 25
     Height = 15
     Cursor = crHandPoint
@@ -74,9 +74,16 @@ object AboutForm: TAboutForm
     Height = 15
     Caption = 'Build date: XX.XX.XXXX'
   end
+  object LocalizationAuthorLabel: TTntLabel
+    Left = 104
+    Top = 112
+    Width = 80
+    Height = 15
+    Caption = 'Localization: ...'
+  end
   object CloseButton: TTntButton
     Left = 192
-    Top = 152
+    Top = 170
     Width = 97
     Height = 25
     Anchors = [akLeft, akBottom]

uAbout.pas

@@ -15,6 +15,7 @@   TAboutForm = class(TTntForm)
     LinkLabel: TTntLabel;
     Logo: TTntImage;
     BuildDateLabel: TTntLabel;
+    LocalizationAuthorLabel: TTntLabel;
     procedure CloseButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure LinkLabelClick(Sender: TObject);
@@ -46,14 +47,24 @@ procedure TAboutForm.FormCreate(Sender: TObject);
   BuildDate: TDateTime;
   BuildDateStr: WideString;
 begin
-  Caption := I18N('About');
+  Caption := Localizer.I18N('About');
 
   Logo.Picture.Icon.Handle := LoadImage(HInstance, 'MAINICON', IMAGE_ICON,
       64, 64, LR_DEFAULTCOLOR);
 
   ProgramNameLabel.Caption := TntApplication.Title;
-  VersionLabel.Caption := I18N('Version') + ': ' + GetProgramVersionStr(True);
-  AuthorLabel.Caption := I18N('Author') + ': ' + 'Artem Demin (artem78) <[email protected]>';
+  VersionLabel.Caption := Localizer.I18N('Version') + ': ' + GetProgramVersionStr(True);
+  AuthorLabel.Caption := Localizer.I18N('Author') + ': ' + 'Artem Demin (artem78) <[email protected]>';
+  with Localizer.LanguageInfo do
+  begin
+    if (Code <> 'en') and (Author <> '') then
+    begin
+      LocalizationAuthorLabel.Caption := Localizer.I18N('LocalizationAuthor') + ': ' + Author;
+      LocalizationAuthorLabel.Show;
+    end
+    else
+      LocalizationAuthorLabel.Hide;
+  end;
   LinkLabel.Caption := ProjectGitHubURL;
 
   BuildDate := GetLinkerTimeStamp;
@@ -64,9 +75,9 @@ procedure TAboutForm.FormCreate(Sender: TObject);
     BuildDateStr := 'unknown'
   else
     BuildDateStr := FormatDateTime({'dddddd tt'} 'dddddd', BuildDate);
-  BuildDateLabel.Caption := I18N('BuildDate') + ': ' + BuildDateStr;
+  BuildDateLabel.Caption := Localizer.I18N('BuildDate') + ': ' + BuildDateStr;
 
-  CloseButton.Caption := I18N('Close');
+  CloseButton.Caption := Localizer.I18N('Close');
 end;
 
 procedure TAboutForm.LinkLabelClick(Sender: TObject);

uAutoScreen.dfm

@@ -4,18 +4,22 @@ object MainForm: TMainForm
   BorderIcons = [biSystemMenu, biMinimize]
   BorderStyle = bsSingle
   Caption = 'Auto Screenshot'
-  ClientHeight = 328
+  ClientHeight = 363
   ClientWidth = 633
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -12
   Font.Name = 'Arial'
   Font.Style = []
+  Menu = MainMenu
   OldCreateOrder = False
   Position = poScreenCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  DesignSize = (
+    633
+    363)
   PixelsPerInch = 96
   TextHeight = 15
   object OutputDirLabel: TTntLabel
@@ -73,6 +77,14 @@ object MainForm: TMainForm
     Alignment = taRightJustify
     Caption = 'Color depth:'
   end
+  object MonitorLabel: TTntLabel
+    Left = 123
+    Top = 236
+    Width = 78
+    Height = 15
+    Alignment = taRightJustify
+    Caption = 'Used monitor:'
+  end
   object OutputDirEdit: TTntEdit
     Left = 208
     Top = 20
@@ -92,11 +104,12 @@ object MainForm: TMainForm
   end
   object TakeScreenshotButton: TTntButton
     Left = 32
-    Top = 276
+    Top = 311
     Width = 121
     Height = 25
+    Anchors = [akLeft, akBottom]
     Caption = 'Take screenshot'
-    TabOrder = 14
+    TabOrder = 15
     OnClick = TakeScreenshotButtonClick
   end
   object JPEGQualitySpinEdit: TSpinEdit
@@ -132,18 +145,6 @@ object MainForm: TMainForm
     TabOrder = 10
     OnClick = StopWhenInactiveCheckBoxClick
   end
-  object LanguageRadioGroup: TTntRadioGroup
-    Left = 520
-    Top = 160
-    Width = 97
-    Height = 57
-    Caption = 'Language'
-    Items.Strings = (
-      'English'
-      #1056#1091#1089#1089#1082#1080#1081)
-    TabOrder = 13
-    OnClick = LanguageRadioGroupClick
-  end
   object ImageFormatComboBox: TTntComboBox
     Left = 208
     Top = 104
@@ -158,11 +159,12 @@ object MainForm: TMainForm
   end
   object AutoCaptureControlGroup: TTntGroupBox
     Left = 208
-    Top = 248
+    Top = 283
     Width = 281
     Height = 65
+    Anchors = [akLeft, akBottom]
     Caption = 'Automatic capture'
-    TabOrder = 17
+    TabOrder = 16
     object StartAutoCaptureButton: TTntBitBtn
       Left = 24
       Top = 24
@@ -186,15 +188,6 @@ object MainForm: TMainForm
       Spacing = 8
     end
   end
-  object AboutButton: TTntButton
-    Left = 520
-    Top = 272
-    Width = 97
-    Height = 25
-    Caption = 'About'
-    TabOrder = 16
-    OnClick = AboutButtonClick
-  end
   object StartCaptureOnStartUpCheckBox: TTntCheckBox
     Left = 208
     Top = 160
@@ -275,9 +268,22 @@ object MainForm: TMainForm
     Width = 265
     Height = 17
     Caption = 'Run application at system startup'
-    TabOrder = 15
+    TabOrder = 13
     OnClick = AutoRunCheckBoxClick
   end
+  object MonitorComboBox: TTntComboBox
+    Left = 208
+    Top = 232
+    Width = 265
+    Height = 23
+    Style = csDropDownList
+    ItemHeight = 15
+    TabOrder = 14
+    OnChange = MonitorComboBoxChange
+    Items.Strings = (
+      ''
+      '')
+  end
   object Timer: TTimer
     Enabled = False
     OnTimer = TimerTimer
@@ -330,4 +336,21 @@ object MainForm: TMainForm
     Left = 16
     Top = 168
   end
+  object MainMenu: TTntMainMenu
+    Left = 40
+    Top = 40
+    object OptionsSubMenu: TTntMenuItem
+      Caption = 'Options'
+      object LanguageSubMenu: TTntMenuItem
+        Caption = 'Language'
+      end
+    end
+    object HelpSubMenu: TTntMenuItem
+      Caption = 'Help'
+      object AboutMenuItem: TTntMenuItem
+        Caption = 'About...'
+        OnClick = AboutMenuItemClick
+      end
+    end
+  end
 end