Simon Grossenbacher 8 жил өмнө
parent
commit
439e0d5b53

+ 3 - 3
Colors/Blue.json

@@ -2,8 +2,8 @@
    "Colors": {
       "Info": {
          "General": {
-            "Version": "1.8.3",
-            "Date": "10.11.2016"
+            "Version": "1.9.0",
+            "Date": "07.12.2016"
          },
          "Author": {
             "Name": "Lasse Rautiainen",
@@ -54,7 +54,7 @@
             "SearchMapBackground": "$00F4F4F4",
             "SearchMapForeground": "$0078AAFF",
             "SelectionBackground": "$00A56D53",
-            "SelectionForeground": "clHighlightText",
+            "SelectionForeground": "clWhite",
             "SyncEditBackground": "$00FCFDCD",
             "SyncEditEditBorder": "$00333333",
             "SyncEditWordBorder": "$00A56D53",

+ 13 - 2
Example Config.rdproj

@@ -1,7 +1,7 @@
 {
 	"Presets": {
-		"Presets": "GET: Simple GET\r\nGET: GET Extra Headers\r\nGET: Use Basic Auth Example\r\nGET: Example URL Parameters\r\n",
-		"LastUsed": 0
+		"Presets": "GET: Simple GET\r\nGET: GET Extra Headers\r\nGET: Use Basic Auth Example\r\nGET: Example URL Parameters\r\nPOST: Json Post Data\r\n",
+		"LastUsed": 4
 	},
 	"Preset_0": {
 		"BaseURL": "https://httpbin.org/get",
@@ -46,5 +46,16 @@
 		"UseBasicAuth": false,
 		"AuthUsername": "",
 		"AuthPassword": ""
+	},
+	"Preset_4": {
+		"BaseURL": "https://httpbin.org/post",
+		"Method": 1,
+		"URLParams": "",
+		"PostData": "{\r\n\t\"Demo\": \"Demo Data\"\r\n}",
+		"ExtraHeaders": "",
+		"PostDataContentType": "application/json",
+		"UseBasicAuth": false,
+		"AuthUsername": "",
+		"AuthPassword": ""
 	}
 }

+ 4 - 3
Highlighters/Headers.json

@@ -2,8 +2,8 @@
    "Highlighter": {
       "Info": {
          "General": {
-            "Version": "1.8.3",
-            "Date": "10.11.2016",
+            "Version": "1.9.0",
+            "Date": "01.01.2017",
             "Sample": [
                "; Comment\r\n",
                "[Section]\r\n",
@@ -95,7 +95,8 @@
                      "CloseTokenBeginningOfLine": true,
                      "OpenIsClose": true,
                      "TokenEndIsPreviousLine": true,
-                     "OpenTokenEnd": "]"
+                     "OpenTokenEnd": "]",
+                     "BreakCharFollows": false
                   }
                }
             ]

+ 10 - 4
Highlighters/JSON.json

@@ -2,8 +2,8 @@
    "Highlighter": {
       "Info": {
          "General": {
-            "Version": "1.8.3",
-            "Date": "10.11.2016",
+            "Version": "1.9.0",
+            "Date": "01.01.2017",
             "Sample": [
                "{\r\n",
                "  \"firstName\": \"John\",\r\n",
@@ -272,11 +272,17 @@
             "FoldRegion": [
                {
                   "OpenToken": "{",
-                  "CloseToken": "}"
+                  "CloseToken": "}",
+                  "Properties": {
+                     "BreakCharFollows": false
+                  }
                },
                {
                   "OpenToken": "[",
-                  "CloseToken": "]"
+                  "CloseToken": "]",
+                  "Properties": {
+                     "BreakCharFollows": false
+                  }
                }
             ]
          }

+ 4 - 3
Highlighters/Params.json

@@ -2,8 +2,8 @@
    "Highlighter": {
       "Info": {
          "General": {
-            "Version": "1.8.3",
-            "Date": "10.11.2016",
+            "Version": "1.9.0",
+            "Date": "01.01.2017",
             "Sample": [
                "; Comment\r\n",
                "[Section]\r\n",
@@ -95,7 +95,8 @@
                      "CloseTokenBeginningOfLine": true,
                      "OpenIsClose": true,
                      "TokenEndIsPreviousLine": true,
-                     "OpenTokenEnd": "]"
+                     "OpenTokenEnd": "]",
+                     "BreakCharFollows": false
                   }
                }
             ]

+ 18 - 18
prj/RESTDebugger.dproj

@@ -5,7 +5,7 @@
         <FrameworkType>VCL</FrameworkType>
         <MainSource>RESTDebugger.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <TargetedPlatforms>2</TargetedPlatforms>
         <AppType>Application</AppType>
@@ -197,27 +197,12 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
+                <DeployClass Name="ProjectiOSDeviceResourceRules">
                     <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <RemoteDir>Contents\MacOS</RemoteDir>
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                    <Platform Name="iOSSimulator">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXResource">
@@ -596,12 +581,27 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules">
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
                     <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <RemoteDir>Contents\MacOS</RemoteDir>
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                     <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                    <Platform Name="iOSSimulator">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
                     </Platform>
                 </DeployClass>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>

+ 5 - 5
prj/RESTDebugger.stat

@@ -1,10 +1,10 @@
 [Stats]
-EditorSecs=9269
+EditorSecs=9426
 DesignerSecs=2733
-InspectorSecs=1734
-CompileSecs=311587
-OtherSecs=3059
+InspectorSecs=1766
+CompileSecs=364354
+OtherSecs=3190
 StartTime=27.10.2016 18:27:37
 RealKeys=0
 EffectiveKeys=0
-DebugSecs=6683
+DebugSecs=6913

+ 40 - 31
src/_frmMain.dfm

@@ -4,7 +4,7 @@ object frmMain: TfrmMain
   BorderIcons = [biSystemMenu, biMinimize]
   Caption = 'REST Debugger'
   ClientHeight = 930
-  ClientWidth = 726
+  ClientWidth = 731
   Color = clBtnFace
   Constraints.MinHeight = 930
   Constraints.MinWidth = 720
@@ -24,16 +24,14 @@ object frmMain: TfrmMain
   TextHeight = 13
   object Panel1: TPanel
     Left = 0
-    Top = 23
-    Width = 726
+    Top = 0
+    Width = 731
     Height = 76
     Align = alTop
     BevelOuter = bvNone
     Color = clWhite
     ParentBackground = False
     TabOrder = 2
-    ExplicitLeft = -2
-    ExplicitTop = 91
     object Label1: TLabel
       Left = 25
       Top = 31
@@ -79,11 +77,19 @@ object frmMain: TfrmMain
         0FE8D6C03FF5FC02C53E1BF02DDC32610000000049454E44AE426082}
       Transparent = True
     end
+    object dxBarDockControl1: TdxBarDockControl
+      Left = 0
+      Top = 0
+      Width = 731
+      Height = 23
+      Align = dalTop
+      BarManager = dxBarManager
+    end
   end
   object dxStatusBar: TdxStatusBar
     Left = 0
     Top = 910
-    Width = 726
+    Width = 731
     Height = 20
     Panels = <
       item
@@ -109,16 +115,16 @@ object frmMain: TfrmMain
   end
   object cxPageControl1: TcxPageControl
     Left = 0
-    Top = 471
-    Width = 726
-    Height = 439
+    Top = 448
+    Width = 731
+    Height = 462
     Align = alClient
-    TabOrder = 6
+    TabOrder = 3
     Properties.ActivePage = tabContent
     Properties.CustomButtons.Buttons = <>
-    ClientRectBottom = 437
+    ClientRectBottom = 460
     ClientRectLeft = 2
-    ClientRectRight = 724
+    ClientRectRight = 729
     ClientRectTop = 26
     object tabContent: TcxTabSheet
       Caption = 'Response Content'
@@ -126,8 +132,8 @@ object frmMain: TfrmMain
       object EditorContent: TBCEditor
         Left = 0
         Top = 0
-        Width = 722
-        Height = 411
+        Width = 727
+        Height = 434
         Cursor = crIBeam
         ActiveLine.Indicator.Visible = False
         Align = alClient
@@ -139,6 +145,7 @@ object frmMain: TfrmMain
         CodeFolding.Hint.Font.Name = 'Courier New'
         CodeFolding.Hint.Font.Style = []
         CodeFolding.Hint.Indicator.Glyph.Visible = False
+        CodeFolding.Width = 16
         CodeFolding.Visible = True
         CompletionProposal.CloseChars = '()[]. '
         CompletionProposal.Columns = <
@@ -184,7 +191,7 @@ object frmMain: TfrmMain
         SpecialChars.Style = scsDot
         SyncEdit.ShortCut = 24650
         TabOrder = 0
-        WordWrap.Indicator.Glyph.Data = {
+        WordWrap.Indicator.Bitmap.Data = {
           7E030000424D7E0300000000000036000000280000000F0000000E0000000100
           2000000000004803000000000000000000000000000000000000FF00FF00FF00
           FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
@@ -223,8 +230,8 @@ object frmMain: TfrmMain
       object EditorResponseHeaders: TBCEditor
         Left = 0
         Top = 0
-        Width = 722
-        Height = 411
+        Width = 727
+        Height = 434
         Cursor = crIBeam
         ActiveLine.Indicator.Visible = False
         Align = alClient
@@ -236,6 +243,7 @@ object frmMain: TfrmMain
         CodeFolding.Hint.Font.Name = 'Courier New'
         CodeFolding.Hint.Font.Style = []
         CodeFolding.Hint.Indicator.Glyph.Visible = False
+        CodeFolding.Width = 16
         CompletionProposal.CloseChars = '()[]. '
         CompletionProposal.Columns = <
           item
@@ -280,7 +288,7 @@ object frmMain: TfrmMain
         SpecialChars.Style = scsDot
         SyncEdit.ShortCut = 24650
         TabOrder = 0
-        WordWrap.Indicator.Glyph.Data = {
+        WordWrap.Indicator.Bitmap.Data = {
           7E030000424D7E0300000000000036000000280000000F0000000E0000000100
           2000000000004803000000000000000000000000000000000000FF00FF00FF00
           FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
@@ -316,8 +324,8 @@ object frmMain: TfrmMain
   end
   object Panel2: TPanel
     Left = 0
-    Top = 99
-    Width = 726
+    Top = 76
+    Width = 731
     Height = 372
     Align = alTop
     BevelOuter = bvNone
@@ -441,7 +449,10 @@ object frmMain: TfrmMain
       Properties.DropDownListStyle = lsFixedList
       Properties.Items.Strings = (
         'GET'
-        'POST')
+        'POST'
+        'PATCH'
+        'PUT'
+        'DELETE')
       Properties.OnChange = comboMethodPropertiesChange
       TabOrder = 5
       Width = 83
@@ -477,6 +488,7 @@ object frmMain: TfrmMain
           CodeFolding.Hint.Font.Name = 'Courier New'
           CodeFolding.Hint.Font.Style = []
           CodeFolding.Hint.Indicator.Glyph.Visible = False
+          CodeFolding.Width = 16
           CodeFolding.Visible = True
           CompletionProposal.CloseChars = '()[]. '
           CompletionProposal.Columns = <
@@ -525,7 +537,7 @@ object frmMain: TfrmMain
           SyncEdit.Enabled = False
           SyncEdit.ShortCut = 24650
           TabOrder = 1
-          WordWrap.Indicator.Glyph.Data = {
+          WordWrap.Indicator.Bitmap.Data = {
             7E030000424D7E0300000000000036000000280000000F0000000E0000000100
             2000000000004803000000000000000000000000000000000000FF00FF00FF00
             FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
@@ -593,6 +605,7 @@ object frmMain: TfrmMain
           CodeFolding.Hint.Font.Name = 'Courier New'
           CodeFolding.Hint.Font.Style = []
           CodeFolding.Hint.Indicator.Glyph.Visible = False
+          CodeFolding.Width = 16
           CodeFolding.Visible = True
           CompletionProposal.CloseChars = '()[]. '
           CompletionProposal.Columns = <
@@ -641,7 +654,7 @@ object frmMain: TfrmMain
           SyncEdit.Enabled = False
           SyncEdit.ShortCut = 24650
           TabOrder = 1
-          WordWrap.Indicator.Glyph.Data = {
+          WordWrap.Indicator.Bitmap.Data = {
             7E030000424D7E0300000000000036000000280000000F0000000E0000000100
             2000000000004803000000000000000000000000000000000000FF00FF00FF00
             FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
@@ -745,6 +758,7 @@ object frmMain: TfrmMain
           CodeFolding.Hint.Font.Name = 'Courier New'
           CodeFolding.Hint.Font.Style = []
           CodeFolding.Hint.Indicator.Glyph.Visible = False
+          CodeFolding.Width = 16
           CodeFolding.Visible = True
           CompletionProposal.CloseChars = '()[]. '
           CompletionProposal.Columns = <
@@ -793,7 +807,7 @@ object frmMain: TfrmMain
           SyncEdit.Enabled = False
           SyncEdit.ShortCut = 24650
           TabOrder = 1
-          WordWrap.Indicator.Glyph.Data = {
+          WordWrap.Indicator.Bitmap.Data = {
             7E030000424D7E0300000000000036000000280000000F0000000E0000000100
             2000000000004803000000000000000000000000000000000000FF00FF00FF00
             FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
@@ -939,11 +953,6 @@ object frmMain: TfrmMain
     UseSystemFont = True
     Left = 135
     Top = 35
-    DockControlHeights = (
-      0
-      0
-      23
-      0)
     object dxBarManagerBar1: TdxBar
       AllowClose = False
       AllowCustomizing = False
@@ -951,10 +960,10 @@ object frmMain: TfrmMain
       AllowReset = False
       Caption = 'MainMenu'
       CaptionButtons = <>
-      DockedDockingStyle = dsTop
+      DockControl = dxBarDockControl1
+      DockedDockControl = dxBarDockControl1
       DockedLeft = 0
       DockedTop = 0
-      DockingStyle = dsTop
       FloatLeft = 1881
       FloatTop = 421
       FloatClientWidth = 168

+ 1 - 0
src/_frmMain.pas

@@ -91,6 +91,7 @@ type
     pmnuSelectAll: TdxBarButton;
     pmnuCompactJson: TdxBarButton;
     btnCopyFullURL: TcxButton;
+    dxBarDockControl1: TdxBarDockControl;
     procedure FormShow(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);