POChecker: fixed loading of master files selection state on Linux/GTK2

git-svn-id: trunk@52450 -
This commit is contained in:
maxim 2016-06-07 12:13:30 +00:00
parent 968167616f
commit ef85a2851f
2 changed files with 43 additions and 35 deletions

View File

@ -9,6 +9,7 @@ object PoCheckerForm: TPoCheckerForm
ClientWidth = 644 ClientWidth = 644
Constraints.MinHeight = 450 Constraints.MinHeight = 450
Constraints.MinWidth = 600 Constraints.MinWidth = 600
OnClose = FormClose
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy OnDestroy = FormDestroy
OnShow = FormShow OnShow = FormShow
@ -34,7 +35,7 @@ object PoCheckerForm: TPoCheckerForm
'sCheckForDuplicateUntranslatedValues' 'sCheckForDuplicateUntranslatedValues'
'sCheckStatistics' 'sCheckStatistics'
) )
ItemHeight = 17 ItemHeight = 21
TabOrder = 3 TabOrder = 3
Data = { Data = {
06000000000000000000 06000000000000000000
@ -46,7 +47,7 @@ object PoCheckerForm: TPoCheckerForm
Left = 201 Left = 201
Height = 15 Height = 15
Top = 8 Top = 8
Width = 93 Width = 124
BorderSpacing.Left = 9 BorderSpacing.Left = 9
Caption = 'Select test types' Caption = 'Select test types'
Font.Style = [fsBold] Font.Style = [fsBold]
@ -122,9 +123,9 @@ object PoCheckerForm: TPoCheckerForm
end end
object NoErrLabel: TLabel object NoErrLabel: TLabel
Left = 8 Left = 8
Height = 25 Height = 22
Top = 451 Top = 454
Width = 146 Width = 170
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
Caption = 'No errors found' Caption = 'No errors found'
Font.Color = clGreen Font.Color = clGreen
@ -138,9 +139,9 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideTop.Control = TestListBox AnchorSideTop.Control = TestListBox
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 201 Left = 201
Height = 25 Height = 27
Top = 153 Top = 153
Width = 117 Width = 128
AutoSize = True AutoSize = True
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'Select Basic Tests' Caption = 'Select Basic Tests'
@ -152,10 +153,10 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideLeft.Control = SelectBasicTestsBtn AnchorSideLeft.Control = SelectBasicTestsBtn
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = SelectBasicTestsBtn AnchorSideTop.Control = SelectBasicTestsBtn
Left = 322 Left = 333
Height = 25 Height = 27
Top = 153 Top = 153
Width = 104 Width = 110
AutoSize = True AutoSize = True
BorderSpacing.Left = 4 BorderSpacing.Left = 4
Caption = 'Select All Tests' Caption = 'Select All Tests'
@ -167,10 +168,10 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideLeft.Control = SelectAllTestsBtn AnchorSideLeft.Control = SelectAllTestsBtn
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = SelectAllTestsBtn AnchorSideTop.Control = SelectAllTestsBtn
Left = 430 Left = 447
Height = 25 Height = 27
Top = 153 Top = 153
Width = 118 Width = 127
AutoSize = True AutoSize = True
BorderSpacing.Left = 4 BorderSpacing.Left = 4
Caption = 'Unselect All Tests' Caption = 'Unselect All Tests'
@ -183,17 +184,17 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideTop.Control = SelectBasicTestsBtn AnchorSideTop.Control = SelectBasicTestsBtn
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 201 Left = 201
Height = 19 Height = 22
Top = 184 Top = 186
Width = 152 Width = 186
BorderSpacing.Top = 6 BorderSpacing.Top = 6
Caption = 'sIgnoreFuzzyTranslations' Caption = 'sIgnoreFuzzyTranslations'
TabOrder = 7 TabOrder = 7
end end
object StatusBar: TStatusBar object StatusBar: TStatusBar
Left = 0 Left = 0
Height = 23 Height = 19
Top = 490 Top = 494
Width = 644 Width = 644
Panels = <> Panels = <>
end end
@ -257,8 +258,8 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = NoErrLabel AnchorSideBottom.Control = NoErrLabel
Left = 8 Left = 8
Height = 185 Height = 183
Top = 208 Top = 213
Width = 629 Width = 629
Anchors = [akTop, akLeft, akRight, akBottom] Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Top = 5 BorderSpacing.Top = 5
@ -272,6 +273,7 @@ object PoCheckerForm: TPoCheckerForm
Sorted = True Sorted = True
Style = lbOwnerDrawFixed Style = lbOwnerDrawFixed
TabOrder = 8 TabOrder = 8
TopIndex = -1
end end
object LangFilter: TComboBox object LangFilter: TComboBox
AnchorSideLeft.Control = MasterPoListBox AnchorSideLeft.Control = MasterPoListBox
@ -279,12 +281,12 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideRight.Control = TestListBox AnchorSideRight.Control = TestListBox
AnchorSideRight.Side = asrBottom AnchorSideRight.Side = asrBottom
Left = 8 Left = 8
Height = 23 Height = 25
Top = 400 Top = 399
Width = 629 Width = 629
Anchors = [akLeft, akRight] Anchors = [akLeft, akRight]
BorderSpacing.Top = 5 BorderSpacing.Top = 5
ItemHeight = 15 ItemHeight = 0
ItemIndex = 0 ItemIndex = 0
Items.Strings = ( Items.Strings = (
'All languages' 'All languages'
@ -323,9 +325,9 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
AnchorSideBottom.Control = NoErrLabel AnchorSideBottom.Control = NoErrLabel
Left = 8 Left = 8
Height = 25 Height = 27
Top = 426 Top = 427
Width = 53 Width = 46
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Top = 10 BorderSpacing.Top = 10
@ -338,9 +340,9 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideBottom.Control = NoErrLabel AnchorSideBottom.Control = NoErrLabel
Left = 167 Left = 167
Height = 25 Height = 27
Top = 426 Top = 427
Width = 110 Width = 120
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Left = 5 BorderSpacing.Left = 5
@ -353,10 +355,10 @@ object PoCheckerForm: TPoCheckerForm
AnchorSideLeft.Control = ClearMasterFilesBtn AnchorSideLeft.Control = ClearMasterFilesBtn
AnchorSideLeft.Side = asrBottom AnchorSideLeft.Side = asrBottom
AnchorSideBottom.Control = NoErrLabel AnchorSideBottom.Control = NoErrLabel
Left = 66 Left = 59
Height = 25 Height = 27
Top = 426 Top = 427
Width = 96 Width = 103
Anchors = [akLeft, akBottom] Anchors = [akLeft, akBottom]
AutoSize = True AutoSize = True
BorderSpacing.Left = 5 BorderSpacing.Left = 5

View File

@ -46,6 +46,7 @@ type
MasterPoListBox: TListBox; MasterPoListBox: TListBox;
ScanDirBtn: TBitBtn; ScanDirBtn: TBitBtn;
StatusBar: TStatusBar; StatusBar: TStatusBar;
procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
procedure MasterPoListBoxResize(Sender: TObject); procedure MasterPoListBoxResize(Sender: TObject);
procedure ClearMasterFilesBtnClick(Sender: TObject); procedure ClearMasterFilesBtnClick(Sender: TObject);
procedure FormShow(Sender: TObject); procedure FormShow(Sender: TObject);
@ -153,7 +154,6 @@ procedure TPoCheckerForm.FormDestroy(Sender: TObject);
begin begin
if Assigned(PoFamilyList) then if Assigned(PoFamilyList) then
PoFamilyList.Free; PoFamilyList.Free;
SaveConfig;
if Assigned(FPoCheckerSettings) then if Assigned(FPoCheckerSettings) then
FPoCheckerSettings.Free; FPoCheckerSettings.Free;
end; end;
@ -254,6 +254,12 @@ begin
LangFilter.Top := ATop + 5; LangFilter.Top := ATop + 5;
end; end;
procedure TPoCheckerForm.FormClose(Sender: TObject;
var CloseAction: TCloseAction);
begin
SaveConfig;
end;
procedure TPoCheckerForm.ClearMasterFilesBtnClick(Sender: TObject); procedure TPoCheckerForm.ClearMasterFilesBtnClick(Sender: TObject);
begin begin
MasterPoListBox.Clear; MasterPoListBox.Clear;
@ -263,6 +269,7 @@ end;
procedure TPoCheckerForm.FormShow(Sender: TObject); procedure TPoCheckerForm.FormShow(Sender: TObject);
begin begin
WindowState := FPoCheckerSettings.MainFormWindowState; WindowState := FPoCheckerSettings.MainFormWindowState;
SetSelectedMasterFiles(FPoCheckerSettings.MasterPoSelList);
end; end;
procedure TPoCheckerForm.MasterPoListBoxDrawItem(Control: TWinControl; procedure TPoCheckerForm.MasterPoListBoxDrawItem(Control: TWinControl;
@ -739,7 +746,6 @@ begin
ID := LangAbbrToLangId(Abbr); ID := LangAbbrToLangId(Abbr);
LangFilter.ItemIndex := LangIdToLangFilterIndex(ID); LangFilter.ItemIndex := LangIdToLangFilterIndex(ID);
AddToMasterPoList(FPoCheckerSettings.MasterPoList); AddToMasterPoList(FPoCheckerSettings.MasterPoList);
SetSelectedMasterFiles(FPoCheckerSettings.MasterPoSelList);
end; end;
procedure TPoCheckerForm.SaveConfig; procedure TPoCheckerForm.SaveConfig;