Created by Dr. Scotty Delicious, DFPA. and last modified
Get this branch:
bzr branch lp:~scottydelicious666/brewtarget/brewtarget
Only Dr. Scotty Delicious, DFPA. can upload to this branch. If you are Dr. Scotty Delicious, DFPA. please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Dr. Scotty Delicious, DFPA.

Recent revisions

807. By Maxime Lavigne

MR118: Removed unused source files

Keep the source clean by removing source code that is no longer used

806. By Philip

MR115: remove timer widget .ui

Remove useless htmlViewer.ui

Remove timerWidget.ui

805. By Mik Firestone

MR121: fix crash when double-clicking recipes on brewdate

Bug #1416916 Crash on column select

Working the bug. I think this is a hold over from the days when trees had just
one column. When I implemented multi-column trees, I didn't update some logic.
I am still testing.

This closes 1416916

I believe this was a boundary check that did not expand when the bounds did.
Back in the day, there was only ever one column in the trees, so getting any
column > 0 was an error. Once I added more columns, this should have been

I now check against the number of columns for the tree. I have also added some
protection in the filter so that anything that returns an invalid index will
not be displayed.

804. By Mik Firestone

MR120: calories per 330mL for SI units

Fixes a minor annoyance with calories/12oz

Basically, it is always calories per 12oz, even when the volume system is SI.
Given that a "standard" can in europe is 33cL, and at the request of a
european user, I have modified the calories per 12oz to be volume unit

I should really consider doing this as a BtVolumeLabel. The issue is that
there is no real toSI and fromSI for this field. I would need to either
special case it in the BtLineEdit code or do something else.

803. By mackanzx

MR113: fix crash on removing hop from hop dialog

Bug #1413359

The row() function returns -1 if nothing is selected, and the getHop function assumed the integer would always be positive.

802. By Mik Firestone

MR116: fix compiler warnings introduced from MR99

Fixes a compiler warning in BtLineEdit

Fixes an unused variable warning

801. By Philip

MR110: remove aboutDialog.ui

Removed aboutDialog.ui

The .ui files are a content management nightmare. When one changes,
it almost always results in a bad merge. Not going to tolerate
this anymore.

Made GPL notice preformatted

800. By Daniel Pettersson

MR112: delete button deletes all selected ingredients

Squashed commit of the following:

commit 541e1165b23490b5f4083af0da332e0bef3f31be
Author: Daniel Pettersson <email address hidden>
Date: Sat Jan 17 18:35:08 2015 +0100

    Fixes after second review

commit a53877e491ab1e9849628a31aebdca65517a690e
Author: Daniel Pettersson <email address hidden>
Date: Thu Jan 15 20:39:38 2015 +0100

    Fixes after review of "multiple-delete".

commit c787364b27510009a4888d80a141e2309dc93be7
Author: Daniel Pettersson <email address hidden>
Date: Wed Jan 14 21:33:22 2015 +0100

    Multiple-delete. Enables the multiple detetion of fermentables, yeasts, misc and hops.

799. By Philip

MR111: Test case for pstdint.h

Test that the integer types given by our pstdint.h are correct.

798. By Philip

MR108: Add script to inspect .sqlite file changes manually

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.