brewtarget:malavv-brewtarget.git
2 years agoMR121: fix crash when double-clicking recipes on brewdate master
Mik Firestone [Tue, 3 Feb 2015 22:36:40 +0000 (17:36 -0500)]
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
updated.

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.

2 years agoMR120: calories per 330mL for SI units
Mik Firestone [Tue, 3 Feb 2015 13:33:11 +0000 (08:33 -0500)]
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
sensitive.

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.

2 years agoMR113: fix crash on removing hop from hop dialog
Markus Mårtensson [Tue, 20 Jan 2015 23:05:23 +0000 (00:05 +0100)]
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.

2 years agoMR116: fix compiler warnings introduced from MR99
Mik Firestone [Sun, 1 Feb 2015 02:50:45 +0000 (21:50 -0500)]
MR116: fix compiler warnings introduced from MR99

Fixes a compiler warning in BtLineEdit

Fixes an unused variable warning

2 years agoMR110: remove aboutDialog.ui
Philip G. Lee [Sun, 11 Jan 2015 16:41:19 +0000 (10:41 -0600)]
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

2 years agoMR112: delete button deletes all selected ingredients
Daniel Pettersson [Sat, 31 Jan 2015 19:25:46 +0000 (13:25 -0600)]
MR112: delete button deletes all selected ingredients

Squashed commit of the following:

commit 541e1165b23490b5f4083af0da332e0bef3f31be
Author: Daniel Pettersson <pettson81@gmail.com>
Date:   Sat Jan 17 18:35:08 2015 +0100

    Fixes after second review

commit a53877e491ab1e9849628a31aebdca65517a690e
Author: Daniel Pettersson <pettson81@gmail.com>
Date:   Thu Jan 15 20:39:38 2015 +0100

    Fixes after review of "multiple-delete".

commit c787364b27510009a4888d80a141e2309dc93be7
Author: Daniel Pettersson <pettson81@gmail.com>
Date:   Wed Jan 14 21:33:22 2015 +0100

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

2 years agoMR111: Test case for pstdint.h
Philip G. Lee [Sun, 11 Jan 2015 23:57:56 +0000 (17:57 -0600)]
MR111: Test case for pstdint.h

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

2 years agoMR108: Add script to inspect .sqlite file changes manually
Philip G. Lee [Thu, 1 Jan 2015 01:59:51 +0000 (19:59 -0600)]
MR108: Add script to inspect .sqlite file changes manually

2 years agoMR104: late sugar additions affect boil gravity
Kregg Kemper [Sat, 31 Jan 2015 19:06:58 +0000 (13:06 -0600)]
MR104: late sugar additions affect boil gravity

Fixes issue 1394753: late sugar additions do not work.

rocketman768: removed the '#undef small' section in unit.h since that has been
addressed by a previous commit.

Squashed commit of the following:

commit c0aac4df942bd69dfbabf9c7a1118909abc31b93
Author: Kregg Kemper <gigatropolis@yahoo.com>
Date:   Sun Jan 4 06:13:47 2015 -0800

    Removed preBoil from function calcTotalPoints. Push revision 3

commit 6730aad5b23ca0e504b5386f7666b6e16084b660
Author: Kregg Kemper <gigatropolis@yahoo.com>
Date:   Thu Jan 1 18:37:23 2015 -0800

    Changed back to using _og to calc IBUs.

commit 517b1efef8cd8da77e29ab7f5dbd77ee8b8c2234
Author: Kregg Kemper <gigatropolis@yahoo.com>
Date:   Mon Dec 1 20:54:39 2014 -0800

    1) ibuFromHop() uses _boilGrav instead of _og to get corrected ibu values based on boil density

    2) start boil uses sugars from any grain or sugar that is not a late addition. The
    sugars from steeping are added before the boil same as a mash. The call to
    equivSucrose_kg() calculates the amount of sugars added correctly corretly
    depending on steep or mash.

    3) <windows.h> has a stupid macro that defines 'small' as 'char', which
    interfears with the enum value 'small' in units.h
     added logic to udefine small so Brewtarget compiles on windows platform
     with VS.

2 years agoMR99: simplify unit systems
Mik Firestone [Sat, 31 Jan 2015 18:46:20 +0000 (12:46 -0600)]
MR99: simplify unit systems

This is a squashed merge of many commits:

b559a9f
9d9d03f
6db0015
8484014
c41a132
b7d5e07
e7e3eae
10d3af1
fbf4d9a
6f0fd71
056bf7a
d45182e
0cf0c96
cbc2f7c
e8d1a0c
7f5ae51
37f1acc
b347f56
110b115
d87dd31
bf7e6e0
357a87e
8585ffa
756bf9c
96a082c
3e159f5
9afa323
5441ea2
db29a16
7a86bee
8aabd8a
c1dcfaf
01fcf8f
4240916
25e64d2
012a6de
5b7d0de
70d29c5
2ad86dc

Conflicts:
src/USWeightUnitSystem.cpp
src/brewtarget.cpp

2 years agoMR114: unitScale enum items renamed
Mik Firestone [Sun, 25 Jan 2015 18:20:19 +0000 (13:20 -0500)]
MR114: unitScale enum items renamed

Closes issue 1407994.

Due to compilation issues, I had to rename the unitScales from extrasmall,
small, ... to scaleExtraSmall, scaleSmall, etc. The code compiles and runs.
This should get around the windows problem.

2 years agoConflict between pstdint and openGl in the definition of int32_t. int32_conflict
Maxime Lavigne (malavv) [Thu, 8 Jan 2015 15:09:11 +0000 (10:09 -0500)]
Conflict between pstdint and openGl in the definition of int32_t.

  - Smallest fix I could find, this would need to be tested on
    other platform.

2 years agoMR105: updated product_id for Ringwood Ale yeast
Kregg Kemper [Tue, 2 Dec 2014 06:58:13 +0000 (22:58 -0800)]
MR105: updated product_id for Ringwood Ale yeast

3 years agoRemoved phonon in favor of QtMultimedia
Philip G. Lee [Mon, 10 Nov 2014 01:46:37 +0000 (19:46 -0600)]
Removed phonon in favor of QtMultimedia

Also converted mp3 to ogg in the spirit of open source.

3 years agoQt5 Upgrade: Windows build compiles and installs
Philip G. Lee [Sun, 9 Nov 2014 22:56:47 +0000 (16:56 -0600)]
Qt5 Upgrade: Windows build compiles and installs

3 years agoUpdate version strings to 2.2.0
Philip G. Lee [Sun, 9 Nov 2014 19:12:54 +0000 (13:12 -0600)]
Update version strings to 2.2.0

3 years agoMerge MR 102 to master.
Philip G. Lee [Sun, 9 Nov 2014 19:02:14 +0000 (13:02 -0600)]
Merge MR 102 to master.

Also, changed ui/timerWidget.ui to use property 'digitCount'
instead of deprecated property 'numDigits'.

3 years agoMerge MR 100 to master
Philip G. Lee [Sun, 9 Nov 2014 18:57:10 +0000 (12:57 -0600)]
Merge MR 100 to master

3 years agoQt5 Upgrade: CMakeLists cleanup
Philip G. Lee [Sun, 2 Nov 2014 22:20:13 +0000 (16:20 -0600)]
Qt5 Upgrade: CMakeLists cleanup

3 years agoQt5 Upgrade: Code changes for compilation
Philip G. Lee [Sun, 2 Nov 2014 20:40:15 +0000 (14:40 -0600)]
Qt5 Upgrade: Code changes for compilation

3 years agoQt5 Upgrade: Amending CMakeLists
Philip G. Lee [Sun, 2 Nov 2014 18:29:47 +0000 (12:29 -0600)]
Qt5 Upgrade: Amending CMakeLists

3 years agoMerge MR 101 to master
Philip G. Lee [Sun, 26 Oct 2014 18:14:39 +0000 (13:14 -0500)]
Merge MR 101 to master

3 years agoDo you spell it lb or lbs?
mik firestone [Sat, 25 Oct 2014 02:52:40 +0000 (22:52 -0400)]
Do you spell it lb or lbs?

Apparently, it should be "lb".

3 years agoBad defaults
mik firestone [Fri, 24 Oct 2014 15:36:45 +0000 (11:36 -0400)]
Bad defaults

I forgot to retrofit one set of changes to default "force" to false. When
force is true, you will always use the system default for everything. So
entering 20 kg into a field would over ride the kg and make it pounds.

3 years agoFixes import/export of brewnotes
Mik Firestone [Mon, 20 Oct 2014 03:08:13 +0000 (23:08 -0400)]
Fixes import/export of brewnotes

An old comment marked export brewnotes as a todo. This checkin fixes that. The
only odd thing was that I had to modify BtTreeModel to handle the signals
correctly and actually show the imported brewnotes.

3 years agoFixes no unit and surprise entry
mik firestone [Sun, 12 Oct 2014 14:39:15 +0000 (10:39 -0400)]
Fixes no unit and surprise entry

Pretty simple change to fix both. The annoying part is that I had to make sure
each UnitSystem knows its default Unit. Not bad, but annoying. After that, it
was a simple change in brewtarget.cpp to make sure the proper unit was
provided to qstringToSI.

If you enter an amount with no unit, it will be interpreted as the default
unit. For example, assume you have SI volumes as the system default and US gallons
selected on the "Calculated batch size" field. If you enter "5" into that
field, it will be interpreted as 5 US gallons.

If you have selected Imperial gallons on a field and have US gallons as your
default, entering 5 gal into the field will be interpreted as 5 imperial
gallons. I think this violates POLA just a little less.

3 years agoUnit system refactor
mik firestone [Sat, 11 Oct 2014 15:33:47 +0000 (11:33 -0400)]
Unit system refactor

I completely rebuilt the Unit and Scales mechanisms.

All of the UnitSystem classes have been pretty much reduced to their
constructor, a new method called loadMap(), thicknessUnit() and unitType().
All of the really hard work is now down in UnitSystem.cpp and unit.cpp.

Unit now exposes getUnit as a static public method. The logic is really hard
to follow, so I've tried to add comments. Basically, if you enter "5 gal", it
will look for the Unit System that matches your current system-level default.
All of the Unit classes have a new method called boundary(), which is used
later.

UnitSystem now has the only implementation of qstringToSI and displayAmount.
By using the QMap populated by the sundrey loadMaps(), displayAmount is
very elegant. If a specific scale is requested, it uses that. Otherwise, it
loops through the map and finds the appropriate scale.

3 years agoCloses Bug 1374421 -- cannot delete brewnotes
mik firestone [Fri, 26 Sep 2014 12:16:34 +0000 (08:16 -0400)]
Closes Bug 1374421 -- cannot delete brewnotes

In almost every circumstance, the switches() in BtTreeView and BtTreeModel can
sdafely ignore brewnotes. Almost. The exception being in deleteSelected().
That oversight is fixed with this patch.

3 years agoInstall images for the manual in the right directory
Philip G. Lee [Mon, 15 Sep 2014 00:59:31 +0000 (19:59 -0500)]
Install images for the manual in the right directory

Also, link with QtSvg on OSX to automatically install the svg image
format plugin. Major kludge, but whatever.

3 years agoRemove sqlite stuff in CMakeLists.txt
Philip G. Lee [Sun, 14 Sep 2014 21:04:29 +0000 (16:04 -0500)]
Remove sqlite stuff in CMakeLists.txt

3 years agoCant put windows icon in btobjlib
Philip G. Lee [Sun, 14 Sep 2014 20:30:23 +0000 (15:30 -0500)]
Cant put windows icon in btobjlib

3 years agoUpdated author lists
Philip G. Lee [Sun, 14 Sep 2014 17:13:44 +0000 (12:13 -0500)]
Updated author lists

3 years agoUpdate changelog with v2.1.0 changes
Philip G. Lee [Sun, 14 Sep 2014 16:56:53 +0000 (11:56 -0500)]
Update changelog with v2.1.0 changes

3 years agoImported launchpad translations
Philip G. Lee [Sun, 14 Sep 2014 16:25:45 +0000 (11:25 -0500)]
Imported launchpad translations

Deleted useless phrasebooks directory

3 years agoMerge 97 to master
Philip G. Lee [Sat, 13 Sep 2014 16:07:58 +0000 (11:07 -0500)]
Merge 97 to master

3 years agoUpdated mac packaging info
Philip G. Lee [Sat, 13 Sep 2014 16:01:58 +0000 (11:01 -0500)]
Updated mac packaging info

3 years agoFixes #1259374 - fails to launch on OSX case sensitive FS
Philip G. Lee [Sat, 13 Sep 2014 15:50:53 +0000 (10:50 -0500)]
Fixes #1259374 - fails to launch on OSX case sensitive FS

Also removes tabs from mac/Info.plist

3 years agoBrazilian flag for Portuguese language
Philip G. Lee [Sat, 13 Sep 2014 14:42:28 +0000 (09:42 -0500)]
Brazilian flag for Portuguese language

3 years ago1286655 - Fixes high ibu due to low boil SG
Philip G. Lee [Sun, 7 Sep 2014 18:59:23 +0000 (13:59 -0500)]
1286655 - Fixes high ibu due to low boil SG

The fix is to use the batch OG in the IBU calculations, since it
is the total break material that affects the IBUs.

3 years ago1346342 - Half of the fix for missing svg icons
Philip G. Lee [Sun, 7 Sep 2014 16:11:17 +0000 (11:11 -0500)]
1346342 - Half of the fix for missing svg icons

The rest must be done in debian packaging. Namely, libqt4-svg must
manually be added as a dependency in debian/control.

3 years agoUpdates copyright statements
Philip G. Lee [Mon, 4 Aug 2014 03:11:16 +0000 (22:11 -0500)]
Updates copyright statements

* Scripts directory. New updatecopyright.sh script
* Updated header copyrights
* Updated copyright statement for .cpp files

3 years agoMerge #90 to master
Philip G. Lee [Sun, 10 Aug 2014 17:04:29 +0000 (12:04 -0500)]
Merge #90 to master

3 years agoFixed two typos.
mik firestone [Sun, 10 Aug 2014 13:45:14 +0000 (09:45 -0400)]
Fixed two typos.

3 years agoReplaced all tabs with 3 spaces.
Philip G. Lee [Sat, 9 Aug 2014 19:25:12 +0000 (14:25 -0500)]
Replaced all tabs with 3 spaces.

3 years agoMerge #92 to master
Philip G. Lee [Sat, 9 Aug 2014 19:13:32 +0000 (14:13 -0500)]
Merge #92 to master

3 years agoAdded a script to set up a git environment for devs
Philip G. Lee [Sat, 9 Aug 2014 19:07:52 +0000 (14:07 -0500)]
Added a script to set up a git environment for devs

3 years agoProper migration rollback error handling
Philip G. Lee [Sat, 9 Aug 2014 14:29:44 +0000 (09:29 -0500)]
Proper migration rollback error handling

Now properly handles migration errors, and will rollback to last
good database configuration and prevent brewtarget from starting.

3 years agoAdded image files to CMake
mik firestone [Thu, 7 Aug 2014 03:12:36 +0000 (23:12 -0400)]
Added image files to CMake

As rocketman suggested.

3 years agoV2.1 manual
mik firestone [Mon, 4 Aug 2014 03:19:24 +0000 (23:19 -0400)]
V2.1 manual

Now with pictures

3 years agoSwapped inventory/amount columns
Philip G. Lee [Mon, 4 Aug 2014 00:10:19 +0000 (19:10 -0500)]
Swapped inventory/amount columns

Also made the inventory field uneditable in the recipe ingredient
tables.

3 years agoFixes having to compile each source twice, once per target
Philip G. Lee [Sun, 3 Aug 2014 21:27:01 +0000 (16:27 -0500)]
Fixes having to compile each source twice, once per target

3 years agoDebug help for DatabaseSchemaHelper::migrateNext
Philip G. Lee [Sun, 3 Aug 2014 21:10:35 +0000 (16:10 -0500)]
Debug help for DatabaseSchemaHelper::migrateNext

3 years agoFixes broken fermentableEditor.ui layout
Philip G. Lee [Sun, 3 Aug 2014 19:53:40 +0000 (14:53 -0500)]
Fixes broken fermentableEditor.ui layout

3 years agoMerge #87 to master
Philip G. Lee [Sun, 3 Aug 2014 19:44:07 +0000 (14:44 -0500)]
Merge #87 to master

Amended changelog

3 years agoUpdated translations
Philip G. Lee [Sun, 3 Aug 2014 18:58:01 +0000 (13:58 -0500)]
Updated translations

3 years agoCloses bug #1340484 Extract recipes crash brewit
Mik Firestone [Sun, 3 Aug 2014 18:19:48 +0000 (14:19 -0400)]
Closes bug #1340484 Extract recipes crash brewit

Some simple bounds checking was missed.

3 years agoRemoved create_db.sql from brewtarget.qrc
Philip G. Lee [Sun, 3 Aug 2014 16:34:54 +0000 (11:34 -0500)]
Removed create_db.sql from brewtarget.qrc

3 years agoFixes #1224236: incorrect tablespoon abbreviation
Philip G. Lee [Sun, 3 Aug 2014 15:46:59 +0000 (10:46 -0500)]
Fixes #1224236: incorrect tablespoon abbreviation

3 years agoMerge #84 to master
Philip G. Lee [Sun, 3 Aug 2014 03:23:32 +0000 (22:23 -0500)]
Merge #84 to master

3 years agoAdd auto line-ending handling
Philip G. Lee [Sat, 2 Aug 2014 20:51:17 +0000 (15:51 -0500)]
Add auto line-ending handling

3 years agoUpdated doc/Doxyfile.in and removed doc warnings
Philip G. Lee [Sat, 2 Aug 2014 18:39:06 +0000 (13:39 -0500)]
Updated doc/Doxyfile.in and removed doc warnings

3 years agoRemove create_db.sql since it is no longer needed
Philip G. Lee [Sat, 2 Aug 2014 18:00:20 +0000 (13:00 -0500)]
Remove create_db.sql since it is no longer needed

3 years agoAdded --create-blank option to make blank db from command line
Philip G. Lee [Sat, 2 Aug 2014 17:56:58 +0000 (12:56 -0500)]
Added --create-blank option to make blank db from command line

3 years agoMerge upstream/master into features/schema-management
Philip G. Lee [Sat, 2 Aug 2014 17:27:23 +0000 (12:27 -0500)]
Merge upstream/master into features/schema-management

3 years agoParsing options in key/value pairs
Philip G. Lee [Sat, 2 Aug 2014 15:16:13 +0000 (10:16 -0500)]
Parsing options in key/value pairs

3 years agoMoved all schema modification to DatabaseSchemaHelper.
Philip G. Lee [Sat, 26 Jul 2014 14:34:20 +0000 (09:34 -0500)]
Moved all schema modification to DatabaseSchemaHelper.

This greatly simplifies schema creation and migration as well as
allowing us more flexibility. First, EVERYTHING is in one place:
DatabaseSchemaHelper.cpp. Second, this eliminates the need for
developers to run partial migrations before a new release. Third,
there is no need for external sqlite3 tool during building. There
are many more.

3 years agoApparently this bothered me more than I thought
Mik Firestone [Sat, 19 Jul 2014 17:08:33 +0000 (13:08 -0400)]
Apparently this bothered me more than I thought

I did not realize how much the inconsistency annoyed me, but apparently it
did. This should get all the applicable fields in all of the editors and the
mash designer to adjust unit properly.

I still need to get everything wired for selecting units&scales, but small
steps.

3 years agoMerge #78 to master.
Philip G. Lee [Sat, 26 Jul 2014 12:46:53 +0000 (07:46 -0500)]
Merge #78 to master.

3 years agoFixes #1335656: a missing include.
Philip G. Lee [Sun, 20 Jul 2014 02:37:53 +0000 (21:37 -0500)]
Fixes #1335656: a missing include.

3 years agoMerge #79 to master.
Philip G. Lee [Sat, 19 Jul 2014 17:12:44 +0000 (12:12 -0500)]
Merge #79 to master.

3 years agoAdded inventory header unit selection
Samuel Östling [Thu, 17 Jul 2014 23:17:24 +0000 (19:17 -0400)]
Added inventory header unit selection

3 years agoChanged GUI for clarity and consistency. i.e. Amount->Default Amount and Inventory...
Samuel Östling [Thu, 17 Jul 2014 22:28:33 +0000 (18:28 -0400)]
Changed GUI for clarity and consistency. i.e. Amount->Default Amount and Inventory->Amount in Inventory

3 years agoCreating a new recipe dumps core
Mik Firestone [Wed, 16 Jul 2014 15:13:30 +0000 (11:13 -0400)]
Creating a new recipe dumps core

The work I did for displayRange() didn't expect a NULL element. Now it does.

3 years agoA bit more Algorithms cleanup.
Philip G. Lee [Sat, 5 Jul 2014 21:58:15 +0000 (16:58 -0500)]
A bit more Algorithms cleanup.

3 years agoAlgorithms is no longer a singleton, just a static class.
Philip G. Lee [Sat, 5 Jul 2014 19:54:15 +0000 (14:54 -0500)]
Algorithms is no longer a singleton, just a static class.

Added Polynomial class to encapsulate polynomial operations.

3 years agoAdded inventory feature
Samuel Östling [Fri, 4 Jul 2014 22:54:37 +0000 (18:54 -0400)]
Added inventory feature

3 years agoAdded bug fix from MR #76 to changelog
Philip G. Lee [Sun, 29 Jun 2014 20:54:42 +0000 (15:54 -0500)]
Added bug fix from MR #76 to changelog

3 years agoMerge 77 to master
Philip G. Lee [Sun, 29 Jun 2014 20:45:53 +0000 (15:45 -0500)]
Merge 77 to master

3 years agoMerge 76 to master
Philip G. Lee [Sun, 29 Jun 2014 20:36:16 +0000 (15:36 -0500)]
Merge 76 to master

3 years agoAdded the sliders to the changelog.
Philip G. Lee [Sun, 29 Jun 2014 20:31:42 +0000 (15:31 -0500)]
Added the sliders to the changelog.

3 years agoUpdates to the manual.
mik firestone [Sun, 29 Jun 2014 18:33:52 +0000 (14:33 -0400)]
Updates to the manual.

Updated the manual for v2.1. I didn't add the documentation for the sliders,
since I didn't know when they were being added.

This should be merged just prior to the v2.1 release.

3 years agoRangedSlider text width is no longer hardcoded
Philip Lee [Sat, 21 Jun 2014 20:38:11 +0000 (15:38 -0500)]
RangedSlider text width is no longer hardcoded

I changed my font settings from 96dpi to 120 dpi and noticed that
the RangedSlider value text was getting chopped off (its width was
set to 48px). Now the width for that text is provided by
QFontMetrics, which will change with the dpi.

3 years agoMade some setters into slots and added a property to RangedSlider
Philip Lee [Sat, 21 Jun 2014 20:25:18 +0000 (15:25 -0500)]
Made some setters into slots and added a property to RangedSlider

3 years agoChanged SRM->color to prevent greenage at high srm.
Philip Lee [Sat, 21 Jun 2014 18:27:26 +0000 (13:27 -0500)]
Changed SRM->color to prevent greenage at high srm.

3 years agoChanging units now works for sliders.
Mik Firestone [Sat, 21 Jun 2014 17:39:55 +0000 (13:39 -0400)]
Changing units now works for sliders.

It took some work: four new methods, two new helper functions and a new enum
type just to make the calls look pretty. Most of the work happened in
brewtarget.cpp.

3 years agoRangedSlider has pen for preferred range. Color slider uses it.
Philip Lee [Sun, 15 Jun 2014 13:00:48 +0000 (08:00 -0500)]
RangedSlider has pen for preferred range. Color slider uses it.

3 years agoMoved boil sg and calories to left side of main window
Philip Lee [Sat, 14 Jun 2014 22:18:21 +0000 (17:18 -0500)]
Moved boil sg and calories to left side of main window

3 years agoRemoved the old beer color widget
Philip Lee [Sat, 14 Jun 2014 22:12:31 +0000 (17:12 -0500)]
Removed the old beer color widget

3 years agoColor slider now displays beer color
Philip Lee [Sat, 14 Jun 2014 22:04:28 +0000 (17:04 -0500)]
Color slider now displays beer color

Had to change some ancillary things like isnan and isinf in
the algorithms class due to conflict with macros in math.h.

3 years agoMerge remote-tracking branch 'upstream/master' into features/recwidgets
Philip Lee [Sat, 14 Jun 2014 20:22:47 +0000 (15:22 -0500)]
Merge remote-tracking branch 'upstream/master' into features/recwidgets

Conflicts:
ui/mainWindow.ui

3 years agoCloses bug #1328761
Mik Firestone [Wed, 11 Jun 2014 04:09:29 +0000 (00:09 -0400)]
Closes bug #1328761
Boil SG shouldn't know about kettle to fermenter losses

recalcBoilSG is incorrectly taking into account kettle -> fermentor losses. I
do not believe this to be correct. This change makes it ignore those.

Should we be doing more complex math with respect to efficiency?

3 years agobrewtarget.desktop is no longer a configured file
Philip Lee [Sun, 1 Jun 2014 16:52:50 +0000 (11:52 -0500)]
brewtarget.desktop is no longer a configured file

3 years agoMerge #75 to master
Philip Lee [Sun, 1 Jun 2014 16:47:28 +0000 (11:47 -0500)]
Merge #75 to master

3 years agoFixes bad icon behavior.
Philip Lee [Wed, 28 May 2014 12:37:45 +0000 (07:37 -0500)]
Fixes bad icon behavior.

This is a series of patches provided by
    Robby Workman <rworkman@slackware.com>.
It renames the brewtarget_icons.svg file and installs it in
accordance with the Icon Theme Specification
<http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html>.

3 years agoAvoids warning when updating database
mik firestone [Mon, 12 May 2014 13:17:47 +0000 (09:17 -0400)]
Avoids warning when updating database

If you read the migrations file and the entire line is a comment, sqlite will
generate a warning. This is a very minor patch that skips any line that starts
with "--". It isn't likely the right way of doing it, but I'm working on that.

3 years agoMerge branch 'master' of gitorious.org:brewtarget/brewtarget into origin/StrikeWaterT... origin/StrikeWaterToolbox
Maxime Lavigne (malavv) [Mon, 5 May 2014 04:12:23 +0000 (00:12 -0400)]
Merge branch 'master' of gitorious.org:brewtarget/brewtarget into origin/StrikeWaterToolbox

3 years agoLayout and typo corretion suggested by Phillip in merge request.
Maxime Lavigne (malavv) [Mon, 5 May 2014 04:11:21 +0000 (00:11 -0400)]
Layout and typo corretion suggested by Phillip in merge request.

Looking great. If you do the following, I will merge this request.

In the UI, "Wieght" should be "Weight"
Reset the "bold" weighted fonts to normal weight (no bold)
"Pre-heaten" should be "pre-heated"
Move the pushButton_calculate button above results
Reset the "Minimum Size" of pushButton_calculate to default (0x0)
Set size policy of pushButton_calculate to [Fixed, Fixed, 0, 0]
Remove noteHline
Change mashInfusion and initialInfusion layouts to "Form" layouts.
Put the above form layouts into group boxes whose titles are "Mash Infusion" and "Initial Infusion". Also remove header and its contents.

3 years agoAdded folder feature to changelog.
Philip G. Lee [Sat, 3 May 2014 16:34:52 +0000 (11:34 -0500)]
Added folder feature to changelog.

3 years agoMerge #71 to master.
Philip G. Lee [Sat, 3 May 2014 16:30:10 +0000 (11:30 -0500)]
Merge #71 to master.

Conflicts:
src/brewtarget.cpp

3 years agoMerge #62 to master.
Philip G. Lee [Sat, 3 May 2014 16:22:23 +0000 (11:22 -0500)]
Merge #62 to master.

Conflicts:
brewtarget.qrc
src/BtTreeFilterProxyModel.cpp