Patch for ticket #789

[Matthew Vepritskiy]

> Your email program base64 encoded the patch which makes it harder for me
> to comment on it line by line.
Should I use another email program?

> Clearly white space damaged. Which editor do you use?
My mistake. Newly installed Qt set them automatically. Fixed.

> Looks like this file had a mix of tab and space to begin with
Excuse Me. Do not quite understand.

Regards, Matthew V.

> Date: Sun, 15 Mar 2015 08:37:14 -0700
> From: dirk at hohndel.org
> To: matteofichtner at hotmail.com
> CC: subsurface at subsurface-divelog.org
> Subject: Re: Patch for ticket #789
> 
> On Sun, Mar 15, 2015 at 03:20:21PM +0000, Fichtner Matteo wrote:
> > Hello everyone.
> > 
> > Here is a patch for ticket #789: blank column.
> 
> Hi Mattheo
> 
> your email program base64 encoded the patch which makes it harder for me
> to comment on it line by line. Not a huge deal, you're not the only one
> with that issue...
> 
> >  icons/trashGray.png   | Bin 0 -> 1592 bytes
> >  qt-ui/diveplanner.cpp |  4 ++++
> >  qt-ui/models.cpp      | 15 +++++++++++++++
> >  qt-ui/models.h        |  3 +++
> >  subsurface.qrc        |  7 ++++---
> >  5 files changed, 26 insertions(+), 3 deletions(-)
> >  create mode 100644 icons/trashGray.png
> > 
> > diff --git a/icons/trashGray.png b/icons/trashGray.png
> > new file mode 100644
> > index 0000000..c9e3b8d
> > Binary files /dev/null and b/icons/trashGray.png differ
> 
> That's good to know - but I would really need to get the different data
> (i.e., the png file) for this to work. How did you create this patch?
> git format-patch should do the right thing and include an encoded binary
> patch...
> 
> > diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
> > index 7831cc6..8dd6ca9 100644
> > --- a/qt-ui/diveplanner.cpp
> > +++ b/qt-ui/diveplanner.cpp
> > @@ -634,12 +634,16 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const
> >  		case REMOVE:
> >  			if (rowCount() > 1)
> >  				return p.entered ? trashIcon() : QVariant();
> > +            else
> > +                return p.entered ? trashIconGray() : QVariant();
> 
> Clearly white space damaged. Which editor do you use? My guess is that you
> are using four space as indent? Please take a look at the CodingStyle file
> to see how we want the code to be formatted...
> 
> > diff --git a/subsurface.qrc b/subsurface.qrc
> > index 2b07313..22b9c60 100644
> > --- a/subsurface.qrc
> > +++ b/subsurface.qrc
> > @@ -72,8 +72,9 @@
> >          <file>icons/ostc3.png</file>
> >          <file>icons/suunto_vyper.png</file>
> >          <file alias="facebook">icons/facebook.png</file>
> > -	<file alias="filter-reset">icons/edit-undo.svg</file>
> > -	<file alias="filter-hide">icons/go-top.svg</file>
> > -	<file alias="filter-close">icons/process-stop.svg</file>
> > +        <file alias="filter-reset">icons/edit-undo.svg</file>
> > +        <file alias="filter-hide">icons/go-top.svg</file>
> > +        <file alias="filter-close">icons/process-stop.svg</file>
> > +        <file alias="trashGray">icons/trashGray.png</file>
> 
> Looks like this file had a mix of tab and space to begin with - so your
> change just continues that... but you certainly shouldn't just change the
> white space in front of unchanged lines (I'm sure you didn't intend to do
> that, just pointing it out)
> 
> 
> Would you resend your patch with these issues addressed, please?
> 
> /D
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20150315/ce77af06/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_#789_blank_column.patch
Type: application/octet-stream
Size: 5641 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20150315/ce77af06/attachment.obj>