Changeset 438

User picture

Author: nrymanov@gmail.com

(2010/02/05 08:53) About 2 years ago

see #29 - Редизайн и унификация пользовательского интерфейса

Affected files

Updated trunk/Wizards/NewCollection/frame_NCWCollectionFileTypes.dfm Download diff

437438
1
inherited frameNCWCollectionFileTypes: TframeNCWCollectionFileTypes
1
inherited frameNCWCollectionFileTypes: TframeNCWCollectionFileTypes
2
  Width = 460
2
  Width = 460
3
  Height = 268
3
  Height = 200
4
  Constraints.MinHeight = 200
4
  Constraints.MinHeight = 200
5
  Constraints.MinWidth = 460
5
  Constraints.MinWidth = 460
6
  ExplicitWidth = 460
6
  ExplicitWidth = 460
7
  ExplicitHeight = 268
7
  ExplicitHeight = 200
8
  object pageHint: TMHLStaticTip [0]
8
  object pageHint: TMHLStaticTip [0]
9
    AlignWithMargins = True
9
    AlignWithMargins = True
10
    Left = 14
10
    Left = 14

Updated trunk/Wizards/NewCollection/frame_NCWCollectionNameAndLocation.dfm Download diff

437438
1
inherited frameNCWNameAndLocation: TframeNCWNameAndLocation
1
inherited frameNCWNameAndLocation: TframeNCWNameAndLocation
2
  Width = 460
2
  Width = 460
3
  Height = 282
3
  Height = 290
4
  Constraints.MinHeight = 270
4
  Constraints.MinHeight = 290
5
  Constraints.MinWidth = 460
5
  Constraints.MinWidth = 460
6
  ExplicitWidth = 460
6
  ExplicitWidth = 460
7
  ExplicitHeight = 282
7
  ExplicitHeight = 290
8
  object Label1: TLabel [0]
8
  object Label1: TLabel [0]
9
    AlignWithMargins = True
9
    AlignWithMargins = True
10
    Left = 14
10
    Left = 14
11
    Top = 61
11
    Top = 61
12
    Width = 425
12
    Width = 432
13
    Height = 26
13
    Height = 26
14
    Margins.Left = 14
14
    Margins.Left = 14
15
    Margins.Top = 5
15
    Margins.Top = 5
16
    Margins.Right = 7
16
    Margins.Right = 14
17
    Align = alTop
17
    Align = alTop
18
    Caption = 
18
    Caption = 
19
      #1059#1082#1072#1078#1080#1090#1077' '#1085#1072#1079#1074#1072#1085#1080#1077' '#1082#1086#1083#1083#1077#1082#1094#1080#1080', '#1092#1072#1081#1083'
'#1082#1086#1083#1083#1077#1082#1094#1080#1080' '#1080' '#1087#1072#1087#1082#1091', '#1082' '#1082#1086#1090#1086#1088#1086#1081' '#1042#1099 +
19
      #1059#1082#1072#1078#1080#1090#1077' '#1085#1072#1079#1074#1072#1085#1080#1077' '#1082#1086#1083#1083#1077#1082#1094#1080#1080', '#1092#1072#1081#1083'
'#1082#1086#1083#1083#1077#1082#1094#1080#1080' '#1080' '#1087#1072#1087#1082#1091', '#1082' '#1082#1086#1090#1086#1088#1086#1081' '#1042#1099 +
20
      ' '#1087#1083#1072#1085#1080#1088#1091#1077#1090#1077' '#1093#1088#1072#1085#1080#1090#1100' '#1082#1085#1080#1075#1080'.'
20
      ' '#1087#1083#1072#1085#1080#1088#1091#1077#1090#1077' '#1093#1088#1072#1085#1080#1090#1100' '#1082#1085#1080#1075#1080'.'
21
    Transparent = True
21
    Transparent = True
22
    WordWrap = True
22
    WordWrap = True
23
    ExplicitWidth = 425
23
  end
24
  end
24
  object pageHint: TMHLStaticTip [1]
25
  object pageHint: TMHLStaticTip [1]
25
    AlignWithMargins = True
26
    AlignWithMargins = True
26
    Left = 14
27
    Left = 14
27
    Top = 213
28
    Top = 219
28
    Width = 432
29
    Width = 432
29
    Height = 58
30
    Height = 58
30
    Margins.Left = 14
31
    Margins.Left = 14
...
...
38
    Width = 460
39
    Width = 460
39
    ExplicitWidth = 460
40
    ExplicitWidth = 460
40
    inherited lblTitle: TLabel
41
    inherited lblTitle: TLabel
41
      Width = 120
42
      Width = 432
42
      Caption = #1053#1072#1079#1074#1072#1085#1080#1077' '#1082#1086#1083#1083#1077#1082#1094#1080#1080
43
      Caption = #1053#1072#1079#1074#1072#1085#1080#1077' '#1082#1086#1083#1083#1077#1082#1094#1080#1080
43
      ExplicitWidth = 120
44
      ExplicitWidth = 120
44
    end
45
    end
45
    inherited lblSubTitle: TLabel
46
    inherited lblSubTitle: TLabel
46
      Width = 278
47
      Width = 425
47
      Caption = #1059#1082#1072#1078#1080#1090#1077' '#1085#1072#1079#1074#1072#1085#1080#1077' '#1080'
'#1088#1072#1089#1087#1086#1083#1086#1078#1077#1085#1080#1077' '#1092#1072#1081#1083#1086#1074' '#1082#1086#1083#1083#1077#1082#1094#1080#1080
48
      Caption = #1059#1082#1072#1078#1080#1090#1077' '#1085#1072#1079#1074#1072#1085#1080#1077' '#1080'
'#1088#1072#1089#1087#1086#1083#1086#1078#1077#1085#1080#1077' '#1092#1072#1081#1083#1086#1074' '#1082#1086#1083#1083#1077#1082#1094#1080#1080
48
      ExplicitWidth = 278
49
      ExplicitWidth = 278
49
    end
50
    end
...
...
53
    Left = 7
54
    Left = 7
54
    Top = 100
55
    Top = 100
55
    Width = 446
56
    Width = 446
56
    Height = 110
57
    Height = 116
57
    Margins.Left = 7
58
    Margins.Left = 7
58
    Margins.Top = 10
59
    Margins.Top = 10
59
    Margins.Right = 7
60
    Margins.Right = 7
60
    Margins.Bottom = 0
61
    Margins.Bottom = 0
61
    Align = alTop
62
    Align = alTop
62
    BevelOuter = bvNone
63
    BevelOuter = bvNone
63
    Caption = '111'
64
    TabOrder = 1
64
    TabOrder = 1
65
    DesignSize = (
65
    DesignSize = (
66
      446
66
      446
67
      110)
67
      116)
68
    object Label9: TLabel
68
    object Label9: TLabel
69
      Left = 21
69
      Left = 21
70
      Top = 42
70
      Top = 42
...
...
90
      FocusControl = edCollectionName
90
      FocusControl = edCollectionName
91
    end
91
    end
92
    object edCollectionFile: TMHLAutoCompleteEdit
92
    object edCollectionFile: TMHLAutoCompleteEdit
93
      Left = 147
93
      Left = 136
94
      Top = 39
94
      Top = 39
95
      Width = 214
95
      Width = 225
96
      Height = 21
96
      Height = 21
97
      Anchors = [akLeft, akTop, akRight]
97
      Anchors = [akLeft, akTop, akRight]
98
      TabOrder = 1
98
      TabOrder = 1
...
...
111
      OnClick = btnNewFileClick
111
      OnClick = btnNewFileClick
112
    end
112
    end
113
    object edCollectionRoot: TMHLAutoCompleteEdit
113
    object edCollectionRoot: TMHLAutoCompleteEdit
114
      Left = 147
114
      Left = 136
115
      Top = 66
115
      Top = 66
116
      Width = 214
116
      Width = 225
117
      Height = 21
117
      Height = 21
118
      Anchors = [akLeft, akTop, akRight]
118
      Anchors = [akLeft, akTop, akRight]
119
      TabOrder = 3
119
      TabOrder = 3
...
...
132
      OnClick = btnSelectRootClick
132
      OnClick = btnSelectRootClick
133
    end
133
    end
134
    object edCollectionName: TEdit
134
    object edCollectionName: TEdit
135
      Left = 147
135
      Left = 136
136
      Top = 12
136
      Top = 12
137
      Width = 214
137
      Width = 225
138
      Height = 21
138
      Height = 21
139
      Anchors = [akLeft, akTop, akRight]
139
      Anchors = [akLeft, akTop, akRight]
140
      TabOrder = 0
140
      TabOrder = 0
...
...
142
      OnEnter = CheckControlData
142
      OnEnter = CheckControlData
143
    end
143
    end
144
    object cbRelativePath: TCheckBox
144
    object cbRelativePath: TCheckBox
145
      Left = 147
145
      Left = 136
146
      Top = 90
146
      Top = 93
147
      Width = 221
147
      Width = 225
148
      Height = 17
148
      Height = 17
149
      Caption = #1048#1089#1087#1086#1083#1100#1079#1086#1074#1072#1090#1100' '#1086#1090#1085#1086#1089#1080#1090#1077#1083#1100#1085#1099#1077'
'#1087#1091#1090#1080' '
149
      Caption = #1048#1089#1087#1086#1083#1100#1079#1086#1074#1072#1090#1100' '#1086#1090#1085#1086#1089#1080#1090#1077#1083#1100#1085#1099#1077'
'#1087#1091#1090#1080' '
150
      TabOrder = 5
150
      TabOrder = 5

Updated trunk/Wizards/NewCollection/frame_NCWDownload.dfm Download diff

437438
1
inherited frameNCWDownload: TframeNCWDownload
1
inherited frameNCWDownload: TframeNCWDownload
2
  object lblS1: TLabel [0]
2
  Height = 160
3
  Constraints.MinHeight = 160
4
  Constraints.MinWidth = 320
5
  ExplicitHeight = 160
6
  object lblStatus: TLabel [0]
3
    AlignWithMargins = True
7
    AlignWithMargins = True
4
    Left = 3
8
    Left = 14
5
    Top = 66
9
    Top = 63
6
    Width = 314
10
    Width = 292
7
    Height = 13
11
    Height = 13
8
    Margins.Top = 10
12
    Margins.Left = 14
9
    Margins.Bottom = 10
13
    Margins.Top = 7
14
    Margins.Right = 14
15
    Margins.Bottom = 0
10
    Align = alTop
16
    Align = alTop
11
    Alignment = taCenter
17
    Caption = #1055#1086#1076#1082#1083#1102#1095#1077#1085#1080#1077' ...'
12
    Caption = 'lblS1'
18
    ExplicitWidth = 86
13
    ExplicitWidth = 22
14
  end
19
  end
15
  object Bar: TRzProgressBar [1]
20
  object Bar: TProgressBar [1]
16
    AlignWithMargins = True
21
    AlignWithMargins = True
17
    Left = 11
22
    Left = 14
18
    Top = 99
23
    Top = 83
19
    Width = 298
24
    Width = 292
20
    Margins.Left = 11
25
    Height = 17
21
    Margins.Top = 10
26
    Margins.Left = 14
22
    Margins.Right = 11
27
    Margins.Top = 7
28
    Margins.Right = 14
29
    Margins.Bottom = 0
23
    Align = alTop
30
    Align = alTop
24
    BorderOuter = fsFlatRounded
31
    TabOrder = 1
25
    BorderWidth = 0
26
    InteriorOffset = 0
27
    PartsComplete = 0
28
    Percent = 0
29
    ThemeAware = False
30
    TotalParts = 0
31
    ExplicitLeft = 14
32
    ExplicitTop = 92
33
    ExplicitWidth = 292
34
  end
32
  end
35
  inherited pnTitle: TPanel
33
  inherited pnTitle: TPanel
36
    inherited lblTitle: TLabel
34
    inherited lblTitle: TLabel
...
...
57
    Request.BasicAuthentication = False
55
    Request.BasicAuthentication = False
58
    Request.UserAgent = 'Mozilla/3.0 (compatible; Indy Library)'
56
    Request.UserAgent = 'Mozilla/3.0 (compatible; Indy Library)'
59
    HTTPOptions = [hoForceEncodeParams]
57
    HTTPOptions = [hoForceEncodeParams]
60
    Left = 240
58
    Left = 16
61
    Top = 168
59
    Top = 112
62
  end
60
  end
63
end
61
end

Updated trunk/Wizards/NewCollection/frame_NCWDownload.pas Download diff

437438
1
{******************************************************************************}
2
{                                                                              }
3
{ MyHomeLib                                                                    }
4
{                                                                              }
5
{ Version 0.9                                                                  }
6
{ 20.08.2008                                                                   }
7
{ Copyright (c) Aleksey Penkov  alex.penkov@gmail.com                          }
8
{                                                                              }
9
{ @author Nick Rymanov nrymanov@gmail.com                                      }
10
{                                                                              }
11
{******************************************************************************}
12
13
{ TODO -oNickR -cBug :      .       . }
14
1
unit frame_NCWDownload;
15
unit frame_NCWDownload;
2
16
3
interface
17
interface
...
...
5
uses
19
uses
6
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
20
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
7
  Dialogs, frame_InteriorPageBase, StdCtrls, ExtCtrls, ComCtrls,
21
  Dialogs, frame_InteriorPageBase, StdCtrls, ExtCtrls, ComCtrls,
8
  IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdHTTP, RzPrgres;
22
  IdBaseComponent, IdComponent, IdTCPConnection, IdTCPClient, IdHTTP;
9
23
10
type
24
type
11
  TframeNCWDownload = class(TInteriorPageBase)
25
  TframeNCWDownload = class(TInteriorPageBase)
12
    HTTP: TIdHTTP;
26
    HTTP: TIdHTTP;
13
    lblS1: TLabel;
27
    lblStatus: TLabel;
14
    Bar: TRzProgressBar;
28
    Bar: TProgressBar;
15
29
30
    procedure HTTPWorkBegin(ASender: TObject; AWorkMode: TWorkMode; AWorkCountMax: Int64);
31
    procedure HTTPWork(ASender: TObject; AWorkMode: TWorkMode; AWorkCount: Int64);
32
    procedure HTTPWorkEnd(ASender: TObject; AWorkMode: TWorkMode);
16
33
17
18
    procedure HTTPWorkBegin(ASender: TObject; AWorkMode: TWorkMode;
19
      AWorkCountMax: Int64);
20
    procedure HTTPWork(ASender: TObject; AWorkMode: TWorkMode;
21
      AWorkCount: Int64);
22
    procedure HTTPWorkEnd(ASender: TObject; AWorkMode: TWorkMode);
23
  private
34
  private
24
    { Private declarations }
35
    FDownloadSize : Int64;
25
    FDownloadSize : Extended;
26
    FStartDate : TDateTime;
36
    FStartDate : TDateTime;
27
    FTerminated: Boolean;
37
    FTerminated: Boolean;
38
28
  public
39
  public
29
    function Activate(LoadData: Boolean): Boolean; override;
40
    function Activate(LoadData: Boolean): Boolean; override;
30
    function Deactivate(CheckData: Boolean): Boolean; override;
41
    function Deactivate(CheckData: Boolean): Boolean; override;
...
...
43
  unit_Settings,
54
  unit_Settings,
44
  unit_NCWParams,
55
  unit_NCWParams,
45
  frm_NCWizard;
56
  frm_NCWizard;
57
46
{$R *.dfm}
58
{$R *.dfm}
47
59
48
{ TframeNCWDownload }
60
{ TframeNCWDownload }
49
61
50
function TframeNCWDownload.Activate(LoadData: Boolean): Boolean;
62
function TframeNCWDownload.Activate(LoadData: Boolean): Boolean;
51
begin
63
begin
52
  lblS1.Caption := ' ...';
64
  lblStatus.Caption := ' ...';
53
  Bar.Percent := 0;
65
  Bar.Position := 0;
66
67
  Result := True;
54
end;
68
end;
55
69
56
function TframeNCWDownload.Deactivate(CheckData: Boolean): Boolean;
70
function TframeNCWDownload.Deactivate(CheckData: Boolean): Boolean;
57
begin
71
begin
58
  //--------------------------------
72
  Result := True;
59
end;
73
end;
60
74
61
procedure TframeNCWDownload.Download;
75
procedure TframeNCWDownload.Download;
62
var
76
var
63
  Responce: TMemoryStream;
77
  Responce: TMemoryStream;
64
begin
78
begin
79
  FTerminated := False;
80
  Responce := TMemoryStream.Create;
65
  try
81
  try
66
    FTerminated := False;
67
    Responce := TMemoryStream.Create;
68
    HTTP.Get(FPParams^.INPXUrl, Responce);
82
    HTTP.Get(FPParams^.INPXUrl, Responce);
69
    if not FTerminated then
83
    if not FTerminated then
70
    begin
84
    begin
...
...
76
  end;
90
  end;
77
end;
91
end;
78
92
79
procedure TframeNCWDownload.HTTPWork(ASender: TObject; AWorkMode: TWorkMode;
93
procedure TframeNCWDownload.HTTPWorkBegin(ASender: TObject; AWorkMode: TWorkMode; AWorkCountMax: Int64);
80
  AWorkCount: Int64);
94
begin
95
  Bar.Position := 0;
96
  FDownloadSize := AWorkCountMax;
97
  FStartDate := Now;
98
end;
99
100
procedure TframeNCWDownload.HTTPWork(ASender: TObject; AWorkMode: TWorkMode; AWorkCount: Int64);
81
var
101
var
82
  ElapsedTime: Cardinal;
102
  ElapsedTime: Cardinal;
83
  KB : extended;
103
  KB : Int64;
84
begin
104
begin
85
  KB := AWorkCount / 1024;
105
  KB := AWorkCount div 1024;
86
106
87
  if FDownloadSize <> 0 then
107
  if FDownloadSize <> 0 then
88
    Bar.Percent:= round(KB / FDownloadSize * 100);
108
    Bar.Position := AWorkCount * 100 div FDownloadSize;
89
109
90
  ElapsedTime := SecondsBetween(Now, FStartDate);
110
  ElapsedTime := SecondsBetween(Now, FStartDate);
91
  if ElapsedTime > 0 then
111
  if ElapsedTime > 0 then
92
  begin
112
  begin
93
    lblS1.Caption := Format('  %d    %d  (%n /)', [round(KB), round(FDownloadSize), KB / ElapsedTime]);
113
    { TODO -oNickR -cRefactoring :        FormatSize  }
114
    lblStatus.Caption := Format(
115
      ' %d  %d  (%n /)',
116
      [KB, FDownloadSize div 1024, KB / ElapsedTime]
117
    );
94
  end;
118
  end;
95
  Application.ProcessMessages;
119
  Application.ProcessMessages;
96
end;
120
end;
97
121
98
procedure TframeNCWDownload.HTTPWorkBegin(ASender: TObject;
99
  AWorkMode: TWorkMode; AWorkCountMax: Int64);
100
begin
101
  Bar.Percent := 0;
102
  FDownloadSize := AWorkCountMax / 1024;
103
  FStartDate := Now;
104
end;
105
106
procedure TframeNCWDownload.HTTPWorkEnd(ASender: TObject; AWorkMode: TWorkMode);
122
procedure TframeNCWDownload.HTTPWorkEnd(ASender: TObject; AWorkMode: TWorkMode);
107
begin
123
begin
108
  lblS1.Caption := ' ';
124
  lblStatus.Caption := ' ';
109
  Application.ProcessMessages;
125
  Application.ProcessMessages;
110
end;
126
end;
111
127

Updated trunk/Wizards/NewCollection/frame_NCWImport.dfm Download diff

437438
1
inherited frameNCWImport: TframeNCWImport
1
inherited frameNCWImport: TframeNCWImport
2
  Width = 474
2
  Width = 460
3
  Height = 220
3
  Height = 220
4
  Constraints.MinHeight = 220
4
  Constraints.MinHeight = 220
5
  Constraints.MinWidth = 460
5
  Constraints.MinWidth = 460
6
  ExplicitWidth = 474
6
  ExplicitWidth = 460
7
  ExplicitHeight = 220
7
  ExplicitHeight = 220
8
  object pageHint: TMHLStaticTip [0]
8
  object pageHint: TMHLStaticTip [0]
9
    AlignWithMargins = True
9
    AlignWithMargins = True
10
    Left = 14
10
    Left = 14
11
    Top = 134
11
    Top = 134
12
    Width = 446
12
    Width = 432
13
    Height = 58
13
    Height = 58
14
    Margins.Left = 14
14
    Margins.Left = 14
15
    Margins.Top = 14
15
    Margins.Top = 14
...
...
25
    ExplicitWidth = 469
25
    ExplicitWidth = 469
26
  end
26
  end
27
  inherited pnTitle: TPanel
27
  inherited pnTitle: TPanel
28
    Width = 474
28
    Width = 460
29
    ExplicitWidth = 474
29
    ExplicitWidth = 460
30
    inherited lblTitle: TLabel
30
    inherited lblTitle: TLabel
31
      Width = 446
31
      Width = 432
32
      Caption = #1048#1084#1087#1086#1088#1090
32
      Caption = #1048#1084#1087#1086#1088#1090
33
      ExplicitWidth = 44
33
      ExplicitWidth = 44
34
    end
34
    end
35
    inherited lblSubTitle: TLabel
35
    inherited lblSubTitle: TLabel
36
      Width = 439
36
      Width = 425
37
      Caption = #1048#1084#1087#1086#1088#1090#1080#1088#1086#1074#1072#1090#1100' '#1076#1072#1085#1085#1099#1077' '#1074' '#1085#1086#1074#1091#1102'
'#1082#1086#1083#1083#1077#1082#1094#1080#1102' '#1089#1088#1072#1079#1091' '#1087#1086#1089#1083#1077' '#1089#1086#1079#1076#1072#1085#1080#1103
37
      Caption = #1048#1084#1087#1086#1088#1090#1080#1088#1086#1074#1072#1090#1100' '#1076#1072#1085#1085#1099#1077' '#1074' '#1085#1086#1074#1091#1102'
'#1082#1086#1083#1083#1077#1082#1094#1080#1102' '#1089#1088#1072#1079#1091' '#1087#1086#1089#1083#1077' '#1089#1086#1079#1076#1072#1085#1080#1103
38
      ExplicitWidth = 339
38
      ExplicitWidth = 339
39
    end
39
    end
...
...
42
    AlignWithMargins = True
42
    AlignWithMargins = True
43
    Left = 14
43
    Left = 14
44
    Top = 70
44
    Top = 70
45
    Width = 453
45
    Width = 439
46
    Height = 17
46
    Height = 17
47
    Margins.Left = 14
47
    Margins.Left = 14
48
    Margins.Top = 14
48
    Margins.Top = 14
...
...
57
    AlignWithMargins = True
57
    AlignWithMargins = True
58
    Left = 7
58
    Left = 7
59
    Top = 94
59
    Top = 94
60
    Width = 460
60
    Width = 446
61
    Height = 26
61
    Height = 26
62
    Margins.Left = 7
62
    Margins.Left = 7
63
    Margins.Top = 7
63
    Margins.Top = 7
...
...
65
    Margins.Bottom = 0
65
    Margins.Bottom = 0
66
    Align = alTop
66
    Align = alTop
67
    BevelOuter = bvNone
67
    BevelOuter = bvNone
68
    Constraints.MinWidth = 460
69
    TabOrder = 2
68
    TabOrder = 2
70
    DesignSize = (
69
    DesignSize = (
71
      460
70
      446
72
      26)
71
      26)
73
    object Label4: TLabel
72
    object Label4: TLabel
74
      Left = 21
73
      Left = 21
75
      Top = 3
74
      Top = 5
76
      Width = 75
75
      Width = 75
77
      Height = 13
76
      Height = 13
78
      Caption = '&'#1060#1072#1081#1083' '#1080#1084#1087#1086#1088#1090#1072':'
77
      Caption = '&'#1060#1072#1081#1083' '#1080#1084#1087#1086#1088#1090#1072':'
79
      FocusControl = edXMLFile
78
      FocusControl = edXMLFile
80
    end
79
    end
81
    object edXMLFile: TMHLAutoCompleteEdit
80
    object edXMLFile: TMHLAutoCompleteEdit
82
      Left = 147
81
      Left = 102
83
      Top = 2
82
      Top = 2
84
      Width = 225
83
      Width = 256
85
      Height = 21
84
      Height = 21
86
      Anchors = [akLeft, akTop, akRight]
85
      Anchors = [akLeft, akTop, akRight]
87
      TabOrder = 0
86
      TabOrder = 0
88
      AutoCompleteOption = [acoFileSystem]
87
      AutoCompleteOption = [acoFileSystem]
89
    end
88
    end
90
    object btnSelectXML: TButton
89
    object btnSelectXML: TButton
91
      Left = 378
90
      Left = 364
92
      Top = 0
91
      Top = 0
93
      Width = 75
92
      Width = 75
94
      Height = 25
93
      Height = 25

Updated trunk/Wizards/NewCollection/frame_NCWInpxSource.dfm Download diff

437438
1
inherited frameNCWInpxSource: TframeNCWInpxSource
1
inherited frameNCWInpxSource: TframeNCWInpxSource
2
  Width = 330
2
  Width = 330
3
  Height = 342
3
  Height = 350
4
  Constraints.MinHeight = 240
4
  Constraints.MinHeight = 350
5
  Constraints.MinWidth = 330
5
  Constraints.MinWidth = 330
6
  ExplicitWidth = 330
6
  ExplicitWidth = 330
7
  ExplicitHeight = 342
7
  ExplicitHeight = 350
8
  object pageHint: TMHLStaticTip [0]
8
  object pageHint: TMHLStaticTip [0]
9
    AlignWithMargins = True
9
    AlignWithMargins = True
10
    Left = 14
10
    Left = 14
...
...
43
    TabOrder = 1
43
    TabOrder = 1
44
    object rbLocal: TRadioButton
44
    object rbLocal: TRadioButton
45
      AlignWithMargins = True
45
      AlignWithMargins = True
46
      Left = 18
46
      Left = 14
47
      Top = 7
47
      Top = 7
48
      Width = 294
48
      Width = 302
49
      Height = 17
49
      Height = 17
50
      Margins.Left = 18
50
      Margins.Left = 14
51
      Margins.Top = 7
51
      Margins.Top = 7
52
      Margins.Right = 18
52
      Margins.Right = 14
53
      Margins.Bottom = 0
53
      Margins.Bottom = 0
54
      Align = alTop
54
      Align = alTop
55
      Caption = #1051#1086#1082#1072#1083#1100#1085#1099#1081' '#1092#1072#1081#1083' INPX '
55
      Caption = #1051#1086#1082#1072#1083#1100#1085#1099#1081' '#1092#1072#1081#1083' INPX '
...
...
58
    end
58
    end
59
    object edINPXPath: TRzButtonEdit
59
    object edINPXPath: TRzButtonEdit
60
      AlignWithMargins = True
60
      AlignWithMargins = True
61
      Left = 18
61
      Left = 14
62
      Top = 27
62
      Top = 27
63
      Width = 294
63
      Width = 302
64
      Height = 21
64
      Height = 21
65
      Margins.Left = 18
65
      Margins.Left = 14
66
      Margins.Right = 18
66
      Margins.Right = 14
67
      Margins.Bottom = 0
67
      Margins.Bottom = 0
68
      Align = alTop
68
      Align = alTop
69
      TabOrder = 1
69
      TabOrder = 1
...
...
73
    end
73
    end
74
    object rbDownload: TRadioButton
74
    object rbDownload: TRadioButton
75
      AlignWithMargins = True
75
      AlignWithMargins = True
76
      Left = 18
76
      Left = 14
77
      Top = 55
77
      Top = 55
78
      Width = 294
78
      Width = 302
79
      Height = 17
79
      Height = 17
80
      Margins.Left = 18
80
      Margins.Left = 14
81
      Margins.Top = 7
81
      Margins.Top = 7
82
      Margins.Right = 18
82
      Margins.Right = 14
83
      Margins.Bottom = 0
83
      Margins.Bottom = 0
84
      Align = alTop
84
      Align = alTop
85
      Caption = #1047#1072#1075#1088#1091#1079#1080#1090#1100' '#1089' '#1089#1072#1081#1090#1072
85
      Caption = #1047#1072#1075#1088#1091#1079#1080#1090#1100' '#1089' '#1089#1072#1081#1090#1072
...
...
88
    end
88
    end
89
    object lvCollections: TListView
89
    object lvCollections: TListView
90
      AlignWithMargins = True
90
      AlignWithMargins = True
91
      Left = 18
91
      Left = 14
92
      Top = 75
92
      Top = 75
93
      Width = 294
93
      Width = 302
94
      Height = 140
94
      Height = 140
95
      Margins.Left = 18
95
      Margins.Left = 14
96
      Margins.Right = 18
96
      Margins.Right = 14
97
      Margins.Bottom = 10
97
      Margins.Bottom = 10
98
      Align = alClient
98
      Align = alClient
99
      Columns = <
99
      Columns = <

Updated trunk/Wizards/NewCollection/frame_NCWInpxSource.pas Download diff

437438
1
{******************************************************************************}
1
{ ****************************************************************************** }
2
{                                                                              }
2
{ }
3
{ MyHomeLib                                                                    }
3
{ MyHomeLib }
4
{                                                                              }
4
{ }
5
{ Version 0.9                                                                  }
5
{ Version 0.9 }
6
{ 20.08.2008                                                                   }
6
{ 20.08.2008 }
7
{ Copyright (c) Aleksey Penkov  alex.penkov@gmail.com                          }
7
{ Copyright (c) Aleksey Penkov  alex.penkov@gmail.com }
8
{                                                                              }
8
{ }
9
{                                                                              }
9
{ }
10
{******************************************************************************}
10
{ ****************************************************************************** }
11
11
12
unit frame_NCWInpxSource;
12
unit frame_NCWInpxSource;
13
13
...
...
15
15
16
uses
16
uses
17
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
17
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
18
  Dialogs, frame_InteriorPageBase, StdCtrls, ExtCtrls, unit_StaticTip, unit_NCWParams,
18
  Dialogs, frame_InteriorPageBase, StdCtrls, ExtCtrls, unit_StaticTip,
19
  unit_NCWParams,
19
  Mask, RzEdit, RzBtnEdt, ComCtrls;
20
  Mask, RzEdit, RzBtnEdt, ComCtrls;
20
21
21
type
22
type
...
...
40
      Change: TItemChange);
41
      Change: TItemChange);
41
  private
42
  private
42
    FCollections: array of TCollectionDesc;
43
    FCollections: array of TCollectionDesc;
43
    FGroups : array of string;
44
    FGroups: array of string;
44
45
45
    procedure LoadDescriptions;
46
    procedure LoadDescriptions;
46
  public
47
  public
...
...
65
  unit_Helpers,
66
  unit_Helpers,
66
  ZipForge,
67
  ZipForge,
67
  IniFiles;
68
  IniFiles;
68
69
{$R *.dfm}
69
{$R *.dfm}
70
70
71
const
71
const
72
73
  INPX_SECTION = 'INPX';
72
  INPX_SECTION = 'INPX';
74
  INPX_GROUP_SECTION = 'GROUPS';
73
  INPX_GROUP_SECTION = 'GROUPS';
75
  INPX_KEY_PREFIX = 'Inpx';
74
  INPX_KEY_PREFIX = 'Inpx';
76
  INPX_GROUP_KEY_PREFIX = 'Group';
75
  INPX_GROUP_KEY_PREFIX = 'Group';
77
76
78
  DefaultGroups : array [0..2] of string = (' Lib.rus.ec',' flibusta.net',' ');
77
  DefaultGroups: array [0 .. 2] of string = (' Lib.rus.ec', ' flibusta.net', ' ');
79
78
80
  DefaultCollections : array [0 .. 8] of TCollectionDesc = (
79
  DefaultCollections: array [0 .. 8] of TCollectionDesc =
81
    (Group: 0; Title: 'Lib.rus.ec [FB2]'; Desc: ' FB2 (fb2-xxxxxx-xxxxxx.zip)'; INPX: 'librusec.inpx'),
80
  (
82
    (Group: 0; Title: 'Lib.rus.ec [USR]'; Desc: ' USR (usr-xxxxxx-xxxxxx.zip)'; INPX: 'librusec_usr.inpx'),
81
    (Group: 0; Title: 'Lib.rus.ec [FB2]';        Desc: ' FB2 (fb2-xxxxxx-xxxxxx.zip)'; INPX: 'librusec.inpx'),
83
    (Group: 0; Title: 'Lib.rus.ec [ALLBOOKS]'; Desc: '  (fb2-xxxxxx-xxxxxx.zip  usr-xxxxxx-xxxxxx.zip)'; INPX: 'librusec_allbooks.inpx'),
82
    (Group: 0; Title: 'Lib.rus.ec [USR]';        Desc: ' USR (usr-xxxxxx-xxxxxx.zip)'; INPX: 'librusec_usr.inpx'),
83
    (Group: 0; Title: 'Lib.rus.ec [ALLBOOKS]';   Desc: '  (fb2-xxxxxx-xxxxxx.zip  usr-xxxxxx-xxxxxx.zip)';    INPX: 'librusec_allbooks.inpx'),
84
    (Group: 0; Title: 'Lib.rus.ec Online [FB2]'; Desc: '      lib.rus.ec ( )'; INPX: 'librusec_online.inpx'),
84
    (Group: 0; Title: 'Lib.rus.ec Online [FB2]'; Desc: '      lib.rus.ec ( )'; INPX: 'librusec_online.inpx'),
85
    (Group: 1; Title: 'Flibusta OnLine [FB2]'; Desc: '      flibusta.net'; INPX: 'flibusta_online.inpx'),
85
    (Group: 1; Title: 'Flibusta OnLine [FB2]';   Desc: '      flibusta.net'; INPX: 'flibusta_online.inpx'),
86
    (Group: 2; Title: 'Traum 2.11 [FB2]'; Desc: '  2.11'; INPX: 'Traum_2-11.inpx'),
86
    (Group: 2; Title: 'Traum 2.11 [FB2]';        Desc: '  2.11'; INPX: 'Traum_2-11.inpx'),
87
    (Group: 2; Title: 'Traum 2.12 [FB2]'; Desc: '  2.12'; INPX: 'Traum_2-12.inpx'),
87
    (Group: 2; Title: 'Traum 2.12 [FB2]';        Desc: '  2.12'; INPX: 'Traum_2-12.inpx'),
88
    (Group: 2; Title: 'Traum 2.13 [FB2]'; Desc: '  2.13 ( FB2)'; INPX: 'Traum_2-13_fb2.inpx'),
88
    (Group: 2; Title: 'Traum 2.13 [FB2]';        Desc: '  2.13 ( FB2)'; INPX: 'Traum_2-13_fb2.inpx'),
89
    (Group: 2; Title: 'Traum 2.13 [ALLBOOKS]'; Desc: '  2.13 ()'; INPX: 'Traum_2-13_full.inpx')
89
    (Group: 2; Title: 'Traum 2.13 [ALLBOOKS]';   Desc: '  2.13 ()'; INPX: 'Traum_2-13_full.inpx')
90
    );
90
  );
91
91
92
function TframeNCWInpxSource.Activate(LoadData: Boolean): Boolean;
92
function TframeNCWInpxSource.Activate(LoadData: Boolean): Boolean;
93
begin
93
begin
...
...
127
  end;
127
  end;
128
end;
128
end;
129
129
130
131
132
procedure TframeNCWInpxSource.FillList;
130
procedure TframeNCWInpxSource.FillList;
133
var
131
var
134
  I: Integer;
132
  I: integer;
135
  G : TListGroup;
133
  G: TListGroup;
136
  Item: TListItem;
134
  Item: TListItem;
137
begin
135
begin
138
  LoadDescriptions;
136
  LoadDescriptions;
139
  lvCollections.Groups.Clear;
140
  lvCollections.Items.Clear;
141
  for I := 0 to High(FGroups) do
142
  begin
143
    G := lvCollections.Groups.Add;
144
    G.Header := FGroups[i];
145
  end;
146
137
147
  for I := 0 to High(FCollections) do
138
  lvCollections.Items.BeginUpdate;
148
  begin
139
  try
149
    Item := lvCollections.Items.Add;
140
    lvCollections.Groups.Clear;
150
    Item.Caption := FCollections[i].Title;
141
    lvCollections.Items.Clear;
151
    Item.GroupID := FCollections[i].Group;
142
143
    for I := 0 to High(FGroups) do
144
    begin
145
      G := lvCollections.Groups.Add;
146
      G.Header := FGroups[I];
147
    end;
148
149
    for I := 0 to High(FCollections) do
150
    begin
151
      Item := lvCollections.Items.Add;
152
      Item.Caption := FCollections[I].Title;
153
      Item.GroupID := FCollections[I].Group;
154
    end;
155
  finally
156
    lvCollections.Items.EndUpdate;
152
  end;
157
  end;
153
154
end;
158
end;
155
159
156
procedure TframeNCWInpxSource.LoadDescriptions;
160
procedure TframeNCWInpxSource.LoadDescriptions;
157
var
161
var
158
  i: Integer;
162
  I: integer;
159
  sl: TStringList;
163
  sl: TStringList;
160
  slHelper: TStringList;
164
  slHelper: TStringList;
161
  INIFile: TMemIniFile;
165
  INIFile: TMemIniFile;
162
begin
166
begin
167
  INIFile := TMemIniFile.Create(Settings.WorkPath + 'collections.ini');
163
  try
168
  try
164
    INIFile := TMemIniFile.Create(Settings.WorkPath + 'collections.ini');
165
    INIFile.Encoding := TEncoding.UTF8;
169
    INIFile.Encoding := TEncoding.UTF8;
166
170
167
    sl := TStringList.Create;
171
    sl := TStringList.Create;
172
    try
173
      INIFile.ReadSection(INPX_GROUP_SECTION, sl);
174
      //  
175
      if sl.Count > 0 then
176
      begin
177
        SetLength(FGroups, sl.Count);
178
        for I := 0 to sl.Count - 1 do
179
          if Pos(INPX_GROUP_KEY_PREFIX, sl[I]) = 1 then
180
            FGroups[I] := INIFile.ReadString(INPX_GROUP_SECTION, sl[I], '');
181
      end // if
182
      else
183
      begin
184
        //    
185
      end;
168
186
169
    iniFile.ReadSection(INPX_GROUP_SECTION, sl);
187
      INIFile.ReadSection(INPX_SECTION, sl);
170
    //      
188
      //  
171
    if sl.Count > 0 then
189
      if sl.Count > 0 then
172
    begin
190
      begin
173
      SetLength(FGroups, sl.Count);
191
        SetLength(FCollections, sl.Count);
174
      for i := 0 to sl.Count - 1 do
192
        slHelper := TStringList.Create;
175
        if Pos(INPX_GROUP_KEY_PREFIX, sl[i]) = 1 then
193
        try
176
            FGroups[i] := iniFile.ReadString(INPX_GROUP_SECTION, sl[i], '');
194
          slHelper.QuoteChar := '"';
177
195
          slHelper.Delimiter := ';';
178
    end // if
196
          slHelper.StrictDelimiter := True;
179
    else
197
          for I := 0 to sl.Count - 1 do
180
    begin
181
      //        
182
    end;
183
184
185
    iniFile.ReadSection(INPX_SECTION, sl);
186
    //      
187
    if sl.Count > 0 then
188
    begin
189
      SetLength(FCollections, sl.Count);
190
      slHelper := TStringList.Create;
191
      try
192
        slHelper.QuoteChar := '"';
193
        slHelper.Delimiter := ';';
194
        slHelper.StrictDelimiter := True;
195
        for i := 0 to sl.Count - 1 do
196
        begin
197
          if Pos(INPX_KEY_PREFIX, sl[i]) = 1 then
198
          begin
198
          begin
199
            slHelper.DelimitedText := iniFile.ReadString(INPX_SECTION, sl[i], '');
199
            if Pos(INPX_KEY_PREFIX, sl[I]) = 1 then
200
            if slHelper.Count > 4 then
201
            begin
200
            begin
202
              FCollections[i].Group := StrToInt(slHelper[0]);
201
              slHelper.DelimitedText := INIFile.ReadString(INPX_SECTION, sl[I], '');
203
              FCollections[i].Title := slHelper[1];
202
              if slHelper.Count > 4 then
204
              FCollections[i].Desc  := slHelper[2];
203
              begin
205
              FCollections[i].Inpx  := slHelper[3];
204
                FCollections[I].Group := StrToInt(slHelper[0]);
205
                FCollections[I].Title := slHelper[1];
206
                FCollections[I].Desc := slHelper[2];
207
                FCollections[I].INPX := slHelper[3];
208
              end;
206
            end;
209
            end;
207
          end;
210
          end;
211
        finally
212
          slHelper.Free;
208
        end;
213
        end;
209
      finally
214
      end // if
210
        slHelper.Free;
215
      else
216
      begin
217
        //  inpx  
218
        // SetLength(FCollections, 9);
219
        // FCollections := DefaultCollections;
211
      end;
220
      end;
212
    end // if
221
    finally
213
    else
222
      sl.Free;
214
    begin
215
      //      inpx  
216
//      SetLength(FCollections, 9);
217
//      FCollections := DefaultCollections;
218
    end;
223
    end;
219
  finally
224
  finally
220
    sl.Free;
225
    INIFile.Free;
221
    IniFile.Free;
222
  end;
226
  end;
223
end;
227
end;
224
228
225
procedure TframeNCWInpxSource.lvCollectionsChange(Sender: TObject;
229
procedure TframeNCWInpxSource.lvCollectionsChange(Sender: TObject; Item: TListItem; Change: TItemChange);
226
  Item: TListItem; Change: TItemChange);
227
begin
230
begin
228
  pageHint.Caption := FCollections[Item.Index].Desc;
231
  pageHint.Caption := FCollections[Item.Index].Desc;
229
  FPParams^.INPXFile := Settings.WorkPath + FCollections[Item.Index].INPX;
232
  FPParams^.INPXFile := Settings.WorkPath + FCollections[Item.Index].INPX;
230
  FPPArams^.INPXUrl := Settings.InpxURL + FCollections[Item.Index].INPX;
233
  FPParams^.INPXUrl := Settings.INPXUrl + FCollections[Item.Index].INPX;
231
end;
234
end;
232
235
233
procedure TframeNCWInpxSource.OnSetCollectionType(Sender: TObject);
236
procedure TframeNCWInpxSource.OnSetCollectionType(Sender: TObject);
234
begin
237
begin
235
  if Sender = rbLocal then
238
  if Sender = rbLocal then
236
    pageHint.Caption := LOCAL
239
    pageHint.Caption := LOCAL
237
  else pageHint.Caption := SERVERDOWNLOAD;
240
  else
241
    pageHint.Caption := SERVERDOWNLOAD;
238
242
239
  edINPXPath.Enabled := rbLocal.Checked;
243
  edINPXPath.Enabled := rbLocal.Checked;
240
  lvCollections.Enabled := rbDownload.Checked;
244
  lvCollections.Enabled := rbDownload.Checked;
241
end;
245
end;
242
246
243
end.
247
end.
244

Updated trunk/Wizards/NewCollection/frame_NCWOperation.dfm Download diff

437438
1
inherited frameNCWOperation: TframeNCWOperation
1
inherited frameNCWOperation: TframeNCWOperation
2
  Width = 330
2
  Width = 330
3
  Height = 214
3
  Height = 210
4
  Constraints.MinHeight = 190
4
  Constraints.MinHeight = 210
5
  Constraints.MinWidth = 330
5
  Constraints.MinWidth = 330
6
  ExplicitWidth = 330
6
  ExplicitWidth = 330
7
  ExplicitHeight = 214
7
  ExplicitHeight = 210
8
  object pageHint: TMHLStaticTip [0]
8
  object pageHint: TMHLStaticTip [0]
9
    AlignWithMargins = True
9
    AlignWithMargins = True
10
    Left = 14
10
    Left = 14
...
...
50
      Margins.Top = 7
50
      Margins.Top = 7
51
      Margins.Right = 7
51
      Margins.Right = 7
52
      Margins.Bottom = 0
52
      Margins.Bottom = 0
53
      Caption = '&'#1053#1086#1074#1072#1103'   '#1087#1091#1089#1090#1072#1103' '#1082#1086#1083#1083#1077#1082#1094#1080#1103
53
      Caption = '&'#1053#1086#1074#1072#1103' '#1087#1091#1089#1090#1072#1103' '#1082#1086#1083#1083#1077#1082#1094#1080#1103
54
      Checked = True
54
      Checked = True
55
      TabOrder = 0
55
      TabOrder = 0
56
      TabStop = True
56
      TabStop = True

Updated trunk/Wizards/NewCollection/frame_NCWProgress.dfm Download diff

437438
23
    ExplicitTop = 13
23
    ExplicitTop = 13
24
    ExplicitWidth = 345
24
    ExplicitWidth = 345
25
  end
25
  end
26
  object Bar: TRzProgressBar [1]
26
  object Bar: TProgressBar [1]
27
    AlignWithMargins = True
27
    AlignWithMargins = True
28
    Left = 11
28
    Left = 14
29
    Top = 86
29
    Top = 83
30
    Width = 438
30
    Width = 432
31
    Margins.Left = 11
31
    Height = 17
32
    Margins.Top = 10
32
    Margins.Left = 14
33
    Margins.Right = 11
33
    Margins.Top = 7
34
    Margins.Right = 14
35
    Margins.Bottom = 0
34
    Align = alTop
36
    Align = alTop
35
    BorderOuter = fsFlatRounded
37
    TabOrder = 3
36
    BorderWidth = 0
37
    InteriorOffset = 0
38
    PartsComplete = 0
39
    Percent = 0
40
    ThemeAware = False
41
    TotalParts = 0
42
    ExplicitLeft = 14
43
    ExplicitTop = 92
44
    ExplicitWidth = 292
45
  end
38
  end
46
  inherited pnTitle: TPanel
39
  inherited pnTitle: TPanel
47
    Width = 460
40
    Width = 460
...
...
60
  object errorLog: TListView
53
  object errorLog: TListView
61
    AlignWithMargins = True
54
    AlignWithMargins = True
62
    Left = 14
55
    Left = 14
63
    Top = 120
56
    Top = 107
64
    Width = 432
57
    Width = 432
65
    Height = 137
58
    Height = 150
66
    Margins.Left = 14
59
    Margins.Left = 14
67
    Margins.Top = 7
60
    Margins.Top = 7
68
    Margins.Right = 14
61
    Margins.Right = 14
...
...
89
    SmallImages = DMUser.SeverityImages
82
    SmallImages = DMUser.SeverityImages
90
    TabOrder = 1
83
    TabOrder = 1
91
    ViewStyle = vsReport
84
    ViewStyle = vsReport
92
    ExplicitTop = 107
93
    ExplicitHeight = 150
94
  end
85
  end
95
  object pnButtons: TPanel
86
  object pnButtons: TPanel
96
    Left = 0
87
    Left = 0

Updated trunk/Wizards/NewCollection/frame_NCWProgress.pas Download diff

437438
17
uses
17
uses
18
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
18
  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
19
  Dialogs, frame_WizardPageBase, frame_InteriorPageBase, StdCtrls, ExtCtrls, ComCtrls,
19
  Dialogs, frame_WizardPageBase, frame_InteriorPageBase, StdCtrls, ExtCtrls, ComCtrls,
20
  unit_WorkerThread, unit_NCWParams, RzPrgres;
20
  unit_WorkerThread, unit_NCWParams;
21
21
22
const
22
const
23
  PM_WORKERDONE = WM_USER + 0;
23
  PM_WORKERDONE = WM_USER + 0;
...
...
28
    errorLog: TListView;
28
    errorLog: TListView;
29
    pnButtons: TPanel;
29
    pnButtons: TPanel;
30
    btnSaveLog: TButton;
30
    btnSaveLog: TButton;
31
    Bar: TRzProgressBar;
31
    Bar: TProgressBar;
32
  private
32
  private
33
    FErrors: TStringList;
33
    FErrors: TStringList;
34
34
...
...
82
82
83
function TframeNCWProgress.PageButtons: TWizardButtons;
83
function TframeNCWProgress.PageButtons: TWizardButtons;
84
begin
84
begin
85
  Result := [wbCancel, wbCancel];
85
  Result := [wbCancel];
86
end;
86
end;
87
87
88
procedure TframeNCWProgress.OpenProgress;
88
procedure TframeNCWProgress.OpenProgress;
89
begin
89
begin
90
  Bar.Percent := 0;
90
  Bar.Position := 0;
91
end;
91
end;
92
92
93
procedure TframeNCWProgress.SetComment(const Comment: string);
93
procedure TframeNCWProgress.SetComment(const Comment: string);
...
...
97
97
98
procedure TframeNCWProgress.ShowProgress(Percent: Integer);
98
procedure TframeNCWProgress.ShowProgress(Percent: Integer);
99
begin
99
begin
100
  Bar.Percent  := Percent;
100
  Bar.Position := Percent;
101
end;
101
end;
102
102
103
procedure TframeNCWProgress.ShowTeletype(const Msg: string; Severity: TTeletypeSeverity);
103
procedure TframeNCWProgress.ShowTeletype(const Msg: string; Severity: TTeletypeSeverity);

Updated trunk/Wizards/NewCollection/frame_NCWSelectGenreFile.dfm Download diff

437438
51
      460
51
      460
52
      92)
52
      92)
53
    object Label10: TLabel
53
    object Label10: TLabel
54
      Left = 21
54
      Left = 28
55
      Top = 65
55
      Top = 65
56
      Width = 71
56
      Width = 71
57
      Height = 13
57
      Height = 13
...
...
91
      OnClick = OnSetFileType
91
      OnClick = OnSetFileType
92
    end
92
    end
93
    object edGenreList: TMHLAutoCompleteEdit
93
    object edGenreList: TMHLAutoCompleteEdit
94
      Left = 147
94
      Left = 105
95
      Top = 62
95
      Top = 62
96
      Width = 218
96
      Width = 260
97
      Height = 21
97
      Height = 21
98
      Anchors = [akLeft, akTop, akRight]
98
      Anchors = [akLeft, akTop, akRight]
99
      Enabled = False
99
      Enabled = False

Updated trunk/Wizards/NewCollection/frm_NCWizard.pas Download diff

437438
356
  //    
356
  //    
357
  //
357
  //
358
  FParams.Operation := otNew;
358
  FParams.Operation := otNew;
359
//  FParams.CollectionType := ltEmpty;
359
  // FParams.CollectionType := ltEmpty;
360
360
361
  FParams.CollectionType := ltLRELocal;
361
  FParams.CollectionType := ltLRELocal;
362
362
...
...
389
    frame.Enabled := False;
389
    frame.Enabled := False;
390
    frame.Visible := False;
390
    frame.Visible := False;
391
    frame.Initialize(@FParams);
391
    frame.Initialize(@FParams);
392
393
  end;
392
  end;
394
393
395
 { TODO -oAlex -cRefactoring : !       ? }
394
 { TODO -oAlex -cRefactoring : !       ? }