From 8bdbed710084b85f21e1086e8d3d2f50d59cc740 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Thu, 11 Nov 2010 08:10:30 +0000
Subject: [PATCH] Clean up datagrid context menu "Insert date/time": - remove
 timestamp (not Unix Timestamp) item, relevant on super old servers only - add
 GUID item. Fixes issue #2206. - prefix all items with descriptive captions

---
 source/main.dfm | 29 ++++++++++++++++-------------
 source/main.pas | 44 +++++++++++++++++++++++++++++---------------
 2 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/source/main.dfm b/source/main.dfm
index 5df8151d..949f4086 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -8295,44 +8295,47 @@ object MainForm: TMainForm
     object N12: TMenuItem
       Caption = '-'
     end
-    object DataInsertDateTime: TMenuItem
-      Caption = 'Insert Date/Time'
+    object DataInsertValue: TMenuItem
+      Caption = 'Insert value'
       ImageIndex = 80
+      OnClick = DataInsertValueClick
       object DataDateTime: TMenuItem
         Caption = 'datetime'
         Hint = 'Insert datetime-value'
         ImageIndex = 80
-        OnClick = InsertDate
+        OnClick = InsertValue
       end
       object DataDate: TMenuItem
         Caption = 'date'
         Hint = 'Insert date-value'
         ImageIndex = 80
-        OnClick = InsertDate
+        OnClick = InsertValue
       end
       object DataTime: TMenuItem
         Caption = 'time'
         Hint = 'Insert time-value'
         ImageIndex = 80
-        OnClick = InsertDate
-      end
-      object DataTimestamp: TMenuItem
-        Caption = 'timestamp'
-        Hint = 'Insert timestamp-value'
-        ImageIndex = 80
-        OnClick = InsertDate
+        OnClick = InsertValue
       end
       object DataYear: TMenuItem
         Caption = 'year'
         Hint = 'Insert year-value'
         ImageIndex = 80
-        OnClick = InsertDate
+        OnClick = InsertValue
       end
       object DataUNIXtimestamp: TMenuItem
         Caption = 'unix timestamp'
         Hint = 'Insert UNIX timestamp'
         ImageIndex = 80
-        OnClick = InsertDate
+        OnClick = InsertValue
+      end
+      object N2: TMenuItem
+        Caption = '-'
+      end
+      object DataGUID: TMenuItem
+        Caption = 'GUID'
+        ImageIndex = 112
+        OnClick = InsertValue
       end
     end
     object ViewasHTML1: TMenuItem
diff --git a/source/main.pas b/source/main.pas
index 16bb233d..c089aa02 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -290,12 +290,13 @@ type
     Exportdata2: TMenuItem;
     SaveDialogExportData: TSaveDialog;
     N11a: TMenuItem;
-    DataInsertDateTime: TMenuItem;
-    DataTimestamp: TMenuItem;
+    DataInsertValue: TMenuItem;
     DataDateTime: TMenuItem;
     DataTime: TMenuItem;
     DataDate: TMenuItem;
     DataYear: TMenuItem;
+    N2: TMenuItem;
+    DataGUID: TMenuItem;
     ViewasHTML1: TMenuItem;
     InsertfilesintoBLOBfields3: TMenuItem;
     N19: TMenuItem;
@@ -604,7 +605,8 @@ type
     procedure SaveDialogExportDataTypeChange(Sender: TObject);
     procedure popupDataGridPopup(Sender: TObject);
     procedure QFvaluesClick(Sender: TObject);
-    procedure InsertDate(Sender: TObject);
+    procedure DataInsertValueClick(Sender: TObject);
+    procedure InsertValue(Sender: TObject);
     procedure actDataSetNullExecute(Sender: TObject);
     function QueryLoad(Filename: String; ReplaceContent: Boolean; Encoding: TEncoding): Boolean;
     procedure AnyGridCreateEditor(Sender: TBaseVirtualTree; Node: PVirtualNode;
@@ -5313,7 +5315,7 @@ procedure TMainForm.popupDataGridPopup(Sender: TObject);
 var
   Grid: TVirtualStringTree;
   Results: TMySQLQuery;
-  y,m,d,h,i,s,ms : Word;
+  i: Integer;
   cpText, Col, value : String;
   CellFocused, InDataGrid: Boolean;
   RowNumber: PCardinal;
@@ -5323,7 +5325,7 @@ begin
   Grid := ActiveGrid;
   CellFocused := Assigned(Grid.FocusedNode) and (Grid.FocusedColumn > NoColumn);
   InDataGrid := Grid = DataGrid;
-  DataInsertDateTime.Enabled := CellFocused;
+  DataInsertValue.Enabled := CellFocused;
   QFvalues.Enabled := CellFocused;
   menuQuickFilter.Enabled := InDataGrid;
   actDataResetSorting.Enabled := InDataGrid;
@@ -5334,15 +5336,6 @@ begin
     Exit;
   Results := GridResult(Grid);
 
-  decodedate(now, y, m, d);
-  decodetime(now, h, i, s, ms);
-  DataDateTime.Caption := Format('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', [y,m,d,h,i,s]);
-  DataDate.Caption := Format('%.4d-%.2d-%.2d', [y,m,d]);
-  DataTime.Caption := Format('%.2d:%.2d:%.2d', [h,i,s]);
-  DataTimestamp.caption := Format('%.4d%.2d%.2d%.2d%.2d%.2d', [y,m,d,h,i,s]);
-  DataYear.Caption := Format('%.4d', [y]);
-  DataUNIXtimestamp.Caption := IntToStr(UnixTimestamp(Now));
-
   // Manipulate the Quick-filter menuitems
   AnyGridEnsureFullRow(Grid, Grid.FocusedNode);
   RowNumber := Grid.GetNodeData(Grid.FocusedNode);
@@ -5444,13 +5437,34 @@ begin
 end;
 
 
-procedure TMainForm.InsertDate(Sender: TObject);
+procedure TMainForm.DataInsertValueClick(Sender: TObject);
+var
+  y, m, d, h, i, s, ms: Word;
+  Uid: TGuid;
+begin
+  DecodeDateTime(Now, y, m, d, h, i, s, ms);
+  DataDateTime.Caption := 'DATETIME: ' + Format('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', [y,m,d,h,i,s]);
+  DataDate.Caption := 'DATE: ' + Format('%.4d-%.2d-%.2d', [y,m,d]);
+  DataTime.Caption := 'TIME: ' + Format('%.2d:%.2d:%.2d', [h,i,s]);
+  DataYear.Caption := 'YEAR: ' + Format('%.4d', [y]);
+  DataUNIXtimestamp.Caption := 'UNIX Timestamp: ' + IntToStr(UnixTimestamp(Now));
+
+  CreateGuid(Uid);
+  DataGUID.Caption := 'GUID: ' + GuidToString(Uid);
+end;
+
+
+procedure TMainForm.InsertValue(Sender: TObject);
 var
   d: String;
+  p: Integer;
   Grid: TVirtualStringTree;
 begin
   // Insert date/time-value into table
   d := StripHotkey((Sender as TMenuItem).Caption);
+  p := Pos(':', d);
+  if p > 0 then
+    d := Trim(Copy(d, p+1, MaxInt));
   Grid := ActiveGrid;
   try
     Grid.Text[Grid.FocusedNode, Grid.FocusedColumn] := d;