Simon Grossenbacher vor 3 Jahren
Ursprung
Commit
45d750b391
9 geänderte Dateien mit 302 neuen und 32 gelöschten Zeilen
  1. BIN
      RESTDebugger.exe
  2. 3 1
      prj/RESTDebugger.dpr
  3. 151 7
      prj/RESTDebugger.dproj
  4. 60 16
      src/_frmMain.dfm
  5. 17 2
      src/_frmMain.pas
  6. 0 5
      src/_frmSearch.dfm
  7. 1 1
      src/_frmSearch.pas
  8. 44 0
      src/_frmVariables.dfm
  9. 26 0
      src/_frmVariables.pas

BIN
RESTDebugger.exe


+ 3 - 1
prj/RESTDebugger.dpr

@@ -8,7 +8,8 @@ uses
   _frmMain in '..\src\_frmMain.pas' {frmMain},
   _frmBiggerEditor in '..\src\_frmBiggerEditor.pas' {frmBiggerEditor},
   _frmSearch in '..\src\_frmSearch.pas' {frmSearch},
-  _SearchTextHightlighterSynEditPlugin in '..\src\_SearchTextHightlighterSynEditPlugin.pas';
+  _SearchTextHightlighterSynEditPlugin in '..\src\_SearchTextHightlighterSynEditPlugin.pas',
+  _frmVariables in '..\src\_frmVariables.pas' {frmVariables};
 
 {$R *.res}
 
@@ -18,5 +19,6 @@ begin
   Application.CreateForm(TfrmMain, frmMain);
   Application.CreateForm(TfrmBiggerEditor, frmBiggerEditor);
   Application.CreateForm(TfrmSearch, frmSearch);
+  Application.CreateForm(TfrmVariables, frmVariables);
   Application.Run;
 end.

+ 151 - 7
prj/RESTDebugger.dproj

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{EAAEC73B-CF16-46C3-A598-65374DE332E9}</ProjectGuid>
-        <ProjectVersion>19.0</ProjectVersion>
+        <ProjectVersion>19.1</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>RESTDebugger.dpr</MainSource>
         <Base>True</Base>
@@ -165,6 +165,10 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\src\_SearchTextHightlighterSynEditPlugin.pas"/>
+        <DCCReference Include="..\src\_frmVariables.pas">
+            <Form>frmVariables</Form>
+            <FormType>dfm</FormType>
+        </DCCReference>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -195,21 +199,21 @@
                 </Excluded_Packages>
             </Delphi.Personality>
             <Deployment Version="3">
-                <DeployFile LocalName="Win32\Debug\RESTDebugger.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win32">
+                <DeployFile LocalName="..\RESTDebugger.exe" Configuration="Release" Class="ProjectOutput">
+                    <Platform Name="Win64">
                         <RemoteName>RESTDebugger.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\RESTDebugger.exe" Configuration="Debug" Class="ProjectOutput">
-                    <Platform Name="Win64">
+                <DeployFile LocalName="Win32\Debug\RESTDebugger.exe" Configuration="Debug" Class="ProjectOutput">
+                    <Platform Name="Win32">
                         <RemoteName>RESTDebugger.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="..\RESTDebugger.rsm" Configuration="Debug" Class="DebugSymbols">
+                <DeployFile LocalName="..\RESTDebugger.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win64">
-                        <RemoteName>RESTDebugger.rsm</RemoteName>
+                        <RemoteName>RESTDebugger.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
@@ -604,6 +608,32 @@
                         <Operation>0</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iOS_AppStore1024">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon152">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_AppIcon167">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPad_Launch1024">
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
@@ -668,6 +698,56 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPad_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPad_SpotLight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_AppIcon180">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="iPhone_Launch2x">
                     <Platform Name="iOSDevice64">
                         <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
@@ -741,6 +821,66 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <DeployClass Name="iPhone_Notification40">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Notification60">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting58">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Setting87">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight120">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
+                <DeployClass Name="iPhone_Spotlight80">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                </DeployClass>
                 <DeployClass Name="ProjectAndroidManifest">
                     <Platform Name="Android">
                         <Operation>1</Operation>
@@ -793,6 +933,10 @@
                         <RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
                         <Operation>64</Operation>
                     </Platform>
+                    <Platform Name="iOSSimulator">
+                        <RemoteDir>..\$(PROJECTNAME).launchscreen</RemoteDir>
+                        <Operation>64</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSResource">
                     <Platform Name="iOSDevice32">

+ 60 - 16
src/_frmMain.dfm

@@ -187,10 +187,6 @@ object frmMain: TfrmMain
     object tabHeaders: TcxTabSheet
       Caption = 'Response Headers'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object EditorResponseHeaders: TSynEdit
         Left = 0
         Top = 0
@@ -454,10 +450,6 @@ object frmMain: TfrmMain
       object cxTabSheet2: TcxTabSheet
         Caption = 'Extra Headers'
         ImageIndex = 1
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object Panel4: TPanel
           Left = 0
           Top = 0
@@ -517,10 +509,6 @@ object frmMain: TfrmMain
       object cxTabSheet3: TcxTabSheet
         Caption = 'Authentication'
         ImageIndex = 3
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object Label9: TLabel
           Left = 15
           Top = 47
@@ -557,10 +545,6 @@ object frmMain: TfrmMain
       object tabPostData: TcxTabSheet
         Caption = 'Post Data'
         ImageIndex = 2
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object Panel5: TPanel
           Left = 0
           Top = 0
@@ -890,6 +874,11 @@ object frmMain: TfrmMain
       Visible = ivAlways
       ItemLinks = <
         item
+          Visible = True
+          ItemName = 'tbbtnVariables'
+        end
+        item
+          BeginGroup = True
           Visible = True
           ItemName = 'tbbtnStayOnTop'
         end
@@ -952,6 +941,61 @@ object frmMain: TfrmMain
       ShortCut = 122
       OnClick = pmnuBiggerEditorClick
     end
+    object dxBarSubItem5: TdxBarSubItem
+      Caption = 'New SubItem'
+      Category = 0
+      Visible = ivAlways
+      ItemLinks = <>
+    end
+    object dxBarButton1: TdxBarButton
+      Caption = 'New Button'
+      Category = 0
+      Hint = 'New Button'
+      Visible = ivAlways
+    end
+    object dxBarButton4: TdxBarButton
+      Caption = 'New Button'
+      Category = 0
+      Hint = 'New Button'
+      Visible = ivAlways
+    end
+    object dxBarSubItem6: TdxBarSubItem
+      Caption = 'New SubItem'
+      Category = 0
+      Visible = ivAlways
+      ItemLinks = <>
+    end
+    object dxBarSubItem7: TdxBarSubItem
+      Caption = 'New SubItem'
+      Category = 0
+      Visible = ivAlways
+      ItemLinks = <>
+    end
+    object dxBarButton5: TdxBarButton
+      Caption = 'New Button'
+      Category = 0
+      Hint = 'New Button'
+      Visible = ivAlways
+    end
+    object dxBarButton8: TdxBarButton
+      Caption = 'New Button'
+      Category = 0
+      Hint = 'New Button'
+      Visible = ivAlways
+    end
+    object dxBarSubItem8: TdxBarSubItem
+      Caption = 'New SubItem'
+      Category = 0
+      Visible = ivAlways
+      ItemLinks = <>
+    end
+    object tbbtnVariables: TdxBarButton
+      Caption = 'Variables...'
+      Category = 0
+      Hint = 'Variables'
+      Visible = ivAlways
+      OnClick = tbbtnVariablesClick
+    end
     object pmnuCutJsonContent: TdxBarButton
       Caption = 'Cut'
       Category = 1

+ 17 - 2
src/_frmMain.pas

@@ -16,7 +16,7 @@ uses
   SynEdit, SynHighlighterJSON, SynEditHighlighter, SynHighlighterIni,
   SynHighlighterXML, SynHighlighterHtml, SynEditRegexSearch, SynEditMiscClasses,
   SynEditSearch, _SearchTextHightlighterSynEditPlugin, SynEditTypes, cxSplitter,
-  SynEditCodeFolding;
+  SynEditCodeFolding, dxCore;
 
 type
   TMethodType = (mtGET, mtPOST, mtPATCH, mtPUT, mtDELETE);
@@ -112,6 +112,15 @@ type
     dxStatusBarApp: TdxStatusBar;
     Panel2: TPanel;
     chkResponseAutoformat: TcxCheckBox;
+    dxBarSubItem5: TdxBarSubItem;
+    dxBarButton1: TdxBarButton;
+    dxBarButton4: TdxBarButton;
+    dxBarSubItem6: TdxBarSubItem;
+    dxBarSubItem7: TdxBarSubItem;
+    dxBarButton5: TdxBarButton;
+    dxBarButton8: TdxBarButton;
+    dxBarSubItem8: TdxBarSubItem;
+    tbbtnVariables: TdxBarButton;
     procedure FormShow(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
@@ -175,6 +184,7 @@ type
       Shift: TShiftState);
     procedure EditorEnter(Sender: TObject);
     procedure EditorExit(Sender: TObject);
+    procedure tbbtnVariablesClick(Sender: TObject);
   private
     FProjectConfig: TJSONConfig;
     FActiveProject: string;
@@ -237,7 +247,7 @@ implementation
 {$R *.dfm}
 
 uses System.NetEncoding, System.UITypes, _EncryptStr, JsonDataObjects, IdGlobal, System.IOUtils, uRwXmlDOM,
-  _frmBiggerEditor, IdUri, _frmSearch, ShellApi;
+  _frmBiggerEditor, IdUri, _frmSearch, ShellApi, _frmVariables;
 
 procedure TfrmMain.tbbtnRunClick(Sender: TObject);
 begin
@@ -256,6 +266,11 @@ begin
   end;
 end;
 
+procedure TfrmMain.tbbtnVariablesClick(Sender: TObject);
+begin
+  frmVariables.ShowModal;
+end;
+
 procedure TfrmMain.UpdateEditor(const AText: string);
 begin
   ActiveEditor.Lines.Text := AText;

+ 0 - 5
src/_frmSearch.dfm

@@ -43,35 +43,30 @@ object frmSearch: TfrmSearch
       Top = 17
       Caption = 'C&ase sensitivity'
       TabOrder = 0
-      Width = 94
     end
     object cbSearchWholeWords: TcxCheckBox
       Left = 8
       Top = 39
       Caption = '&Whole words only'
       TabOrder = 1
-      Width = 106
     end
     object cbSearchFromCursor: TcxCheckBox
       Left = 8
       Top = 61
       Caption = 'Search from &caret'
       TabOrder = 2
-      Width = 106
     end
     object cbSearchSelectedOnly: TcxCheckBox
       Left = 8
       Top = 83
       Caption = '&Selected text only'
       TabOrder = 3
-      Width = 106
     end
     object cbRegularExpression: TcxCheckBox
       Left = 8
       Top = 104
       Caption = '&Regular expression'
       TabOrder = 4
-      Width = 112
     end
   end
   object btnOK: TcxButton

+ 1 - 1
src/_frmSearch.pas

@@ -7,7 +7,7 @@ uses
   StdCtrls, ExtCtrls, cxGraphics, cxControls, cxLookAndFeels,
   cxLookAndFeelPainters, cxContainer, cxEdit, dxSkinsCore,
   dxSkinOffice2016Colorful, Vcl.Menus, cxButtons, cxCheckBox, cxGroupBox,
-  cxTextEdit, cxMaskEdit, cxDropDownEdit, cxRadioGroup;
+  cxTextEdit, cxMaskEdit, cxDropDownEdit, cxRadioGroup, dxSkinOffice2019Colorful;
 
 type
   TfrmSearch = class(TForm)

+ 44 - 0
src/_frmVariables.dfm

@@ -0,0 +1,44 @@
+object frmVariables: TfrmVariables
+  Left = 0
+  Top = 0
+  BorderIcons = [biSystemMenu]
+  BorderStyle = bsSingle
+  Caption = 'Variables'
+  ClientHeight = 609
+  ClientWidth = 751
+  Color = clBtnFace
+  Font.Charset = DEFAULT_CHARSET
+  Font.Color = clWindowText
+  Font.Height = -11
+  Font.Name = 'Tahoma'
+  Font.Style = []
+  OldCreateOrder = False
+  Position = poMainFormCenter
+  PixelsPerInch = 96
+  TextHeight = 13
+  object Panel1: TPanel
+    Left = 0
+    Top = 0
+    Width = 751
+    Height = 76
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    ParentBackground = False
+    TabOrder = 0
+    ExplicitWidth = 725
+    object Label1: TLabel
+      Left = 25
+      Top = 31
+      Width = 52
+      Height = 13
+      Caption = 'Variables'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+    end
+  end
+end

+ 26 - 0
src/_frmVariables.pas

@@ -0,0 +1,26 @@
+unit _frmVariables;
+
+interface
+
+uses
+  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
+  Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtCtrls;
+
+type
+  TfrmVariables = class(TForm)
+    Panel1: TPanel;
+    Label1: TLabel;
+  private
+    { Private-Deklarationen }
+  public
+    { Public-Deklarationen }
+  end;
+
+var
+  frmVariables: TfrmVariables;
+
+implementation
+
+{$R *.dfm}
+
+end.