<html>
<head>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style></head>
<body class='hmmessage'><div dir='ltr'>> Your email program base64 encoded the patch which makes it harder for me<br>> to comment on it line by line.<br><span id="result_box" class="short_text" lang="en"><span class="hps">Should I use</span> <span class="hps">another email program</span><span>?</span></span><br><br>> Clearly white space damaged. Which editor do you use?<br><span id="result_box" lang="en"><span class="hps">My mistake</span><span>.</span> <span class="hps">Newly installed</span> <span class="hps">Qt</span> <span class="hps">set them</span> <span class="hps">automatically.</span> <span class="hps">Fixed</span><span>.</span></span><br><br>> Looks like this file had a mix of tab and space to begin with<br><span id="result_box" class="short_text" lang="en"><span class="hps">Excuse Me.</span> <span class="hps">Do not quite understand</span><span>.</span></span><br><br><span id="ecxresult_box" class="ecxshort_text" lang="en"><span class="ecxhps ecxalt-edited">Regards</span><span>, Matthew</span><span> V.</span></span><br><br><div>> Date: Sun, 15 Mar 2015 08:37:14 -0700<br>> From: dirk@hohndel.org<br>> To: matteofichtner@hotmail.com<br>> CC: subsurface@subsurface-divelog.org<br>> Subject: Re: Patch for ticket #789<br>> <br>> On Sun, Mar 15, 2015 at 03:20:21PM +0000, Fichtner Matteo wrote:<br>> > Hello everyone.<br>> > <br>> > Here is a patch for ticket #789: blank column.<br>> <br>> Hi Mattheo<br>> <br>> your email program base64 encoded the patch which makes it harder for me<br>> to comment on it line by line. Not a huge deal, you're not the only one<br>> with that issue...<br>> <br>> > icons/trashGray.png | Bin 0 -> 1592 bytes<br>> > qt-ui/diveplanner.cpp | 4 ++++<br>> > qt-ui/models.cpp | 15 +++++++++++++++<br>> > qt-ui/models.h | 3 +++<br>> > subsurface.qrc | 7 ++++---<br>> > 5 files changed, 26 insertions(+), 3 deletions(-)<br>> > create mode 100644 icons/trashGray.png<br>> > <br>> > diff --git a/icons/trashGray.png b/icons/trashGray.png<br>> > new file mode 100644<br>> > index 0000000..c9e3b8d<br>> > Binary files /dev/null and b/icons/trashGray.png differ<br>> <br>> That's good to know - but I would really need to get the different data<br>> (i.e., the png file) for this to work. How did you create this patch?<br>> git format-patch should do the right thing and include an encoded binary<br>> patch...<br>> <br>> > diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp<br>> > index 7831cc6..8dd6ca9 100644<br>> > --- a/qt-ui/diveplanner.cpp<br>> > +++ b/qt-ui/diveplanner.cpp<br>> > @@ -634,12 +634,16 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const<br>> > case REMOVE:<br>> > if (rowCount() > 1)<br>> > return p.entered ? trashIcon() : QVariant();<br>> > + else<br>> > + return p.entered ? trashIconGray() : QVariant();<br>> <br>> Clearly white space damaged. Which editor do you use? My guess is that you<br>> are using four space as indent? Please take a look at the CodingStyle file<br>> to see how we want the code to be formatted...<br>> <br>> > diff --git a/subsurface.qrc b/subsurface.qrc<br>> > index 2b07313..22b9c60 100644<br>> > --- a/subsurface.qrc<br>> > +++ b/subsurface.qrc<br>> > @@ -72,8 +72,9 @@<br>> > <file>icons/ostc3.png</file><br>> > <file>icons/suunto_vyper.png</file><br>> > <file alias="facebook">icons/facebook.png</file><br>> > - <file alias="filter-reset">icons/edit-undo.svg</file><br>> > - <file alias="filter-hide">icons/go-top.svg</file><br>> > - <file alias="filter-close">icons/process-stop.svg</file><br>> > + <file alias="filter-reset">icons/edit-undo.svg</file><br>> > + <file alias="filter-hide">icons/go-top.svg</file><br>> > + <file alias="filter-close">icons/process-stop.svg</file><br>> > + <file alias="trashGray">icons/trashGray.png</file><br>> <br>> Looks like this file had a mix of tab and space to begin with - so your<br>> change just continues that... but you certainly shouldn't just change the<br>> white space in front of unchanged lines (I'm sure you didn't intend to do<br>> that, just pointing it out)<br>> <br>> <br>> Would you resend your patch with these issues addressed, please?<br>> <br>> /D<br></div> </div></body>
</html>