From ceeefe17d3b9f911b882ca1fc6f1f939e4f60dbd Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Fri, 5 Aug 2016 11:01:46 +0000
Subject: [PATCH] * Move some menu items for configuring data grids into a new
 submenu labelled "Grid view options" * Create a duplicated menu item there,
 for "View binary data as text" button from the main toolbar * Create a new
 menu item there, for jumping to the "Data" tab in the preferences window *
 Add related translation strings

---
 out/locale/en/LC_MESSAGES/default.po | 14 ++++++++++++-
 source/main.dfm                      | 30 ++++++++++++++++++++--------
 source/main.pas                      | 12 +++++++++--
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index fedfc0ce..cae9bae7 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2016-06-15 21:13+0200\n"
+"PO-Revision-Date: 2016-08-05 12:54+0200\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/"
 "language/en/)\n"
@@ -6232,3 +6232,15 @@ msgstr "Change expired password"
 
 msgid "Password strength:"
 msgstr "Password strength:"
+
+#. Menu item for jumping to "Logging" tab in preferences window
+msgid "Logging preferences"
+msgstr "Logging preferences"
+
+#. Menu item for jumping to "Data" tab in preferences window
+msgid "Data grid preferences"
+msgstr "Data grid preferences"
+
+#. Menu item with some sub items for configuring data grids
+msgid "Grid view options"
+msgstr "Grid view options"
diff --git a/source/main.dfm b/source/main.dfm
index 93824358..46310175 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -2345,6 +2345,10 @@ object MainForm: TMainForm
       Category = 'Tools'
       Caption = 'Logging preferences'
     end
+    object actPreferencesData: TAction
+      Category = 'Tools'
+      Caption = 'Data grid preferences'
+    end
     object actFlushHosts: TAction
       Category = 'Tools'
       Caption = 'Hosts'
@@ -9430,18 +9434,28 @@ object MainForm: TMainForm
         OnClick = InsertValue
       end
     end
-    object actTimestampColumn1: TMenuItem
-      Action = actUnixTimestampColumn
-      AutoCheck = True
-    end
-    object ViewasHTML1: TMenuItem
-      Action = actDataPreview
+    object InsertfilesintoBLOBfields3: TMenuItem
+      Action = actInsertFiles
     end
     object SaveBLOBtofile1: TMenuItem
       Action = actDataSaveBlobToFile
     end
-    object InsertfilesintoBLOBfields3: TMenuItem
-      Action = actInsertFiles
+    object Gridviewoptions1: TMenuItem
+      Caption = 'Grid view options'
+      object hisisaUNIXtimestampcolumn1: TMenuItem
+        Action = actUnixTimestampColumn
+        AutoCheck = True
+      end
+      object ViewasHTML1: TMenuItem
+        Action = actDataPreview
+      end
+      object ViewbinarydataastextinsteadofHEX2: TMenuItem
+        Action = actBlobAsText
+        AutoCheck = True
+      end
+      object Datapreferences1: TMenuItem
+        Action = actPreferencesData
+      end
     end
     object N4a: TMenuItem
       Caption = '-'
diff --git a/source/main.pas b/source/main.pas
index b1d9cd8e..600218b0 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -580,7 +580,6 @@ type
     menuTreeOptions: TMenuItem;
     menuClearDataTabFilter: TMenuItem;
     actUnixTimestampColumn: TAction;
-    actTimestampColumn1: TMenuItem;
     LoadSQLfile2: TMenuItem;
     N2: TMenuItem;
     Save1: TMenuItem;
@@ -619,6 +618,11 @@ type
     RunSQLfiles1: TMenuItem;
     actPreferencesLogging: TAction;
     Loggingpreferences1: TMenuItem;
+    Gridviewoptions1: TMenuItem;
+    hisisaUNIXtimestampcolumn1: TMenuItem;
+    ViewbinarydataastextinsteadofHEX2: TMenuItem;
+    actPreferencesData: TAction;
+    Datapreferences1: TMenuItem;
     procedure actCreateDBObjectExecute(Sender: TObject);
     procedure menuConnectionsPopup(Sender: TObject);
     procedure actExitApplicationExecute(Sender: TObject);
@@ -1692,6 +1696,8 @@ begin
   actBatchInOneGo.Checked := not AppSettings.ReadBool(asSingleQueries);
   actPreferencesLogging.ImageIndex := actPreferences.ImageIndex;
   actPreferencesLogging.OnExecute := actPreferences.OnExecute;
+  actPreferencesData.ImageIndex := actPreferences.ImageIndex;
+  actPreferencesData.OnExecute := actPreferences.OnExecute;
 
   pnlQueryMemo.Height := AppSettings.ReadInt(asQuerymemoheight);
   treeQueryHelpers.Width := AppSettings.ReadInt(asQueryhelperswidth);
@@ -2086,7 +2092,9 @@ begin
   // Preferences
   FPreferencesDialog := Toptionsform.Create(Self);
   if Sender = actPreferencesLogging then
-    FPreferencesDialog.pagecontrolMain.ActivePage := FPreferencesDialog.tabLogging;
+    FPreferencesDialog.pagecontrolMain.ActivePage := FPreferencesDialog.tabLogging
+  else if Sender = actPreferencesData then
+    FPreferencesDialog.pagecontrolMain.ActivePage := FPreferencesDialog.tabTextFormatting;
   FPreferencesDialog.ShowModal;
   FreeAndNil(FPreferencesDialog);
 end;