Remapped date picker hotkey in GUI to CTRL-SHIFT-t to avoid conflict.

diff --git a/TaskJugglerUI/FileManager.cpp b/TaskJugglerUI/FileManager.cpp
index cb217dd..45f0fcf 100644 (file)
--- a/TaskJugglerUI/FileManager.cpp
+++ b/TaskJugglerUI/FileManager.cpp
@@ -55,8 +55,8 @@ FileManager::FileManager(KMainWindow* m, QWidgetStack* v, KListView* b,
     editorConfigured = false;
 
     /* Add our own custom editor actions. */
-    new KAction(i18n("Insert Date"), "",
-                KShortcut(KKey("CTRL+d")),
+    new KAction(i18n("Insert Date/Time"), "",
+                KShortcut(KKey("CTRL+SHIFT+t")),
                 this, SLOT(insertDate()),
                 mainWindow->actionCollection(), "insert_date");
 

diff --git a/docs/en/ChangeLog.xml b/docs/en/ChangeLog.xml
index 29a76ac..5cc7496 100644 (file)
--- a/docs/en/ChangeLog.xml
+++ b/docs/en/ChangeLog.xml
@@ -1288,6 +1288,10 @@ characters are used.</para></listitem>
                <computeroutput>hierarchlevel</computeroutput> was
                included.</para></listitem>
 
+<listitem><para>Hotkey for date/time picker in the GUI editor has
+               been remapped to CTRL-SHIFT-T to avoid a conflict with
+               built-in CTRL-D.</para></listitem>
+
 </itemizedlist></para>
 
 </sect2>