From 94e39c2733b9a10542e86b163378a4da70ed0236 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Wed, 22 Jan 2020 20:10:43 -0500
Subject: [PATCH] Use Qt standard shortcuts for printing, bold, italic, and
 underline.

In theory these will automatically get localized, since they're using
Qt's official enums.
---
 oscar/daily.cpp      | 4 ++++
 oscar/daily.ui       | 9 ---------
 oscar/mainwindow.cpp | 1 +
 oscar/mainwindow.ui  | 2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/oscar/daily.cpp b/oscar/daily.cpp
index 0fdf4867..5bcde5e9 100644
--- a/oscar/daily.cpp
+++ b/oscar/daily.cpp
@@ -122,6 +122,10 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     qDebug() << "Creating new Daily object";
     ui->setupUi(this);
 
+    ui->JournalNotesBold->setShortcut(QKeySequence::Bold);
+    ui->JournalNotesItalic->setShortcut(QKeySequence::Italic);
+    ui->JournalNotesUnderline->setShortcut(QKeySequence::Underline);
+
     // Remove Incomplete Extras Tab
     //ui->tabWidget->removeTab(3);
 
diff --git a/oscar/daily.ui b/oscar/daily.ui
index 1fc521e5..649e4e55 100644
--- a/oscar/daily.ui
+++ b/oscar/daily.ui
@@ -1049,9 +1049,6 @@ QToolButton:pressed {
               <property name="text">
                <string> i </string>
               </property>
-              <property name="shortcut">
-               <string notr="true">Ctrl+I</string>
-              </property>
              </widget>
             </item>
             <item>
@@ -1065,9 +1062,6 @@ QToolButton:pressed {
               <property name="text">
                <string>B</string>
               </property>
-              <property name="shortcut">
-               <string notr="true">Ctrl+B</string>
-              </property>
              </widget>
             </item>
             <item>
@@ -1080,9 +1074,6 @@ QToolButton:pressed {
               <property name="text">
                <string>u</string>
               </property>
-              <property name="shortcut">
-               <string notr="true">Ctrl+U</string>
-              </property>
              </widget>
             </item>
             <item>
diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 77c2507b..3d1f9a88 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -132,6 +132,7 @@ void MainWindow::SetupGUI()
     ui->action_About->setMenuRole(QAction::AboutRole);
     ui->action_Preferences->setMenuRole(QAction::PreferencesRole);
 #endif
+    ui->actionPrint_Report->setShortcuts(QKeySequence::Print);
 
     ui->actionLine_Cursor->setChecked(AppSetting->lineCursorMode());
     ui->actionPie_Chart->setChecked(AppSetting->showPieChart());
diff --git a/oscar/mainwindow.ui b/oscar/mainwindow.ui
index e7c4a2bc..1027c7dd 100644
--- a/oscar/mainwindow.ui
+++ b/oscar/mainwindow.ui
@@ -3248,7 +3248,7 @@ p, li { white-space: pre-wrap; }
     <string>Show Pie Chart on Daily page</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+P</string>
+    <string>F3</string>
    </property>
   </action>
   <action name="action_Standard_Graph_Order">