|
|
@@ -59,7 +59,6 @@ type
|
|
|
btnAdd: TcxButton;
|
|
|
cxImageList: TcxImageList;
|
|
|
btnDelete: TcxButton;
|
|
|
- comboPresets: TcxComboBox;
|
|
|
Label4: TLabel;
|
|
|
btnEdit: TcxButton;
|
|
|
btnCopyPreset: TcxButton;
|
|
|
@@ -157,7 +156,6 @@ type
|
|
|
procedure pmnuCopyJsonContentClick(Sender: TObject);
|
|
|
procedure btnAddClick(Sender: TObject);
|
|
|
procedure btnDeleteClick(Sender: TObject);
|
|
|
- procedure comboPresetsPropertiesChange(Sender: TObject);
|
|
|
procedure btnSaveClick(Sender: TObject);
|
|
|
procedure btnEditClick(Sender: TObject);
|
|
|
procedure btnCopyPresetClick(Sender: TObject);
|
|
|
@@ -203,10 +201,12 @@ type
|
|
|
procedure EditorEnter(Sender: TObject);
|
|
|
procedure EditorExit(Sender: TObject);
|
|
|
procedure tbbtnVariablesClick(Sender: TObject);
|
|
|
+ procedure memDataPresetsAfterScroll(DataSet: TDataSet);
|
|
|
+ procedure memDataPresetsAfterEdit(DataSet: TDataSet);
|
|
|
+ procedure memDataPresetsBeforeScroll(DataSet: TDataSet);
|
|
|
private
|
|
|
FProjectConfig: TJSONConfig;
|
|
|
FActiveProject: string;
|
|
|
- FActivePreset: string;
|
|
|
FIsTempProjectLoaded: Boolean;
|
|
|
FTempProjectFile: string;
|
|
|
FRoamingSavePath: string;
|
|
|
@@ -228,7 +228,6 @@ type
|
|
|
procedure DoGETRequest(const AMethodType: TMethodType);
|
|
|
procedure DoPOSTRequest(const AMethodType: TMethodType);
|
|
|
procedure UpdateEditor(const AText: string);
|
|
|
- procedure UpdatePresetsCombobox;
|
|
|
procedure CheckForUpdate;
|
|
|
function GenerateGuid: string;
|
|
|
function Encode(const AText: string): string;
|
|
|
@@ -326,17 +325,6 @@ begin
|
|
|
end;
|
|
|
end;
|
|
|
|
|
|
-procedure TfrmMain.UpdatePresetsCombobox;
|
|
|
-var
|
|
|
- i: Integer;
|
|
|
-begin
|
|
|
- comboPresets.Properties.Items.Clear;
|
|
|
- for i := 0 to FPresetsList.Count - 1 do
|
|
|
- begin
|
|
|
- comboPresets.Properties.Items.Add(Decode(FPresetsList.ValueFromIndex[i]));
|
|
|
- end;
|
|
|
-end;
|
|
|
-
|
|
|
procedure TfrmMain.tbbtnAutoOpenLastUsedClick(Sender: TObject);
|
|
|
begin
|
|
|
MainConfig.WriteBool('Project', 'AutoOpenLastUsed', tbbtnAutoOpenLastUsed.Down);
|
|
|
@@ -368,11 +356,12 @@ end;
|
|
|
|
|
|
procedure TfrmMain.AddPreset(const APresetName: string);
|
|
|
begin
|
|
|
- FPresetsList.AddPair(GenerateGuid, Encode(APresetName));
|
|
|
- UpdatePresetsCombobox;
|
|
|
- comboPresets.ItemIndex := comboPresets.Properties.Items.Count - 1;
|
|
|
-
|
|
|
- FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
+ ShowMessage('not implemented yet');
|
|
|
+// FPresetsList.AddPair(GenerateGuid, Encode(APresetName));
|
|
|
+// UpdatePresetsCombobox;
|
|
|
+// comboPresets.ItemIndex := comboPresets.Properties.Items.Count - 1;
|
|
|
+//
|
|
|
+// FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.btnAddClick(Sender: TObject);
|
|
|
@@ -387,18 +376,19 @@ end;
|
|
|
|
|
|
procedure TfrmMain.btnDeleteClick(Sender: TObject);
|
|
|
begin
|
|
|
- if comboPresets.Properties.Items.Count = 1 then
|
|
|
- begin
|
|
|
- MessageDlg('Thet last preset can''t be deleted. Please create a new preset if you want to delete this.', mtError, [mbOK], 0);
|
|
|
- end
|
|
|
- else
|
|
|
- begin
|
|
|
- if MessageDlg('Really delete preset "' + comboPresets.Text + '"?', mtConfirmation, [mbYes, mbNo], 0) = mrYes then
|
|
|
- begin
|
|
|
- DeletePreset(comboPresets.ItemIndex);
|
|
|
- FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
- end;
|
|
|
- end;
|
|
|
+ ShowMessage('not implemented yet');
|
|
|
+// if comboPresets.Properties.Items.Count = 1 then
|
|
|
+// begin
|
|
|
+// MessageDlg('Thet last preset can''t be deleted. Please create a new preset if you want to delete this.', mtError, [mbOK], 0);
|
|
|
+// end
|
|
|
+// else
|
|
|
+// begin
|
|
|
+// if MessageDlg('Really delete preset "' + comboPresets.Text + '"?', mtConfirmation, [mbYes, mbNo], 0) = mrYes then
|
|
|
+// begin
|
|
|
+// DeletePreset(comboPresets.ItemIndex);
|
|
|
+// FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
+// end;
|
|
|
+// end;
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.btnEditClick(Sender: TObject);
|
|
|
@@ -406,17 +396,18 @@ var
|
|
|
dmy: string;
|
|
|
idx: Integer;
|
|
|
begin
|
|
|
- SavePreset;
|
|
|
- dmy := comboPresets.Text;
|
|
|
- idx := comboPresets.ItemIndex;
|
|
|
- if InputQuery('Edit Preset', 'Rename preset:', dmy) then
|
|
|
- begin
|
|
|
- comboPresets.Properties.Items[comboPresets.ItemIndex] := dmy;
|
|
|
- FPresetsList.ValueFromIndex[idx] := Encode(dmy);
|
|
|
- comboPresets.ItemIndex := idx;
|
|
|
-
|
|
|
- FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
- end;
|
|
|
+ ShowMessage('not implemented yet');
|
|
|
+// SavePreset;
|
|
|
+// dmy := comboPresets.Text;
|
|
|
+// idx := comboPresets.ItemIndex;
|
|
|
+// if InputQuery('Edit Preset', 'Rename preset:', dmy) then
|
|
|
+// begin
|
|
|
+// comboPresets.Properties.Items[comboPresets.ItemIndex] := dmy;
|
|
|
+// FPresetsList.ValueFromIndex[idx] := Encode(dmy);
|
|
|
+// comboPresets.ItemIndex := idx;
|
|
|
+//
|
|
|
+// FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
+// end;
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.btnPasteFullURLClick(Sender: TObject);
|
|
|
@@ -436,11 +427,12 @@ procedure TfrmMain.btnCopyPresetClick(Sender: TObject);
|
|
|
var
|
|
|
idx: Integer;
|
|
|
begin
|
|
|
- SavePreset;
|
|
|
- idx := comboPresets.ItemIndex;
|
|
|
- AddPreset('Copy of ' + comboPresets.Text);
|
|
|
- FProjectConfig.CopySection('Preset_' + FPresetsList.Names[idx], 'Preset_' + FPresetsList.Names[comboPresets.ItemIndex]);
|
|
|
- LoadPreset;
|
|
|
+ ShowMessage('not implemented yet');
|
|
|
+// SavePreset;
|
|
|
+// idx := comboPresets.ItemIndex;
|
|
|
+// AddPreset('Copy of ' + comboPresets.Text);
|
|
|
+// FProjectConfig.CopySection('Preset_' + FPresetsList.Names[idx], 'Preset_' + FPresetsList.Names[comboPresets.ItemIndex]);
|
|
|
+// LoadPreset;
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.btnRunClick(Sender: TObject);
|
|
|
@@ -587,17 +579,6 @@ begin
|
|
|
end;
|
|
|
end;
|
|
|
|
|
|
-procedure TfrmMain.comboPresetsPropertiesChange(Sender: TObject);
|
|
|
-begin
|
|
|
- if FActivePreset <> '' then
|
|
|
- begin
|
|
|
- SavePreset;
|
|
|
- end;
|
|
|
-
|
|
|
- FActivePreset := comboPresets.Text;
|
|
|
- LoadPreset;
|
|
|
-end;
|
|
|
-
|
|
|
procedure TfrmMain.pmnuBiggerEditorClick(Sender: TObject);
|
|
|
begin
|
|
|
frmBiggerEditor.ShowModal;
|
|
|
@@ -683,15 +664,16 @@ end;
|
|
|
|
|
|
procedure TfrmMain.DeletePreset(const AID: Integer);
|
|
|
begin
|
|
|
- comboPresets.Properties.OnChange := nil;
|
|
|
- comboPresets.Properties.Items.Delete(AID);
|
|
|
- FProjectConfig.DeleteSection('Preset_' + FPresetsList.Names[AID]);
|
|
|
- FPresetsList.Delete(AID);
|
|
|
- comboPresets.ItemIndex := comboPresets.Properties.Items.Count - 1;
|
|
|
-
|
|
|
- FActivePreset := comboPresets.Text;
|
|
|
- LoadPreset;
|
|
|
- comboPresets.Properties.OnChange := comboPresetsPropertiesChange;
|
|
|
+ ShowMessage('not implemented yet');
|
|
|
+// comboPresets.Properties.OnChange := nil;
|
|
|
+// comboPresets.Properties.Items.Delete(AID);
|
|
|
+// FProjectConfig.DeleteSection('Preset_' + FPresetsList.Names[AID]);
|
|
|
+// FPresetsList.Delete(AID);
|
|
|
+// comboPresets.ItemIndex := comboPresets.Properties.Items.Count - 1;
|
|
|
+//
|
|
|
+// //FActivePreset := comboPresets.Text;
|
|
|
+// LoadPreset;
|
|
|
+// //comboPresets.Properties.OnChange := comboPresetsPropertiesChange;
|
|
|
end;
|
|
|
|
|
|
function TfrmMain.Decode(const AText: string): string;
|
|
|
@@ -968,6 +950,8 @@ begin
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.FormClose(Sender: TObject; var Action: TCloseAction);
|
|
|
+var
|
|
|
+ strstream: TStringStream;
|
|
|
begin
|
|
|
MainConfig.WriteInteger('MainWindowPos', 'Left', Left);
|
|
|
MainConfig.WriteInteger('MainWindowPos', 'Top', Top);
|
|
|
@@ -992,6 +976,15 @@ begin
|
|
|
|
|
|
SavePreset;
|
|
|
|
|
|
+ // Save presets grid layout
|
|
|
+ strstream := TStringStream.Create;
|
|
|
+ try
|
|
|
+ cxGridDBTableView.StoreToStream(strstream);
|
|
|
+ FProjectConfig.WriteString('Main', 'GridViewPresets', Encode(strstream.DataString));
|
|
|
+ finally
|
|
|
+ strstream.Free;
|
|
|
+ end;
|
|
|
+
|
|
|
if FProjectConfig.FileModified then
|
|
|
begin
|
|
|
if (tbbtnAutoSaveProject.Down) and (not FIsTempProjectLoaded) then
|
|
|
@@ -1027,7 +1020,6 @@ begin
|
|
|
|
|
|
MainConfig := TJSONConfig.Create(FRoamingSavePath + 'AppConfig.json');
|
|
|
FActiveProject := '';
|
|
|
- FActivePreset := '';
|
|
|
|
|
|
FPresetsList := TStringList.Create;
|
|
|
FPresetsList.NameValueSeparator := ':';
|
|
|
@@ -1204,12 +1196,10 @@ end;
|
|
|
procedure TfrmMain.LoadPreset;
|
|
|
var
|
|
|
preset: string;
|
|
|
- idx: Integer;
|
|
|
begin
|
|
|
- idx := comboPresets.Properties.Items.IndexOf(FActivePreset);
|
|
|
- if idx > -1 then
|
|
|
+ if memDataPresets.RecordCount > 0 then
|
|
|
begin
|
|
|
- preset := 'Preset_' + FPresetsList.Names[idx];
|
|
|
+ preset := 'Preset_' + memDataPresetsfldGuid.Value;
|
|
|
edtBaseURL.Text := FProjectConfig.ReadString(preset, 'BaseURL');
|
|
|
comboMethod.ItemIndex := FProjectConfig.ReadInteger(preset, 'Method', 0);
|
|
|
EditorURLParams.Lines.Text := FProjectConfig.ReadString(preset, 'URLParams');
|
|
|
@@ -1232,6 +1222,12 @@ var
|
|
|
i: Integer;
|
|
|
strstream: TStringStream;
|
|
|
begin
|
|
|
+ memDataPresets.AfterEdit := nil;
|
|
|
+ memDataPresets.AfterScroll := nil;
|
|
|
+ memDataPresets.BeforeScroll := nil;
|
|
|
+ memDataPresets.AfterEdit := nil;
|
|
|
+
|
|
|
+
|
|
|
if FIsTempProjectLoaded then
|
|
|
begin
|
|
|
dxStatusBarApp.Panels[1].Text := 'Default project loaded.';
|
|
|
@@ -1278,22 +1274,6 @@ begin
|
|
|
FPresetsList.Clear;
|
|
|
FPresetsList.DelimitedText := FProjectConfig.ReadString('Presets', 'Presets');
|
|
|
|
|
|
- UpdatePresetsCombobox;
|
|
|
-
|
|
|
- if comboPresets.Properties.Items.Count = 0 then
|
|
|
- begin
|
|
|
- // Add default
|
|
|
- AddPreset('Default');
|
|
|
- FProjectConfig.Save;
|
|
|
- end
|
|
|
- else
|
|
|
- begin
|
|
|
- comboPresets.ItemIndex := FProjectConfig.ReadInteger('Presets', 'LastUsed', 0);
|
|
|
- end;
|
|
|
-
|
|
|
- PageControlParams.ActivePage := tabURLParams;
|
|
|
- PageControlResponse.ActivePage := tabContent;
|
|
|
-
|
|
|
memDataPresets.Active := False;
|
|
|
memDataPresets.Active := True;
|
|
|
try
|
|
|
@@ -1308,6 +1288,22 @@ begin
|
|
|
memDataPresets.Active := True;
|
|
|
end;
|
|
|
|
|
|
+ LoadPreset;
|
|
|
+
|
|
|
+ if memDataPresets.RecordCount = 0 then
|
|
|
+ begin
|
|
|
+ // Add default
|
|
|
+ AddPreset('Default');
|
|
|
+ FProjectConfig.Save;
|
|
|
+ end
|
|
|
+ else
|
|
|
+ begin
|
|
|
+ memDataPresets.Locate('fldGuid', FProjectConfig.ReadString('Presets', 'LastUsed'), [loPartialKey]);
|
|
|
+ LoadPreset;
|
|
|
+ end;
|
|
|
+
|
|
|
+ PageControlParams.ActivePage := tabURLParams;
|
|
|
+ PageControlResponse.ActivePage := tabContent;
|
|
|
|
|
|
strlist := TStringList.Create;
|
|
|
try
|
|
|
@@ -1322,13 +1318,44 @@ begin
|
|
|
UpdateFullURL;
|
|
|
|
|
|
|
|
|
- strstream := TStringStream.Create;
|
|
|
+ strstream := TStringStream.Create(Decode(FProjectConfig.ReadString('Main', 'GridViewPresets')));
|
|
|
try
|
|
|
- strstream.DataString := Decode(FProjectConfig.ReadString('Main', 'GridViewPresets'));
|
|
|
- strstream.
|
|
|
+ cxGridDBTableView.RestoreFromStream(strstream);
|
|
|
finally
|
|
|
strstream.Free;
|
|
|
end;
|
|
|
+
|
|
|
+ memDataPresets.BeforeScroll := memDataPresetsBeforeScroll;
|
|
|
+ memDataPresets.AfterScroll := memDataPresetsAfterScroll;
|
|
|
+ memDataPresets.AfterEdit := memDataPresetsAfterEdit;
|
|
|
+
|
|
|
+end;
|
|
|
+
|
|
|
+procedure TfrmMain.memDataPresetsAfterEdit(DataSet: TDataSet);
|
|
|
+var
|
|
|
+ idx: Integer;
|
|
|
+begin
|
|
|
+// idx := FPresetsList.inde
|
|
|
+// FPresetsList.ValueFromIndex[idx] := memDataPresetsfldName.Value;
|
|
|
+// FProjectConfig.WriteString('Presets', 'Presets', FPresetsList.Text);
|
|
|
+//
|
|
|
+ SavePreset;
|
|
|
+end;
|
|
|
+
|
|
|
+procedure TfrmMain.memDataPresetsAfterScroll(DataSet: TDataSet);
|
|
|
+begin
|
|
|
+ if memDataPresets.RecordCount > 0 then
|
|
|
+ begin
|
|
|
+ LoadPreset;
|
|
|
+ end;
|
|
|
+end;
|
|
|
+
|
|
|
+procedure TfrmMain.memDataPresetsBeforeScroll(DataSet: TDataSet);
|
|
|
+begin
|
|
|
+ if memDataPresets.RecordCount > 0 then
|
|
|
+ begin
|
|
|
+ SavePreset;
|
|
|
+ end;
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.pmnuPasteJsonContentClick(Sender: TObject);
|
|
|
@@ -1610,12 +1637,10 @@ end;
|
|
|
procedure TfrmMain.SavePreset;
|
|
|
var
|
|
|
preset: string;
|
|
|
- idx: Integer;
|
|
|
begin
|
|
|
- idx := comboPresets.Properties.Items.IndexOf(FActivePreset);
|
|
|
- if idx > -1 then
|
|
|
+ if memDataPresets.RecordCount > 0 then
|
|
|
begin
|
|
|
- preset := 'Preset_' + FPresetsList.Names[idx];
|
|
|
+ preset := 'Preset_' + memDataPresetsfldGuid.Value;
|
|
|
FProjectConfig.WriteString(preset, 'BaseURL', edtBaseURL.Text);
|
|
|
FProjectConfig.WriteInteger(preset, 'Method', comboMethod.ItemIndex);
|
|
|
FProjectConfig.WriteString(preset, 'URLParams', EditorURLParams.Lines.Text);
|
|
|
@@ -1628,14 +1653,15 @@ begin
|
|
|
FProjectConfig.WriteString(preset, 'AuthUsername', TEncryptStr.EncryptString(edtAuthUsername.Text));
|
|
|
FProjectConfig.WriteString(preset, 'AuthPassword', TEncryptStr.EncryptString(edtAuthPassword.Text));
|
|
|
|
|
|
- FProjectConfig.WriteInteger('Presets', 'LastUsed', idx);
|
|
|
+ FProjectConfig.WriteString(preset, 'Category', memDataPresetsfldCategory.Value);
|
|
|
+
|
|
|
+ FProjectConfig.WriteString('Presets', 'LastUsed', memDataPresetsfldGuid.Value);
|
|
|
end;
|
|
|
end;
|
|
|
|
|
|
procedure TfrmMain.SaveProject;
|
|
|
var
|
|
|
strlist: TStringList;
|
|
|
- strstream: TStringStream;
|
|
|
begin
|
|
|
SavePreset;
|
|
|
|
|
|
@@ -1649,13 +1675,6 @@ begin
|
|
|
strlist.Free;
|
|
|
end;
|
|
|
|
|
|
- strstream := TStringStream.Create;
|
|
|
- try
|
|
|
- cxGridDBTableView.StoreToStream(strstream);
|
|
|
- FProjectConfig.WriteString('Main', 'GridViewPresets', Encode(strstream.DataString));
|
|
|
- finally
|
|
|
- strstream.Free;
|
|
|
- end;
|
|
|
|
|
|
FProjectConfig.Save;
|
|
|
end;
|
Simon Grossenbacher