lp:~fhscholl/4eturntracker/4eturntracker

Branch merges

Propose for merging

No branches dependent on this one.

Approved for merging into lp:4eturntracker

Frank Scholl (community): Approve on 2013-10-03

Paul McCullagh: Pending requested 2013-10-02

Diff: 945 lines (+517/-95)

9 files modified

resources/4eTurnTracker.qrc (+1/-0)
src/creature.cpp (+37/-44)
src/encounters.cpp (+3/-19)
src/global.cpp (+234/-1)
src/global.h (+45/-2)
src/mainwindow.cpp (+38/-0)
src/mainwindow.h (+5/-0)
src/playerswindow.cpp (+135/-22)
src/playerswindow.h (+19/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

196. By Frank Scholl on 2013-10-03

Previous commit was shortsighted.
Added new class RollLineEdit inherited from QLineEdit. It contains a RollExpression, has a faded d6 background image for easy recognition, and performs self validation or the entered expression.
Replaced the toolbar implementation with one based on RollLineEdit.

195. By Frank Scholl on 2013-10-02

Added RollExpression. This class takes a string and interprets it into a dice roll. e.g. "3d6+7" or "2d8-1d6+6"
Added toolbar to do on the fly rolling using RollExpression.

194. By Frank Scholl on 2013-09-27

Added options to change the highlight color in the player's window via the context menu. Options are currently yellow, light yellow, dark gray, and light green. If the highlighting settign is turned on and the color isn't saved for some reason, it defaults to dark gray.

193. By Frank Scholl on 2013-09-25

> - In order to be consistent with the current code, please use TABs (4-space tabs) in place of spaces for indentation.

FIXED (silly default editor template)

> - The code added: //Verify Portraits folder exists
>
> Would be best added after

Moved. I actually had it here originally but moved it to the loading of content.

> And the code must return a boolean. Although the result is not evaluated, you should do the following...

FIXED. I actually stole this from elsewhere in your code. I just forgot to change the retrn behavior.

> - With regard to highlighting the current.

Changed colors. I thought the yellow made it easier to read from across the room, but it's your call.

> - I noticed that after turning off "Keep Current Turn on Top", this was not saved after a restart.

I cannot reproduce this. I've tried a dozen times in different ways and it always saves for me. I'm using Windows and verified the value is stored in the registry. The code is identical to the highlight and showDamageAndHeals.

192. By Frank Scholl on 2013-09-25

Rebuilt Player View context menu to use check boxes.
Added option to highlight the row with the current turn. (resolves to-do 108)
Added option to rotate the players view list keeping the current turn on top. (partially resolves to-do 046)

191. By Frank Scholl on 2013-09-22

Resolves KI55.
Moved splitID from encounter to global for reuse in creature.
Rewrote creature::compareName to utilize splitID.
Changed creature::compareName to a case sensitive sort for more expected behavior when using more than 26 monsters identified by letters ("a" will come after "Z" instead of before "A").

190. By Frank Scholl on 2013-09-21

Resolves K157

189. By Paul McCullagh on 2013-09-19

Merged to-do 102

188. By Paul McCullagh on 2013-09-15

New translations

187. By Paul McCullagh on 2013-06-15

Remove creatures from selection when history changes