[PATCH 1/5] Consistent representation of O₂

Tue Nov 25 07:34:49 PST 2014

Not sure what happened here, but look at the patch included below.
Unsurprisingly, git didn't like that very much.

Can you check if there's something odd going on with your encoding
settings? I have never had problems like this with patches from you
before, so something must have changed. Different mail program maybe? Can
you use git send-email ?

/D

On Mon, Nov 24, 2014 at 11:42:30PM +0000, Tim Wootton wrote:
> Signed-off-by: Tim Wootton <tim at tee-jay.demon.co.uk>
> ---
>  qt-ui/configuredivecomputerdialog.ui | 18 [32m+++++++++[m[31m---------[m
>  qt-ui/divelogimportdialog.ui         |  2 [32m+[m[31m-[m
>  qt-ui/models.cpp                     |  2 [32m+[m[31m-[m
>  5 files changed, 14 insertions(+), 14 deletions(-)
> 
> [1mdiff --git a/qt-ui/configuredivecomputerdialog.ui b/qt-ui/configuredivecomputerdialog.ui[m
> [1mindex dd6bce3..134c435 100644[m
> [1m--- a/qt-ui/configuredivecomputerdialog.ui[m
> [1m+++ b/qt-ui/configuredivecomputerdialog.ui[m
> [36m@@ -913,7 +913,7 @@[m
>                </column>[m
>                <column>[m
>                 <property name="text">[m
> [31m-                <string>%O2</string>[m
> [32m+[m[32m                <string>%O₂</string>[m
>                 </property>[m
>                </column>[m
>                <column>[m
> [36m@@ -998,7 +998,7 @@[m
>                </column>[m
>                <column>[m
>                 <property name="text">[m
> [31m-                <string>%O2</string>[m
> [32m+[m[32m                <string>%O₂</string>[m
>                 </property>[m
>                </column>[m
>                <column>[m
> [36m@@ -1121,7 +1121,7 @@[m
>              <item row="2" column="2">[m
>               <widget class="QLabel" name="label_35">[m
>                <property name="text">[m
> [31m-               <string>O2 in calibration gas</string>[m
> [32m+[m[32m               <string>O₂ in calibration gas</string>[m
>                </property>[m
>               </widget>[m
>              </item>[m
> [36m@@ -1213,14 +1213,14 @@[m
>              <item row="4" column="2">[m
>               <widget class="QLabel" name="label_29">[m
>                <property name="text">[m
> [31m-               <string>ppO₂ max</string>[m
> [32m+[m[32m               <string>pO₂ max</string>[m
>                </property>[m
>               </widget>[m
>              </item>[m
>              <item row="5" column="2">[m
>               <widget class="QLabel" name="label_30">[m
>                <property name="text">[m
> [31m-               <string>ppO₂ min</string>[m
> [32m+[m[32m               <string>pO₂ min</string>[m
>                </property>[m
>               </widget>[m
>              </item>[m
> [36m@@ -2119,7 +2119,7 @@[m
>                </column>[m
>                <column>[m
>                 <property name="text">[m
> [31m-                <string>%O2</string>[m
> [32m+[m[32m                <string>%O₂</string>[m
>                 </property>[m
>                </column>[m
>                <column>[m
> [36m@@ -2204,7 +2204,7 @@[m
>                </column>[m
>                <column>[m
>                 <property name="text">[m
> [31m-                <string>%O2</string>[m
> [32m+[m[32m                <string>%O₂</string>[m
>                 </property>[m
>                </column>[m
>                <column>[m
> [36m@@ -2352,14 +2352,14 @@[m
>              <item row="3" column="2">[m
>               <widget class="QLabel" name="label_60">[m
>                <property name="text">[m
> [31m-               <string>ppO₂ max</string>[m
> [32m+[m[32m               <string>pO₂ max</string>[m
>                </property>[m
>               </widget>[m
>              </item>[m
>              <item row="4" column="2">[m
>               <widget class="QLabel" name="label_61">[m
>                <property name="text">[m
> [31m-               <string>ppO₂ min</string>[m
> [32m+[m[32m               <string>pO₂ min</string>[m
>                </property>[m
>               </widget>[m
>              </item>[m
> [1mdiff --git a/qt-ui/divelogimportdialog.ui b/qt-ui/divelogimportdialog.ui[m
> [1mindex 9fd5e44..47a0e54 100644[m
> [1m--- a/qt-ui/divelogimportdialog.ui[m
> [1m+++ b/qt-ui/divelogimportdialog.ui[m
> [36m@@ -118,7 +118,7 @@[m
>            <item row="3" column="0">[m
>             <widget class="QCheckBox" name="po2CheckBox">[m
>              <property name="text">[m
> [31m-             <string>PO2</string>[m
> [32m+[m[32m             <string>pO₂</string>[m
>              </property>[m
>             </widget>[m
>            </item>[m
> [1mdiff --git a/qt-ui/models.cpp b/qt-ui/models.cpp[m
> [1mindex f22a1f6..2bb40ef 100644[m
> [1m--- a/qt-ui/models.cpp[m
> [1m+++ b/qt-ui/models.cpp[m
> [36m@@ -75,7 +75,7 @@[m [mCylindersModel::CylindersModel(QObject *parent) : changed(false),[m
>  	rows(0)[m
>  {[m
>  	//	enum {REMOVE, TYPE, SIZE, WORKINGPRESS, START, END, O2, HE, DEPTH};[m
> [31m-	setHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << trUtf8("O" UTF8_SUBSCRIPT_2 "%") << tr("He%")[m
> [32m+[m	[32msetHeaderDataStrings(QStringList() << "" << tr("Type") << tr("Size") << tr("Work press.") << tr("Start press.") << tr("End press.") << tr("O₂%") << tr("He%")[m
>  					   << tr("Switch at") << tr("Use"));[m
>  [m
>  	initTrashIcon();[m
> -- 
> 2.1.1
> 
> _______________________________________________
> subsurface mailing list
> subsurface at subsurface-divelog.org
> http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface