From 52c0403596e7896f9d8c65316a52f14f8513ff13 Mon Sep 17 00:00:00 2001 From: bart <9132501-flyingsheep@users.noreply.gitlab.com> Date: Sun, 12 Oct 2014 12:29:55 +0000 Subject: [PATCH] PoChecker: - GUI updates, functional and cosmetic. - regenerate language files. git-svn-id: trunk@46538 - --- .../pochecker/languages/pocheckerconsts.cs.po | 6 +- .../pochecker/languages/pocheckerconsts.de.po | 8 +- .../pochecker/languages/pocheckerconsts.es.po | 6 +- .../pochecker/languages/pocheckerconsts.hu.po | 6 +- .../pochecker/languages/pocheckerconsts.it.po | 6 +- .../pochecker/languages/pocheckerconsts.ja.po | 6 +- .../pochecker/languages/pocheckerconsts.lt.po | 6 +- .../pochecker/languages/pocheckerconsts.po | 6 +- .../languages/pocheckerconsts.pt_BR.po | 6 +- .../pochecker/languages/pocheckerconsts.ru.po | 8 +- .../pochecker/languages/pocheckerconsts.uk.po | 6 +- components/pochecker/pocheckerconsts.pas | 3 +- components/pochecker/pocheckermain.lfm | 72 +++++++++++------- components/pochecker/pocheckermain.pp | 73 +++++++++++-------- 14 files changed, 151 insertions(+), 67 deletions(-) diff --git a/components/pochecker/languages/pocheckerconsts.cs.po b/components/pochecker/languages/pocheckerconsts.cs.po index 2e3c575908..aee8fb1d2c 100644 --- a/components/pochecker/languages/pocheckerconsts.cs.po +++ b/components/pochecker/languages/pocheckerconsts.cs.po @@ -354,6 +354,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -409,7 +413,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.de.po b/components/pochecker/languages/pocheckerconsts.de.po index 08d80f4cf0..d2f465b31f 100644 --- a/components/pochecker/languages/pocheckerconsts.de.po +++ b/components/pochecker/languages/pocheckerconsts.de.po @@ -357,6 +357,10 @@ msgstr "Verzeichnis durchsuchen" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "&Alle auswählen" @@ -417,7 +421,9 @@ msgid "&Unselect All" msgstr "Alle abwählen" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +#, fuzzy +#| msgid "Unselect" +msgid "Unselect all files" msgstr "Abwählen" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.es.po b/components/pochecker/languages/pocheckerconsts.es.po index 05ef6a6a0b..db542f381b 100644 --- a/components/pochecker/languages/pocheckerconsts.es.po +++ b/components/pochecker/languages/pocheckerconsts.es.po @@ -345,6 +345,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -398,7 +402,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.hu.po b/components/pochecker/languages/pocheckerconsts.hu.po index 2a0f158e87..2f97e9ea0c 100644 --- a/components/pochecker/languages/pocheckerconsts.hu.po +++ b/components/pochecker/languages/pocheckerconsts.hu.po @@ -351,6 +351,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "Összes kijelölése" @@ -405,7 +409,7 @@ msgid "&Unselect All" msgstr "Kijelölések törlése" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.it.po b/components/pochecker/languages/pocheckerconsts.it.po index 7e5853689a..aca347a3ed 100644 --- a/components/pochecker/languages/pocheckerconsts.it.po +++ b/components/pochecker/languages/pocheckerconsts.it.po @@ -347,6 +347,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "Seleziona &Tutto" @@ -406,7 +410,7 @@ msgid "&Unselect All" msgstr "&Deseleziona tutto" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.ja.po b/components/pochecker/languages/pocheckerconsts.ja.po index 7ef929d193..74dffc5458 100644 --- a/components/pochecker/languages/pocheckerconsts.ja.po +++ b/components/pochecker/languages/pocheckerconsts.ja.po @@ -351,6 +351,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -406,7 +410,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.lt.po b/components/pochecker/languages/pocheckerconsts.lt.po index c0478f013e..dd22895992 100644 --- a/components/pochecker/languages/pocheckerconsts.lt.po +++ b/components/pochecker/languages/pocheckerconsts.lt.po @@ -347,6 +347,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -398,7 +402,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.po b/components/pochecker/languages/pocheckerconsts.po index 268dd167a1..7031912910 100644 --- a/components/pochecker/languages/pocheckerconsts.po +++ b/components/pochecker/languages/pocheckerconsts.po @@ -324,6 +324,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -373,7 +377,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.pt_BR.po b/components/pochecker/languages/pocheckerconsts.pt_BR.po index ebdad35c08..b05c1cd9df 100644 --- a/components/pochecker/languages/pocheckerconsts.pt_BR.po +++ b/components/pochecker/languages/pocheckerconsts.pt_BR.po @@ -345,6 +345,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -398,7 +402,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.ru.po b/components/pochecker/languages/pocheckerconsts.ru.po index 46b8580989..d759277ee9 100644 --- a/components/pochecker/languages/pocheckerconsts.ru.po +++ b/components/pochecker/languages/pocheckerconsts.ru.po @@ -360,6 +360,10 @@ msgstr "Искать в каталоге" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests #| msgid "Select &All Tests" msgid "Select &All" @@ -422,7 +426,9 @@ msgid "&Unselect All" msgstr "&Снять выбор" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +#, fuzzy +#| msgid "Unselect" +msgid "Unselect all files" msgstr "Снять выбор" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/languages/pocheckerconsts.uk.po b/components/pochecker/languages/pocheckerconsts.uk.po index 9e1f7b889a..7ce7d97e0f 100644 --- a/components/pochecker/languages/pocheckerconsts.uk.po +++ b/components/pochecker/languages/pocheckerconsts.uk.po @@ -344,6 +344,10 @@ msgstr "" msgid "Scanning in progress, please wait ..." msgstr "" +#: pocheckerconsts.sselectalllistbox +msgid "Select all files" +msgstr "" + #: pocheckerconsts.sselectalltests msgid "Select &All" msgstr "" @@ -395,7 +399,7 @@ msgid "&Unselect All" msgstr "" #: pocheckerconsts.sunselectlistbox -msgid "Unselect" +msgid "Unselect all files" msgstr "" #: pocheckerconsts.suntranslated diff --git a/components/pochecker/pocheckerconsts.pas b/components/pochecker/pocheckerconsts.pas index 4d92bc990b..25057dff09 100644 --- a/components/pochecker/pocheckerconsts.pas +++ b/components/pochecker/pocheckerconsts.pas @@ -18,7 +18,8 @@ resourcestring sScanDir = 'Scan a folder'; sRunSelectedTests = '&Run Selected Tests'; sClearListBox = 'Clear'; - sUnselectListBox = 'Unselect'; + sUnselectListBox = 'Unselect all files'; + sSelectAllListBox = 'Select all files'; sAllLanguages = 'All Languages'; sCannotFindMaster = 'Cannot find master po file:' + LineEnding + '%s' + LineEnding + 'for selected file' + LineEnding + '%s'; //sNotAProperFileName = 'Selected filename' + LineEnding + '%s' + LineEnding + 'does not seem to be a proper name for a po-file'; diff --git a/components/pochecker/pocheckermain.lfm b/components/pochecker/pocheckermain.lfm index 9e2810e1aa..c1f15e8eaf 100644 --- a/components/pochecker/pocheckermain.lfm +++ b/components/pochecker/pocheckermain.lfm @@ -133,51 +133,54 @@ object PoCheckerForm: TPoCheckerForm ParentColor = False ParentFont = False end - object SelectBasicBtn: TButton + object SelectBasicTestsBtn: TButton AnchorSideLeft.Control = TestListBox AnchorSideTop.Control = TestListBox AnchorSideTop.Side = asrBottom Left = 201 Height = 25 Top = 153 - Width = 115 + Width = 117 + AutoSize = True BorderSpacing.Top = 6 Caption = 'Select Basic Tests' Enabled = False - OnClick = SelectBasicBtnClick + OnClick = SelectBasicTestsBtnClick TabOrder = 3 end - object SelectAllBtn: TButton - AnchorSideLeft.Control = SelectBasicBtn + object SelectAllTestsBtn: TButton + AnchorSideLeft.Control = SelectBasicTestsBtn AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = SelectBasicBtn - Left = 320 + AnchorSideTop.Control = SelectBasicTestsBtn + Left = 322 Height = 25 Top = 153 - Width = 115 + Width = 104 + AutoSize = True BorderSpacing.Left = 4 Caption = 'Select All Tests' Enabled = False - OnClick = SelectAllBtnClick + OnClick = SelectAllTestsBtnClick TabOrder = 4 end - object UnselectAllBtn: TButton - AnchorSideLeft.Control = SelectAllBtn + object UnselectAllTestsBtn: TButton + AnchorSideLeft.Control = SelectAllTestsBtn AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = SelectAllBtn - Left = 439 + AnchorSideTop.Control = SelectAllTestsBtn + Left = 430 Height = 25 Top = 153 - Width = 115 + Width = 118 + AutoSize = True BorderSpacing.Left = 4 Caption = 'Unselect All Tests' Enabled = False - OnClick = UnselectAllBtnClick + OnClick = UnselectAllTestsBtnClick TabOrder = 5 end object IgnoreFuzzyCheckBox: TCheckBox AnchorSideLeft.Control = TestListBox - AnchorSideTop.Control = SelectBasicBtn + AnchorSideTop.Control = SelectBasicTestsBtn AnchorSideTop.Side = asrBottom Left = 201 Height = 19 @@ -313,7 +316,7 @@ object PoCheckerForm: TPoCheckerForm TabOrder = 10 Text = 'All languages' end - object ClearMasterBtn: TButton + object ClearMasterFilesBtn: TButton AnchorSideLeft.Control = MasterPoListBox AnchorSideTop.Control = MasterPoListBox AnchorSideTop.Side = asrBottom @@ -321,28 +324,45 @@ object PoCheckerForm: TPoCheckerForm Left = 8 Height = 25 Top = 426 - Width = 75 + Width = 53 Anchors = [akLeft, akBottom] + AutoSize = True BorderSpacing.Top = 10 Caption = 'Clear' - OnClick = ClearMasterBtnClick + OnClick = ClearMasterFilesBtnClick TabOrder = 11 end - object UnselectMasterBtn: TButton - AnchorSideLeft.Control = ClearMasterBtn + object UnselectAllMasterFilesBtn: TButton + AnchorSideLeft.Control = SelectAllMasterFilesBtn AnchorSideLeft.Side = asrBottom AnchorSideBottom.Control = NoErrLabel - Left = 93 + Left = 167 Height = 25 Top = 426 - Width = 75 + Width = 110 Anchors = [akLeft, akBottom] - BorderSpacing.Left = 10 - Caption = 'Unselect' + AutoSize = True + BorderSpacing.Left = 5 + Caption = 'Unselect all files' Enabled = False - OnClick = UnselectMasterBtnClick + OnClick = UnselectAllMasterFilesBtnClick TabOrder = 12 end + object SelectAllMasterFilesBtn: TButton + AnchorSideLeft.Control = ClearMasterFilesBtn + AnchorSideLeft.Side = asrBottom + AnchorSideBottom.Control = NoErrLabel + Left = 66 + Height = 25 + Top = 426 + Width = 96 + Anchors = [akLeft, akBottom] + AutoSize = True + BorderSpacing.Left = 5 + Caption = 'Select all files' + OnClick = SelectAllMasterFilesBtnClick + TabOrder = 13 + end object OpenDialog: TOpenDialog Filter = 'po-files (*.po)|*.po|all files|*' Options = [ofFileMustExist, ofEnableSizing, ofViewDetail] diff --git a/components/pochecker/pocheckermain.pp b/components/pochecker/pocheckermain.pp index 6e202d466d..7c58bfd3e0 100644 --- a/components/pochecker/pocheckermain.pp +++ b/components/pochecker/pocheckermain.pp @@ -40,23 +40,25 @@ type { TPoCheckerForm } TPoCheckerForm = class(TForm) + SelectAllMasterFilesBtn: TButton; SelectDirectoryDialog: TSelectDirectoryDialog; - UnselectMasterBtn: TButton; - ClearMasterBtn: TButton; + UnselectAllMasterFilesBtn: TButton; + ClearMasterFilesBtn: TButton; LangFilter: TComboBox; MasterPoListBox: TListBox; ScanDirBtn: TBitBtn; StatusBar: TStatusBar; procedure MasterPoListBoxResize(Sender: TObject); - procedure ClearMasterBtnClick(Sender: TObject); + procedure ClearMasterFilesBtnClick(Sender: TObject); procedure FormShow(Sender: TObject); procedure LangFilterChange(Sender: TObject); procedure MasterPoListBoxDrawItem(Control: TWinControl; Index: Integer; ARect: TRect; State: TOwnerDrawState); procedure MasterPoListBoxSelectionChange(Sender: TObject; User: boolean); procedure ScanDirBtnClick(Sender: TObject); + procedure SelectAllMasterFilesBtnClick(Sender: TObject); procedure UnselectChildBtnClick(Sender: TObject); - procedure UnselectMasterBtnClick(Sender: TObject); + procedure UnselectAllMasterFilesBtnClick(Sender: TObject); private //PoFamily: TPoFamily; PoFamilyList: TPoFamilyList; @@ -86,9 +88,9 @@ type procedure PopulateLangFilter; published IgnoreFuzzyCheckBox: TCheckBox; - UnselectAllBtn: TButton; - SelectAllBtn: TButton; - SelectBasicBtn: TButton; + UnselectAllTestsBtn: TButton; + SelectAllTestsBtn: TButton; + SelectBasicTestsBtn: TButton; NoErrLabel: TLabel; RunBtn: TBitBtn; OpenBtn: TBitBtn; @@ -100,9 +102,9 @@ type procedure FormDestroy(Sender: TObject); procedure OpenBtnClick(Sender: TObject); procedure RunBtnClick(Sender: TObject); - procedure SelectAllBtnClick(Sender: TObject); - procedure SelectBasicBtnClick(Sender: TObject); - procedure UnselectAllBtnClick(Sender: TObject); + procedure SelectAllTestsBtnClick(Sender: TObject); + procedure SelectBasicTestsBtnClick(Sender: TObject); + procedure UnselectAllTestsBtnClick(Sender: TObject); end; var @@ -162,16 +164,17 @@ begin OpenBtn.Caption := sOpenAPoFile; ScanDirBtn.Caption := sScanDir; RunBtn.Caption := sRunSelectedTests; - ClearMasterBtn.Caption := sClearListBox; - UnselectMasterBtn.Caption := sUnselectListBox; + ClearMasterFilesBtn.Caption := sClearListBox; + UnselectAllMasterFilesBtn.Caption := sUnselectListBox; + SelectAllMasterFilesBtn.Caption := sSelectAllListBox; LangFilter.Items[0] := sAllLanguages; NoErrLabel.Caption := sNoErrorsFound; FillTestListBox; ClearStatusBar; NoErrLabel.Visible := False; - SelectAllBtn.Caption := sSelectAllTests; - SelectBasicBtn.Caption := sSelectBasicTests; - UnselectAllBtn.Caption := sUnselectAllTests; + SelectAllTestsBtn.Caption := sSelectAllTests; + SelectBasicTestsBtn.Caption := sSelectBasicTests; + UnselectAllTestsBtn.Caption := sUnselectAllTests; PopulateLangFilter; LoadConfig; LangFilter.Invalidate; //Items[0] may have been changed @@ -229,13 +232,13 @@ begin end; end; -procedure TPoCheckerForm.SelectAllBtnClick(Sender: TObject); +procedure TPoCheckerForm.SelectAllTestsBtnClick(Sender: TObject); begin TestListBox.CheckAll(cbChecked, False, False); end; -procedure TPoCheckerForm.SelectBasicBtnClick(Sender: TObject); +procedure TPoCheckerForm.SelectBasicTestsBtnClick(Sender: TObject); var i: integer; begin @@ -244,7 +247,7 @@ begin TestListBox.Checked[i] := True; end; -procedure TPoCheckerForm.UnselectAllBtnClick(Sender: TObject); +procedure TPoCheckerForm.UnselectAllTestsBtnClick(Sender: TObject); begin TestListBox.CheckAll(cbUnchecked, False, False); end; @@ -269,7 +272,7 @@ begin end; -procedure TPoCheckerForm.ClearMasterBtnClick(Sender: TObject); +procedure TPoCheckerForm.ClearMasterFilesBtnClick(Sender: TObject); begin MasterPoListBox.Clear; UpdateGUI(False); @@ -309,7 +312,8 @@ begin begin UpdateGUI(MasterPoListBox.SelCount > 0); end; - UnselectMasterBtn.Enabled := (MasterPoListBox.SelCount <> 0); + UnselectAllMasterFilesBtn.Enabled := (MasterPoListBox.SelCount <> 0); + SelectAllMasterFilesBtn.Enabled := (MasterPoListBox.Items.Count > 0); end; procedure TPoCheckerForm.ScanDirBtnClick(Sender: TObject); @@ -320,11 +324,17 @@ begin end; end; +procedure TPoCheckerForm.SelectAllMasterFilesBtnClick(Sender: TObject); +begin + MasterPoListBox.SelectAll; + UpdateGUI(MasterPoListBox.SelCount > 0); +end; + procedure TPoCheckerForm.UnselectChildBtnClick(Sender: TObject); begin end; -procedure TPoCheckerForm.UnselectMasterBtnClick(Sender: TObject); +procedure TPoCheckerForm.UnselectAllMasterFilesBtnClick(Sender: TObject); begin MasterPoListBox.ClearSelection; UpdateGUI(False); @@ -461,6 +471,7 @@ begin ML.Add(S); end; if (ML.Count > 0) then AddToMasterPoList(ML); + UpdateGUI(MasterPoListBox.SelCount > 0); finally SL.Free; ML.Free; @@ -611,20 +622,24 @@ begin begin RunBtn.Enabled := True; TestListBox.Enabled := True; - SelectAllBtn.Enabled := True; - SelectBasicBtn.Enabled := True; - UnselectAllBtn.Enabled := True; - UnselectMasterBtn.Enabled := True; + SelectAllTestsBtn.Enabled := True; + SelectBasicTestsBtn.Enabled := True; + UnselectAllTestsBtn.Enabled := True; + UnselectAllMasterFilesBtn.Enabled := True; + IgnoreFuzzyCheckBox.Enabled := True; end else begin RunBtn.Enabled := False; TestListBox.Enabled := False; - SelectAllBtn.Enabled := False; - SelectBasicBtn.Enabled := False; - UnselectAllBtn.Enabled := False; - UnselectMasterBtn.Enabled := False; + SelectAllTestsBtn.Enabled := False; + SelectBasicTestsBtn.Enabled := False; + UnselectAllTestsBtn.Enabled := False; + UnselectAllMasterFilesBtn.Enabled := False; + IgnoreFuzzyCheckBox.Enabled := False; end; + ClearMasterFilesBtn.Enabled := (MasterPoListBox.Items.Count > 0); + SelectAllMasterFilesBtn.Enabled := (MasterPoListBox.Items.Count > 0); end; function TPoCheckerForm.GetSelectedMasterFiles: TStringList;