Fixed dialogs which did not allow for tab control and navigation

trumpton · Oct 21, 2024 · c5e494b · c5e494b
1 parent d8f4f7a
commit c5e494b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/appointmentform.ui b/appointmentform.ui
@@ -168,7 +168,11 @@
       </widget>
      </item>
      <item>
-      <widget class="SafeTextEdit" name="plaintexteditDescription"/>
+      <widget class="SafeTextEdit" name="plaintexteditDescription">
+       <property name="tabChangesFocus">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
     </layout>
    </item>
@@ -185,6 +189,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SafeLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>../Lib/safelineedit.h</header>
+  </customwidget>
   <customwidget>
    <class>LineEditNavigator</class>
    <extends>QLineEdit</extends>
@@ -195,11 +204,6 @@
    <extends>QPlainTextEdit</extends>
    <header>../Lib/safetextedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>SafeLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>../Lib/safelineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>AccessibleDateRangeEdit</class>
    <extends>QLineEdit</extends>

diff --git a/help.ui b/help.ui
@@ -29,6 +29,9 @@
      <property name="accessibleName">
       <string>Easy Notepad Help</string>
      </property>
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
      <property name="plainText">
       <string>&gt;&gt; 1. COMMON SHORTCUTS
   Control-F - Find in Current Page (F3 - Find Next)

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -63,8 +63,11 @@
       <property name="accessibleDescription">
        <string>Page Select</string>
       </property>
+      <property name="inputMethodHints">
+       <set>Qt::ImhMultiLine</set>
+      </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>4</number>
       </property>
       <widget class="QWidget" name="OverviewTab">
        <property name="whatsThis">
@@ -91,12 +94,15 @@
           <property name="accessibleDescription">
            <string>Overview</string>
           </property>
+          <property name="tabChangesFocus">
+           <bool>true</bool>
+          </property>
           <property name="html">
            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:14pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:16pt; color:#5500ff;&quot;&gt;Contact Overview&lt;/span&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:16pt; color:#5500ff;&quot;&gt;Contact Overview&lt;/span&gt;&lt;span style=&quot; font-family:'Noto Sans'; font-size:14pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="textInteractionFlags">
            <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -148,6 +154,9 @@ p, li { white-space: pre-wrap; }
           <property name="accessibleDescription">
            <string>To Do List</string>
           </property>
+          <property name="tabChangesFocus">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
        </layout>
@@ -983,16 +992,19 @@ p, li { white-space: pre-wrap; }
        </attribute>
        <layout class="QHBoxLayout" name="horizontalLayout_6">
         <item>
-         <widget class="QPlainTextEdit" name="editHistory">
+         <widget class="QTextEdit" name="editHistory">
           <property name="accessibleDescription">
            <string>History</string>
           </property>
-          <property name="undoRedoEnabled">
-           <bool>false</bool>
+          <property name="tabChangesFocus">
+           <bool>true</bool>
           </property>
           <property name="readOnly">
            <bool>true</bool>
           </property>
+          <property name="textInteractionFlags">
+           <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+          </property>
          </widget>
         </item>
        </layout>
@@ -1007,7 +1019,7 @@ p, li { white-space: pre-wrap; }
      <x>0</x>
      <y>0</y>
      <width>1138</width>
-     <height>31</height>
+     <height>17</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_Goto">
@@ -1494,16 +1506,16 @@ p, li { white-space: pre-wrap; }
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>SafeTextEdit</class>
-   <extends>QPlainTextEdit</extends>
-   <header>../Lib/safetextedit.h</header>
-  </customwidget>
   <customwidget>
    <class>SafeLineEdit</class>
    <extends>QLineEdit</extends>
    <header>../Lib/safelineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>SafeTextEdit</class>
+   <extends>QPlainTextEdit</extends>
+   <header>../Lib/safetextedit.h</header>
+  </customwidget>
   <customwidget>
    <class>AccessibleDateTimeEdit</class>
    <extends>QLineEdit</extends>
@@ -1548,7 +1560,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>editComment</tabstop>
   <tabstop>checkTextMe</tabstop>
   <tabstop>checkEmailMe</tabstop>
-  <tabstop>editHistory</tabstop>
  </tabstops>
  <resources>
   <include location="Icon.qrc"/>

diff --git a/mainwindow_menu_search.cpp b/mainwindow_menu_search.cpp
@@ -38,7 +38,7 @@ void MainWindow::on_actionFindNext_triggered()
             currentplaintextedit = ui->editToDo ;
             break ;
         case HISTORYTABPOS:
-            currentplaintextedit = ui->editHistory ;
+            currenttextedit = ui->editHistory ;
             break ;
         default:
               ;;