some string fixes... my last 1.1 commit, onwards to 2.0

sleepyhead/Graphs/MinutesAtPressure.cpp

@@ -262,7 +262,7 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
 
             float ipap_minutes = ipap.times[mouseOverKey] / 60.0;
             float epap_minutes = epap.times[mouseOverKey] / 60.0;
-            QString str = QString("%1%2").arg(mouseOverKey / pressureMult,3,'f',1).arg(STR_UNIT_CMH2O)+"\n";
+            QString str = QString("%1 %2").arg(mouseOverKey / pressureMult,3,'f',1).arg(STR_UNIT_CMH2O)+"\n";
             bool good = false;
 
             if (ipap_minutes > 0) {

sleepyhead/Graphs/gSessionTimesChart.cpp

@@ -1,4 +1,4 @@
-/* gSessionTimesChart Implementation
+/* gSessionTimesChart Implementation
  *
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
  *
@@ -204,7 +204,7 @@ void gSummaryChart::afterDraw(QPainter &painter, gGraph &graph, QRectF rect)
 
 
     float perc = p_profile->general->prefCalcPercentile();
-    QString percstr = QObject::tr("%1%").arg(perc, 0, 'f',0);
+    QString percstr = QString("%1%").arg(perc, 0, 'f',0);
 
     schema::Channel & chan = schema::channel[calcitems.at(0).code];
 

sleepyhead/Graphs/gdailysummary.cpp

@@ -114,38 +114,38 @@ void gDailySummary::SetDay(Day *day)
 
         if (mode == MODE_CPAP) {
             EventDataType p = round(day->settings_max(CPAP_Pressure));
-            settings.append(QString("Fixed %1%2").arg(p,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Fixed %1 %2").arg(p,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
         } else if (mode == MODE_APAP) {
             EventDataType min = round(day->settings_min(CPAP_PressureMin));
             EventDataType max = round(day->settings_max(CPAP_PressureMax));
-            settings.append(QString("Min Pressure %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Min Pressure %1 %2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("Max Pressure %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Max Pressure %1 %2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
         } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) {
             EventDataType min = round(day->settings_min(CPAP_EPAPLo));
             EventDataType max = round(day->settings_max(CPAP_IPAPHi));
             EventDataType ps = round(day->settings_max(CPAP_PS));
-            settings.append(QString("Min EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Min EPAP %1 %2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("Max IPAP %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Max IPAP %1 %2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("PS %1%2").arg(ps,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("PS %1 %2").arg(ps,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
         } else if (mode == MODE_BILEVEL_FIXED) {
             EventDataType min = round(day->settings_min(CPAP_EPAP));
             EventDataType max = round(day->settings_max(CPAP_IPAP));
-            settings.append(QString("EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("EPAP %1 %2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("IPAP %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("IPAP %1 %2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
         } else if (mode == MODE_BILEVEL_AUTO_VARIABLE_PS) {
             EventDataType min = round(day->settings_min(CPAP_EPAPLo));
             EventDataType max = round(day->settings_max(CPAP_IPAPHi));
             EventDataType ps = round(day->settings_max(CPAP_PSMin));
             EventDataType pshi = round(day->settings_max(CPAP_PSMax));
-            settings.append(QString("Min EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Min EPAP %1 %2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("Max IPAP %1%2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("Max IPAP %1 %2").arg(max,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("PS %1-%2%3").arg(ps,0,'f',2).arg(pshi,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("PS %1-%2 %3").arg(ps,0,'f',2).arg(pshi,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
         } else if (mode == MODE_ASV) {
             EventDataType min = round(day->settings_min(CPAP_EPAP));
             EventDataType ps = round(day->settings_max(CPAP_PSMin));
             EventDataType pshi = round(day->settings_max(CPAP_PSMax));
-            settings.append(QString("EPAP %1%2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("EPAP %1 %2").arg(min,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
-            settings.append(QString("PS %1-%2%3").arg(ps,0,'f',2).arg(pshi,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
+            settings.append(QString("PS %1-%2 %3").arg(ps,0,'f',2).arg(pshi,0,'f',2).arg(schema::channel[CPAP_Pressure].units()));
         }
         settings.append(QObject::tr("Relief: %1").arg(day->getPressureRelief()));
 

sleepyhead/daily.cpp

@@ -903,7 +903,7 @@ QString Daily::getSessionInformation(Day * day)
     }
 
     if (corrupted_waveform) {
-        html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg(tr("One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly."));
+        html+=QString("<tr><td colspan=5 align=center><i>%1</i></td></tr>").arg(tr("One or more waveform record(s) for this session had faulty source data. Some waveform overlay points may not match up correctly."));
     }
     html+="</table>";
     return html;
@@ -1072,7 +1072,7 @@ QString Daily::getCPAPInformation(Day * day)
     html+="<tr><td align=center><p title=\""+tooltip+"\">"+info.brand + " "+ info.series+"<br/> "+info.model+"</p></td></tr>\n";
     html+="<tr><td align=center>";
 
-    html+=tr("PAP Mode: %1<br/>").arg(day->getCPAPMode());
+    html+=tr("PAP Mode: %1").arg(day->getCPAPMode())+"<br/>";
     html+= day->getPressureSettings();
     html+="</td></tr>\n";
     if (day->noSettings(cpap)) {
@@ -1194,8 +1194,7 @@ QString Daily::getStatisticsInfo(Day * day)
             int m = ttia / 60 % 60;
             int s = ttia % 60;
             if (ttia > 0) {
-                html+="<tr><td colspan=3 align='left' bgcolor='white'><b>"+tr("Total time in apnea")+
+                html+="<tr><td colspan=3 align='left' bgcolor='white'><b title="+tr("Total time in apnea")+">"+tr("TTIA")+QString("</b></td><td colspan=2 bgcolor='white'>%1</td></tr>").arg(QString().sprintf("%02i:%02i:%02i",h,m,s));
-                    QString("</b></td><td colspan=2 bgcolor='white'>%1</td></tr>").arg(QString().sprintf("%02i:%02i:%02i",h,m,s));
             }
 
         }
@@ -1255,7 +1254,7 @@ QString Daily::getSleepTime(Day * day)
         return html;
 
     html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
-    html+="<tr><td align='center'><b>"+STR_TR_Date+"</b></td><td align='center'><b>"+tr("Sleep")+"</b></td><td align='center'><b>"+tr("Wake")+"</b></td><td align='center'><b>"+STR_UNIT_Hours+"</b></td></tr>";
+    html+="<tr><td align='center'><b>"+STR_TR_Date+"</b></td><td align='center'><b>"+tr("Start")+"</b></td><td align='center'><b>"+tr("End")+"</b></td><td align='center'><b>"+STR_UNIT_Hours+"</b></td></tr>";
     int tt=qint64(day->total_time())/1000L;
     QDateTime date=QDateTime::fromTime_t(day->first()/1000L);
     QDateTime date2=QDateTime::fromTime_t(day->last()/1000L);
@@ -1489,7 +1488,7 @@ void Daily::Load(QDate date)
                 }
             } else { // machine is a brick
                 html+="<tr><td colspan=5 align='center'><b><h2>"+tr("BRICK :(")+"</h2></b></td></tr>";
-                html+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, your machine only provides compliance data.")+"</i></td></tr>\n";
+                html+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, this machine only provides compliance data.")+"</i></td></tr>\n";
                 html+="<tr><td colspan=5 align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n";
             }
             html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";

sleepyhead/daily.ui

@@ -522,7 +522,7 @@ QToolButton:pressed {
 }</string>
           </property>
           <property name="text">
-           <string>Prev</string>
+           <string notr="true"/>
           </property>
           <property name="icon">
            <iconset resource="Resources.qrc">
@@ -571,7 +571,7 @@ border-radius: 10px;
 }</string>
           </property>
           <property name="text">
-           <string>...</string>
+           <string notr="true"/>
           </property>
           <property name="checkable">
            <bool>true</bool>
@@ -633,7 +633,7 @@ QToolButton:pressed {
 }</string>
           </property>
           <property name="text">
-           <string>Next</string>
+           <string notr="true"/>
           </property>
           <property name="icon">
            <iconset resource="Resources.qrc">
@@ -689,6 +689,9 @@ QToolButton:pressed {
  background-color: #89abcd;
 }</string>
           </property>
+          <property name="text">
+           <string notr="true"/>
+          </property>
           <property name="icon">
            <iconset resource="Resources.qrc">
             <normaloff>:/icons/arrow-end.png</normaloff>:/icons/arrow-end.png</iconset>
@@ -1025,6 +1028,9 @@ QToolButton:pressed {
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Minimum</enum>
+              </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>342</width>
@@ -1044,7 +1050,7 @@ QToolButton:pressed {
                <string> i </string>
               </property>
               <property name="shortcut">
-               <string>Ctrl+I</string>
+               <string notr="true">Ctrl+I</string>
               </property>
              </widget>
             </item>
@@ -1060,7 +1066,7 @@ QToolButton:pressed {
                <string>B</string>
               </property>
               <property name="shortcut">
-               <string>Ctrl+B</string>
+               <string notr="true">Ctrl+B</string>
               </property>
              </widget>
             </item>
@@ -1074,6 +1080,9 @@ QToolButton:pressed {
               <property name="text">
                <string>u</string>
               </property>
+              <property name="shortcut">
+               <string notr="true">Ctrl+U</string>
+              </property>
              </widget>
             </item>
             <item>
@@ -1084,16 +1093,28 @@ QToolButton:pressed {
               <property name="text">
                <string>Color</string>
               </property>
+              <property name="shortcut">
+               <string notr="true"/>
+              </property>
              </widget>
             </item>
             <item>
              <widget class="QComboBox" name="JournalNotesFontsize">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
               <property name="maximumSize">
                <size>
                 <width>85</width>
                 <height>16777215</height>
                </size>
               </property>
+              <property name="currentText">
+               <string>Small</string>
+              </property>
               <property name="maxVisibleItems">
                <number>3</number>
               </property>
@@ -1184,7 +1205,7 @@ QToolButton:pressed {
                  </font>
                 </property>
                 <property name="text">
-                 <string>I'm feeling...</string>
+                 <string>I'm feeling ...</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignCenter</set>
@@ -1555,7 +1576,7 @@ QToolButton:pressed {
              </sizepolicy>
             </property>
             <property name="toolTip">
-             <string>Drop down this list to show/hide available graphs.</string>
+             <string>Show/hide available graphs.</string>
             </property>
             <property name="styleSheet">
              <string notr="true"/>

sleepyhead/exportcsv.ui

@@ -245,7 +245,11 @@
      <item>
       <widget class="QToolButton" name="filenameBrowseButton">
        <property name="text">
-        <string>...</string>
+        <string notr="true">...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="Resources.qrc">
+         <normaloff>:/icons/save.png</normaloff>:/icons/save.png</iconset>
        </property>
       </widget>
      </item>

sleepyhead/help.cpp

@@ -51,7 +51,7 @@ Help::Help(QWidget *parent) :
         }
     }
     if (helpFile.isEmpty()) {
-        ui->languageWarningMessage->setText(tr("Help files could not be located... If you're building from source, try rerunning Qmake."));
+        ui->languageWarningMessage->setText(tr("Help files do not appear to be present."));
         // Still empty, install is dodgy
         // Copy en_US out of resource??
         // For now I just don't care, if the user screws up.. tough

sleepyhead/help.ui

@@ -123,7 +123,7 @@ color: rgb(255,255,255);</string>
       <item>
        <widget class="QToolButton" name="backButton">
         <property name="text">
-         <string>...</string>
+         <string notr="true"/>
         </property>
         <property name="icon">
          <iconset resource="Resources.qrc">
@@ -143,7 +143,7 @@ color: rgb(255,255,255);</string>
       <item>
        <widget class="QToolButton" name="forwardButton">
         <property name="text">
-         <string>...</string>
+         <string notr="true"/>
         </property>
         <property name="icon">
          <iconset resource="Resources.qrc">
@@ -163,7 +163,7 @@ color: rgb(255,255,255);</string>
       <item>
        <widget class="QToolButton" name="homeButton">
         <property name="text">
-         <string>...</string>
+         <string notr="true"/>
         </property>
         <property name="icon">
          <iconset resource="Resources.qrc">

sleepyhead/mainwindow.ui

@@ -1201,7 +1201,7 @@ QToolBox::tab:selected  {
         <number>1</number>
        </property>
        <property name="currentIndex">
-        <number>2</number>
+        <number>0</number>
        </property>
        <property name="tabSpacing">
         <number>0</number>
@@ -2687,12 +2687,15 @@ border-radius: 10px;
 </string>
               </property>
               <property name="text">
-               <string>...</string>
+               <string notr="true"/>
               </property>
               <property name="icon">
                <iconset resource="Resources.qrc">
                 <normaloff>:/icons/refresh.png</normaloff>:/icons/refresh.png</iconset>
               </property>
+              <property name="shortcut">
+               <string notr="true"/>
+              </property>
               <property name="autoRaise">
                <bool>true</bool>
               </property>
@@ -2910,7 +2913,7 @@ p, li { white-space: pre-wrap; }
     <string>&amp;Import Data</string>
    </property>
    <property name="shortcut">
-    <string>Shift+F2</string>
+    <string notr="true">Shift+F2</string>
    </property>
   </action>
   <action name="action_Preferences">
@@ -2933,7 +2936,7 @@ p, li { white-space: pre-wrap; }
     <string>View &amp;Daily</string>
    </property>
    <property name="shortcut">
-    <string>F5</string>
+    <string notr="true">F5</string>
    </property>
   </action>
   <action name="actionView_Overview">
@@ -2941,7 +2944,7 @@ p, li { white-space: pre-wrap; }
     <string>View &amp;Overview</string>
    </property>
    <property name="shortcut">
-    <string>F6</string>
+    <string notr="true">F6</string>
    </property>
   </action>
   <action name="actionView_Welcome">
@@ -2949,7 +2952,7 @@ p, li { white-space: pre-wrap; }
     <string>View &amp;Welcome</string>
    </property>
    <property name="shortcut">
-    <string>F4</string>
+    <string notr="true">F4</string>
    </property>
   </action>
   <action name="action_CycleTabs">
@@ -2957,7 +2960,7 @@ p, li { white-space: pre-wrap; }
     <string>-</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+Tab</string>
+    <string notr="true">Ctrl+Tab</string>
    </property>
   </action>
   <action name="actionUse_AntiAliasing">
@@ -2981,7 +2984,7 @@ p, li { white-space: pre-wrap; }
     <string>&amp;Fullscreen Toggle</string>
    </property>
    <property name="shortcut">
-    <string>F11</string>
+    <string notr="true">F11</string>
    </property>
   </action>
   <action name="actionDebug">
@@ -2991,6 +2994,9 @@ p, li { white-space: pre-wrap; }
    <property name="text">
     <string>Show Debug Pane</string>
    </property>
+   <property name="shortcut">
+    <string notr="true"/>
+   </property>
   </action>
   <action name="action_Reset_Graph_Layout">
    <property name="text">
@@ -3007,7 +3013,7 @@ p, li { white-space: pre-wrap; }
     <string>Take &amp;Screenshot</string>
    </property>
    <property name="shortcut">
-    <string>F12</string>
+    <string notr="true">F12</string>
    </property>
   </action>
   <action name="actionView_Oximetry">
@@ -3015,7 +3021,7 @@ p, li { white-space: pre-wrap; }
     <string>O&amp;ximetry Wizard</string>
    </property>
    <property name="shortcut">
-    <string>F7</string>
+    <string notr="true">F7</string>
    </property>
   </action>
   <action name="actionPrint_Report">
@@ -3064,7 +3070,7 @@ p, li { white-space: pre-wrap; }
     <string>Right &amp;Sidebar</string>
    </property>
    <property name="shortcut">
-    <string>F10</string>
+    <string notr="true">F10</string>
    </property>
   </action>
   <action name="actionView_Statistics">
@@ -3078,7 +3084,7 @@ p, li { white-space: pre-wrap; }
     <string>View Statistics</string>
    </property>
    <property name="shortcut">
-    <string>F4</string>
+    <string notr="true">F4</string>
    </property>
   </action>
   <action name="actionImport_ZEO_Data">
@@ -3129,7 +3135,7 @@ p, li { white-space: pre-wrap; }
     <string>Toggle &amp;Line Cursor</string>
    </property>
    <property name="shortcut">
-    <string>Ctrl+L</string>
+    <string notr="true">Ctrl+L</string>
    </property>
   </action>
   <action name="action">
@@ -3148,7 +3154,7 @@ p, li { white-space: pre-wrap; }
     <string>Daily Sidebar</string>
    </property>
    <property name="shortcut">
-    <string>F8</string>
+    <string notr="true">F8</string>
    </property>
   </action>
   <action name="actionDaily_Calendar">
@@ -3162,7 +3168,7 @@ p, li { white-space: pre-wrap; }
     <string>Daily Calendar</string>
    </property>
    <property name="shortcut">
-    <string>F9</string>
+    <string notr="true">F9</string>
    </property>
   </action>
   <action name="actionExport_Journal">