Merge lp:~fhscholl/4eturntracker/4eturntracker into lp:4eturntracker

[Frank Scholl]

Resolves KI57 by ensuring the Portraits folders exists at load time.
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").
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)

Corrected issues with previous merge proposal.

Added option 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.

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.

[Frank Scholl (fhscholl)]

Typo: That should be KI57.

[Paul McCullagh (paul-mccullagh)]

Hi Frank,

Well done on these additions. I am impressed with your changes to the players window, they are not trivial!

A couple of things before I can commit this.

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

- The code added: //Verify Portraits folder exists

Would be best added after

if (new_root.isEmpty()) {
 QFileDialog dialog;
 QStringList fileNames;

 ...
 new_pretty_root = new_root;
}

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

if (r != DIALOG_ACCEPTED)
 return false;

And at the end, remove:

return DIALOG_ACCEPTED;

Because you want to continue after creating the directory.

- With regard to highlighting the current.

What looks good on my computer is the following:

 else if (role == Qt::ForegroundRole) {
  if (gray)
   return Qt::gray;
  if (isCurrentIndex(drawRow) && index.column() != HP_COLUMN && highlightCurrent) {
   if (index.column() == NAME_COLUMN && !creature->isMonster())
    return QColor(238, 243, 254);
   return Qt::white;
  }
  if (index.column() == NAME_COLUMN && !creature->isMonster())
   return Qt::blue;
 }

...

    else if (role == Qt::BackgroundColorRole) {
  if (isCurrentIndex(drawRow) && index.column() != HP_COLUMN && highlightCurrent)
   return Qt::darkGray;
 }

Then the highlight is white (light blue for characters) on dark gray. I think this fits better with the current color schema.

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

review: Needs Fixing

[Frank Scholl (fhscholl)]

See latest revision.

review: Needs Resubmitting

[lp:~fhscholl/4eturntracker/4eturntracker]

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.

[Frank Scholl (fhscholl)]

review: Approve

[Paul McCullagh (paul-mccullagh)]

Hi Frank,

Well done with this changes! I am impressed with the dice roller!

[Frank Scholl (fhscholl)]

Thanks. Honestly, so am I. I would never have even remotely considered
trying any of the fancy decoration on the LineEdit if it wasn't for Qt. I'm
quickly falling in love with the whole Qt framework.

Of course you now realize that since the dice roller is a simple drop in UI
element, I'm going to start replacing other boxes with it. Namely I'll put
it in the power damage instead of the 3 fields with the drop down and the
power healing in place of the SpinBox. The only hesitation I have is the
option for DM override. I think there should be the option for the DM to
change the value before it is applied. I'm just not sure where to put it so
it doesn't look redundant or become more annoying than useful.
 On Oct 3, 2013 5:06 AM, "Paul McCullagh" <email address hidden> wrote:

> Hi Frank,
>
> Well done with this changes! I am impressed with the dice roller!
> --
>
> https://code.launchpad.net/~fhscholl/4eturntracker/4eturntracker/+merge/188763
> You are the owner of lp:~fhscholl/4eturntracker/4eturntracker.
>

[Paul McCullagh (paul-mccullagh)]

On Oct 3, 2013, at 1:18 PM, Frank Scholl wrote:

> Thanks. Honestly, so am I. I would never have even remotely considered
> trying any of the fancy decoration on the LineEdit if it wasn't for Qt. I'm
> quickly falling in love with the whole Qt framework.

Yes! Qt really is a fantastic framework. I makes programming C++ a breeze. :)

And one of the greatest features is that it is completely cross-platform. Really cool.

> Of course you now realize that since the dice roller is a simple drop in UI
> element, I'm going to start replacing other boxes with it. Namely I'll put
> it in the power damage instead of the 3 fields with the drop down and the
> power healing in place of the SpinBox.

Yes. The dice roller is much more flexible that the 3 fields.

And, we could pre-fill the text area by parsing it out the power descriptions (for monsters). Should not be too difficult.

> The only hesitation I have is the
> option for DM override. I think there should be the option for the DM to
> change the value before it is applied. I'm just not sure where to put it so
> it doesn't look redundant or become more annoying than useful.

We will probably need 2 fields. One for the dice text, and one for the result, so that the DM can change the result, if required.

Unmerged revisions

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

=== modified file 'resources/4eTurnTracker.qrc'
--- resources/4eTurnTracker.qrc	2012-06-11 18:30:40 +0000
+++ resources/4eTurnTracker.qrc	2013-10-03 04:04:27 +0000
@@ -86,5 +86,6 @@
         <file>images/multi-open24.png</file>
         <file>images/close14.png</file>
         <file>images/open14.png</file>
+        <file>images/dice16.png</file>
     </qresource>
 </RCC>

=== added file 'resources/images/dice16.png'
Binary files resources/images/dice16.png	1970-01-01 00:00:00 +0000 and resources/images/dice16.png	2013-10-03 04:04:27 +0000 differ
=== modified file 'src/creature.cpp'
--- src/creature.cpp	2013-09-16 12:20:24 +0000
+++ src/creature.cpp	2013-10-03 04:04:27 +0000
@@ -581,32 +581,32 @@
 	}
 	else {
 		if (level) {
-            if (role.isEmpty()) {
-                if (heroClass.isEmpty())
-                    levelClassRole = tr("Level %1").arg(level);
-                else
-                    levelClassRole = tr("Level %1 %2").arg(level).arg(heroClass);
-            }
-            else {
-                if (heroClass.isEmpty())
-                    levelClassRole = tr("Level %1 %2").arg(level).arg(role);
-                else
-                    levelClassRole = tr("Level %1 %2 (%3)").arg(level).arg(heroClass).arg(role);
-            }
-        }
+			if (role.isEmpty()) {
+				if (heroClass.isEmpty())
+					levelClassRole = tr("Level %1").arg(level);
+				else
+					levelClassRole = tr("Level %1 %2").arg(level).arg(heroClass);
+			}
+			else {
+				if (heroClass.isEmpty())
+					levelClassRole = tr("Level %1 %2").arg(level).arg(role);
+				else
+					levelClassRole = tr("Level %1 %2 (%3)").arg(level).arg(heroClass).arg(role);
+			}
+		}
 		else {
-            if (role.isEmpty()) {
-                if (heroClass.isEmpty())
-                    levelClassRole = ASC("");
-                else
-                    levelClassRole = heroClass;
-            }
-            else {
-                if (heroClass.isEmpty())
-                    levelClassRole = role;
-                else
-                    levelClassRole = tr("%1 (%2)").arg(heroClass).arg(role);
-            }
+			if (role.isEmpty()) {
+				if (heroClass.isEmpty())
+					levelClassRole = ASC("");
+				else
+					levelClassRole = heroClass;
+			}
+			else {
+				if (heroClass.isEmpty())
+					levelClassRole = role;
+				else
+					levelClassRole = tr("%1 (%2)").arg(heroClass).arg(role);
+			}
 		}
 	}
 	return levelClassRole;
@@ -621,12 +621,12 @@
 			str = tr("Level %1 ").arg(level);
 		if (!race.isEmpty())
 			str += ASCS("%1 ").arg(race);
-        if (!heroClass.isEmpty() && !role.isEmpty())
-            str += ASCS("%1 (%2) ").arg(heroClass).arg(role);
-        else if (!heroClass.isEmpty())
-            str += ASCS("%1 ").arg(heroClass);
-        else if (!role.isEmpty())
-            str += ASCS("%1 ").arg(role);
+		if (!heroClass.isEmpty() && !role.isEmpty())
+			str += ASCS("%1 (%2) ").arg(heroClass).arg(role);
+		else if (!heroClass.isEmpty())
+			str += ASCS("%1 ").arg(heroClass);
+		else if (!role.isEmpty())
+			str += ASCS("%1 ").arg(role);
 		str.chop(1);
 	}
 	return str;
@@ -1934,27 +1934,20 @@
 
 int Creature::compareNames(QString n1, QString n2)
 {
-	int p1, p2;
+	QString p1, p2, vs1, vs2;
 	int v1, v2;
 
-	p1 = n1.size()-1;
-	while (p1 > 0 && n1[p1].isDigit())
-		p1--;
-	p1++;
-
-	p2 = n2.size()-1;
-	while (p2 > 0 && n2[p2].isDigit())
-		p2--;
-	p2++;
+	p1 = G_::splitID(n1, vs1);
+	p2 = G_::splitID(n2, vs2);
 
 	// Compare the preceeding text values
-	int r = n1.left(p1).compare(n2.left(p2), Qt::CaseInsensitive);
+	int r = p1.compare(p2);
 	if (r != 0)
 		return r;
 
 	// Compare the trialing integer values
-	v1 = n1.right(n1.size() - p1).toInt();
-	v2 = n2.right(n2.size() - p2).toInt();
+	v1 = vs1.toInt();
+	v2 = vs2.toInt();
 	return v1 - v2;
 }
 

=== modified file 'src/encounters.cpp'
--- src/encounters.cpp	2012-09-27 22:13:16 +0000
+++ src/encounters.cpp	2013-10-03 04:04:27 +0000
@@ -443,22 +443,6 @@
 	return i+1;
 }
 
-static QString splitID(QString id, QString& ret_number)
-{
-	QString number;
-
-	int k = id.size()-1;
-	while (k >= 0 && id[k].isDigit()) {
-		number.prepend(id[k]);
-		k--;
-	}
-
-	ret_number = number;
-	if (!number.isEmpty())
-		return G_::left(id, number);
-	return id;
-}
-
 QString EncounterData::getNewUniqueName(QString group, QString default_id, int& selected_numbering, bool unique)
 {
 	QString name;
@@ -478,7 +462,7 @@
 	if (!last_id.isEmpty()) {
 		QString number;
 
-		prefix = splitID(last_id, number);
+		prefix = G_::splitID(last_id, number);
 		if (!number.isEmpty()) {
 			i = number.toInt() + 1;
 			if (prefix.isEmpty())
@@ -529,7 +513,7 @@
 
 			QString number;
 			for (int j=0; j<sortedList.size(); j++) {
-				if (splitID(sortedList[j].monsterID, number) == prefix) {
+				if (G_::splitID(sortedList[j].monsterID, number) == prefix) {
 					goto cont_1;
 				}
 			}
@@ -995,7 +979,7 @@
 			delete data;
 		progress->setValue(progress->value() + 1);
 		if (progress->wasCanceled())
-             return DIALOG_REJECTED;
+			 return DIALOG_REJECTED;
 	}
 
 	if (encounterDataList.size() == 0) {

=== modified file 'src/global.cpp'
--- src/global.cpp	2013-06-15 10:50:51 +0000
+++ src/global.cpp	2013-10-03 04:04:27 +0000
@@ -1095,6 +1095,17 @@
 			new_pretty_root = new_root;
 		}
 
+		//Verify Portraits folder exists
+		QDir root(new_root);
+		if (!root.cd(ASC("Portraits"))) {
+			int r = G_::badRootAlert(tr("Directory not Found"),
+				tr("Directory <b>Portraits</b> not found in %1.").arg(new_pretty_root), tr("Create"));
+			if (r != DIALOG_ACCEPTED)
+				return false;
+			QDir dir = QDir(new_root);
+			dir.mkdir(ASC("Portraits"));
+		}
+
 		ccount = new_characters.getFileCount(new_root);
 		mcount = new_monsters.getFileCount(new_root);
 		ecount = new_encounters.getFileCount(new_root);
@@ -1229,6 +1240,21 @@
 	return nativeRootPath;
 }
 
+QString Global::splitID(QString id, QString& ret_number)
+{
+	QString number;
+
+	int k = id.size()-1;
+	while (k >= 0 && id[k].isDigit()) {
+		number.prepend(id[k]);
+		k--;
+	}
+
+	ret_number = number;
+	if (!number.isEmpty())
+		return G_::left(id, number);
+	return id;
+}
 
 // WindowsAndDialogs -------------------------
 
@@ -1987,7 +2013,7 @@
 // FlatDialog -------------------------
 
 FlatDialog::FlatDialog(QWidget *parent) :
-    QWidget(parent)
+	QWidget(parent)
 {
 	CONNECT_TO(&G_::switchBoard, doCancelFlatDialog(), this, onCancel());
 }
@@ -2221,3 +2247,210 @@
 	return size;
 }
 
+// RollExpression ---------------------------------------------------
+
+int RollExpression::roll()
+{
+	if (!valid)
+		return 0;
+
+	rolls.clear();
+
+	for (int i = 0; i < dice.length(); i++ ) {
+		int r = (rand() % dice[i].first) + 1;
+		if (!dice[i].second)
+			r = -r;
+		rolls.append(r);
+	}
+
+	return this->getResult();
+}
+
+void RollExpression::setExp(QString rollExp)
+{
+	valid = false;
+	modifier = 0;
+	dice.clear();
+	rolls.clear();
+
+	original = rollExp.toLower();
+	this->process();
+}
+
+QString RollExpression::getNormalized()
+{
+	if (!valid)
+		return ASC("");
+	QString norm = ASC("");
+	QString pos = ASC("");
+	QString neg = ASC("");
+
+	if (dice.length() > 0) {
+
+		int cd = dice[0].first;
+		bool cs = dice[0].second;
+		int count = 1;
+
+		for (int i = 1; i < dice.length(); i++ ) {
+			if (cd != dice[i].first || cs != dice[i].second) {
+				if (cs) {
+					if (pos.length() > 0)
+						pos += ASC(" + ");
+					pos += QString::number(count);
+					pos += ASC("d");
+					pos += QString::number(cd);
+				}
+				else {
+					neg += ASC(" - ");
+					neg += QString::number(count);
+					neg += ASC("d");
+					neg += QString::number(cd);
+				}
+				cd = dice[i].first;
+				cs = dice[i].second;
+				count = 0;
+			}
+			count++;
+		}
+		//process the last die group
+		if (cs) {
+			if (pos.length() > 0)
+				pos += ASC(" + ");
+			pos += QString::number(count);
+			pos += ASC("d");
+			pos += QString::number(cd);
+		}
+		else {
+			neg += ASC(" - ");
+			neg += QString::number(count);
+			neg += ASC("d");
+			neg += QString::number(cd);
+		}
+	}
+	if (pos.length() == 0 && modifier > 0) {
+		norm += QString::number(modifier);
+		norm += neg;
+	}
+	else {
+		norm += pos;
+		norm += neg;
+		if (modifier < 0)
+			norm += ASC(" - ");
+		else if (modifier > 0)
+			norm += ASC(" + ");
+		if (modifier != 0)
+			norm += QString::number(abs(modifier));
+	}
+	return norm;
+}
+
+int RollExpression::getResult()
+{
+	if (!valid)
+		return 0;
+
+	if (rolls.length() != dice.length()) //we haven't rolled yet
+		return 0;
+
+	int total = modifier;
+
+	for (int i = 0; i < rolls.length(); i++)
+		total += rolls[i];
+
+	return total;
+}
+
+void RollExpression::process()
+{
+	QString copy = original;
+	bool ok;
+
+	valid = false;
+	modifier = 0;
+
+	copy.replace(ASC(" "),ASC(""));
+
+	//the only valid characters are numbers, +, -, and d
+	copy.replace(ASC("+"),ASC(""));
+	copy.replace(ASC("-"),ASC(""));
+	copy.replace(ASC("d"),ASC(""));
+	copy.toInt(&ok);
+	if (!ok) return;	//if there is anything but digits left, this isn't vaild
+
+	QStringList parts;
+
+	//try to make sense of this string
+	//the interpretation will be a little loose to make it less complex
+	copy = original;
+	copy.replace(ASC(" "),ASC(""));
+	copy.replace(ASC("-"),ASC("+-"));
+	parts = copy.split(ASC("+"),QString::SkipEmptyParts);
+	for (int i = 0; i < parts.length(); i++) {
+		if (parts[i].contains(ASC("d"))) {
+			QStringList die = parts[i].split(ASC("d"),QString::SkipEmptyParts);
+			QString first = ASC("");
+			QString second = ASC("");
+			int c, d;
+
+			if (die.length() == 1 && parts[i].left(1) == ASC("d")) { //"d6"
+				first = ASC("1");
+				second = die[0];
+			}
+			else if (die.length() == 2 && die[0] == ASC("-")) { //"-d6"
+				first = ASC("-1");
+				second = die[1];
+			}
+			else if (die.length() == 2) {
+				first = die[0];
+				second = die[1];
+			}
+
+			if (first == ASC("") || second == ASC("")) return;
+
+			c = first.toInt(&ok);
+			if (!ok) return;
+			d = second.toInt(&ok);
+			if (!ok) return;
+			if (d < 1) return;
+
+			for (int j = 0; j < abs(c); j++)
+				dice.append(QPair<int,bool> (d,(c > 0)));
+		}
+		else {
+			parts[i].toInt(&ok);
+			if (!ok) return;
+			modifier += parts[i].toInt();
+		}
+	}
+	//at this point the string was successfully processed
+	valid = true;
+}
+
+//RollLineEdit ------------------------------------------------------
+
+RollLineEdit::RollLineEdit() {
+	setStatusTip(tr("Enter a valid die expression."));
+	setStyleSheet(ASC("QLineEdit {"
+						"background-image: url(:/images/dice16.png);"
+						"background-repeat: no-repeat;"
+						"background-position:center center;"
+						"}"));
+	connect(this, SIGNAL(textChanged(QString)), this, SLOT(onValueChanged()));
+}
+
+void RollLineEdit::onValueChanged() {
+	roller.setExp(text());
+	if (!isValid() && text() != ASC(""))
+		setStyleSheet(ASC("QLineEdit {"
+							"background-image: url(:/images/dice16.png);"
+							"background-color: #ffe7e7;"
+							"background-repeat: no-repeat;"
+							"background-position:center center;"
+							"}"));
+	else
+		setStyleSheet(ASC("QLineEdit {"
+							"background-image: url(:/images/dice16.png);"
+							"background-repeat: no-repeat;"
+							"background-position:center center;"
+							"}"));
+}

=== modified file 'src/global.h'
--- src/global.h	2012-12-02 15:58:52 +0000
+++ src/global.h	2013-10-03 04:04:27 +0000
@@ -177,6 +177,7 @@
 	static QByteArray toStandardLineEnding(QByteArray& from);
 	static QByteArray toWindowsLineEndings(QByteArray& from);
 	static QString addDirChar(QString path, QChar ch = QDir::separator());
+	static QString splitID(QString id, QString& ret_number);
 
 	static int badRootAlert(QString title, QString message, QString ok_text);
 	static void alert(QString title, QString message);
@@ -410,7 +411,7 @@
 
 class StretchyWidget : public QWidget
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	StretchyWidget(QWidget *parent = 0) :
 		QWidget(parent) {
@@ -537,7 +538,7 @@
 {
 	Q_OBJECT
 public:
-    explicit FlatDialog(QWidget *parent = 0);
+	explicit FlatDialog(QWidget *parent = 0);
 	virtual ~FlatDialog();
 
 	virtual void setupDialogTitle(QLabel* label);
@@ -639,4 +640,46 @@
 	virtual QSize sizeHint() const;
 };
 
+class RollExpression
+{
+public:
+	RollExpression() : valid(false) {}
+
+	int roll();
+	void setExp(QString rollExp);
+	bool isValid() { return valid; }
+	QString getOriginal() { return original; }
+	QString getNormalized();
+	int getResult();
+
+private:
+	void process();
+
+private:
+	QList< QPair<int, bool> >	dice;  //die size/positive
+	QList<int>					rolls;
+	int							modifier;
+	QString						original;
+	bool						valid;
+};
+
+class RollLineEdit : public QLineEdit
+{
+public:
+	RollLineEdit();
+
+	int roll() { return roller.roll(); }
+	bool isValid() { return roller.isValid(); }
+	QString getOriginal() { return roller.getOriginal(); }
+	QString getNormalized() { return roller.getNormalized(); }
+	int getResult() { return roller.getResult(); }
+
+private slots:
+	void onValueChanged();
+
+private:
+	RollExpression	roller;
+	Q_OBJECT
+};
+
 #endif // GLOBAL_H

=== modified file 'src/mainwindow.cpp'
--- src/mainwindow.cpp	2012-12-02 15:58:52 +0000
+++ src/mainwindow.cpp	2013-10-03 04:04:27 +0000
@@ -249,6 +249,13 @@
 	toolBar->addAction(showPlayersWindowAction);
 	toolBar->addAction(activateManagerWindowAction);
 	toolBar->addAction(activateCharacterWindowAction);
+
+	toolBar = addToolBar(tr("Die Roller"));
+	toolBar->setObjectName(ASC("dieRollerToolBar"));
+	toolBar->setMovable(true);
+	toolBar->addWidget(rollExpEdit);
+	toolBar->addAction(rollButton);
+	toolBar->addWidget(rollResultLabel);
 }
 
 void MainWindow::createStatusBar()
@@ -475,6 +482,21 @@
 
 	setTempHPButton = createAction(ASC(":/images/temporary-hp32.png"), tr("Set Temporary HP"), ASC("Ctrl+P"), tr("Set Temporary HP to amount in the HP box, if larger than current value"));
 	connect(setTempHPButton, SIGNAL(triggered()), this, SLOT(onSetTempHP()));
+
+	rollExpEdit = new RollLineEdit();
+	rollExpEdit->setMaximumWidth(100);
+	connect(rollExpEdit, SIGNAL(textChanged(QString)), this, SLOT(onRollExpValueChanged()));
+	connect(rollExpEdit, SIGNAL(returnPressed()), this, SLOT(onRoll()));
+
+	rollButton = createAction(ASC(":/images/dice24.png"), tr("Roll"), ASC("Ctrl+Shift+R"), tr("Rolls the entered die expression and displays the results"));
+	rollButton->setEnabled(false);
+	connect(rollButton, SIGNAL(triggered()), this, SLOT(onRoll()));
+
+	rollResultLabel = new QLabel();
+	rollResultLabel->setMinimumWidth(75);
+	rollResultLabel->setMaximumWidth(75);
+	rollResultLabel->setAlignment(Qt::AlignCenter);
+	rollResultLabel->setStatusTip(tr("Displays the result of the roll"));
 }
 
 QSize TestFrame::sizeHint() const {
@@ -2023,6 +2045,22 @@
 	toggleSelectionButtons();
 }
 
+void MainWindow::onRollExpValueChanged()
+{
+	rollButton->setEnabled(rollExpEdit->isValid());
+}
+
+void MainWindow::onRoll()
+{
+	QString text;
+
+	text = ASC("<b><font size=6>");
+	if (rollExpEdit->isValid())
+		text += QString::number(rollExpEdit->roll());
+	text += ASC("</font></b>");
+	rollResultLabel->setText(text);
+}
+
 QAction* MainWindow::createAction(QString icon, QString text, QString scut, QString tip)
 {
 	QAction* action;

=== modified file 'src/mainwindow.h'
--- src/mainwindow.h	2012-10-28 21:56:42 +0000
+++ src/mainwindow.h	2013-10-03 04:04:27 +0000
@@ -173,6 +173,8 @@
 	void onSurge();
 	void onSetTempHP();
 	void onCreatureSelectionChanged();
+	void onRollExpValueChanged();
+	void onRoll();
 
 private:
 	QAction* createAction(QString icon, QString text, QString scut, QString tip);
@@ -242,6 +244,9 @@
 	QAction	*healButton;
 	QAction	*surgeButton;
 	QAction	*setTempHPButton;
+	RollLineEdit *rollExpEdit;
+	QAction *rollButton;
+	QLabel *rollResultLabel;
 
 	QAction *activateMainWindowAction;
 	QAction *activateManagerWindowAction;

=== modified file 'src/playerswindow.cpp'
--- src/playerswindow.cpp	2012-10-28 21:56:42 +0000
+++ src/playerswindow.cpp	2013-10-03 04:04:27 +0000
@@ -23,6 +23,7 @@
  */
 
 #include <QtGui>
+#include <math.h>
 
 #include "playerswindow.h"
 #include "global.h"
@@ -72,7 +73,7 @@
 
 QVariant PlayersListModel::data(const QModelIndex &index, int role) const
 {
-	int			idx;
+	int			idx, drawRow;
 	Creature	*creature;
 	bool		gray = false;
 
@@ -82,7 +83,14 @@
 	if (index.row() >= playersView.visibleCreatures.size() || index.column() >= columnCount())
 		return QVariant();
 
-	idx = playersView.visibleCreatures[index.row()];
+	drawRow = index.row();
+	if (rotatePlayerInitList) {
+		drawRow = index.row() + (getCurrentIndex() < 0 ? 0 : getCurrentIndex());
+		if (drawRow >= playersView.visibleCreatures.size())
+			drawRow -= playersView.visibleCreatures.size();
+	}
+
+	idx = playersView.visibleCreatures[drawRow];
 	creature = G_::encounter->getCreature(idx);
 	if (!creature)
 		return QVariant();
@@ -121,13 +129,19 @@
 	}
 	else if (role == Qt::ForegroundRole) {
 		if (gray)
-			return ASC("gray");
+			return Qt::gray;
+		if (isCurrentIndex(drawRow) && index.column() != HP_COLUMN &&
+			highlightCurrent && getHighlightCurrentColorBrightness() < 140) {
+			if (index.column() == NAME_COLUMN && !creature->isMonster())
+				return QColor(238,243,254);
+			return Qt::white;
+		}
 		if (index.column() == NAME_COLUMN && !creature->isMonster())
-			return ASC("blue");
+			return Qt::blue;
 	}
 	else if (role == Qt::DecorationRole) {
 		if (index.column() == NAME_COLUMN) {
-			if (isCurrentIndex(index.row()))
+			if (isCurrentIndex(drawRow))
 				return currentIcon;
 			else {
 				if (creature->isDelayed())
@@ -137,10 +151,12 @@
 				else if (creature->isHidden())
 					return hiddenIcon;
 				return emptyIcon;
-
 			}
 		}
 	}
+	else if (role == Qt::BackgroundColorRole)
+		if (isCurrentIndex(drawRow) && index.column() != HP_COLUMN && highlightCurrent)
+			return highlightCurrentColor;
 
 	return QVariant();
 }
@@ -237,6 +253,38 @@
 	return showDamageAndHeals;
 }
 
+void PlayersListModel::setHighlightCurrent(bool hc)
+{
+	if (highlightCurrent != hc) {
+		highlightCurrent = hc;
+		emit layoutChanged();
+	}
+}
+
+void PlayersListModel::setHighlightCurrentColor(QColor color)
+{
+	if (highlightCurrentColor != color) {
+		highlightCurrentColor = color;
+		emit layoutChanged();
+	}
+}
+
+int PlayersListModel::getHighlightCurrentColorBrightness() const
+{
+	int r, g, b, bright;
+	highlightCurrentColor.getRgb(&r, &g, &b);
+	bright = round(sqrt(.299 * r * r + .587 * g * g + .144 * b * b));
+	return bright;
+}
+
+void PlayersListModel::setRotatePlayerInitList(bool rl)
+{
+	if (rotatePlayerInitList != rl) {
+		rotatePlayerInitList = rl;
+		emit layoutChanged();
+	}
+}
+
 bool PlayersListModel::isCurrentIndex(int row) const
 {
 	EncounterState	state = G_::encounter->getState();
@@ -268,7 +316,7 @@
 	return is_current;
 }
 
-int PlayersListModel::getCurrentIndex()
+int PlayersListModel::getCurrentIndex() const
 {
 	for (int i=0; i<playersView.visibleCreatures.size(); i++) {
 		if (isCurrentIndex(i)) {
@@ -451,6 +499,12 @@
 	playersView->setFontSize(fsize);
 	bool dh = settings.value(ASC("playersWindow/showDamageAndHeals"), true).toBool();
 	playersList->setShowDamageAndHeals(dh);
+	bool hc = settings.value(ASC("playersWindow/highlightCurrent"), true).toBool();
+	playersList->setHighlightCurrent(hc);
+	QString hcc = settings.value(ASC("playersWindow/highlightCurrentColor"), QColor(Qt::darkGray).name()).toString();
+	playersList->setHighlightCurrentColor(QColor(hcc));
+	bool rl = settings.value(ASC("playersWindow/rotatePlayerInitList"), false).toBool();
+	playersList->setRotatePlayerInitList(rl);
 }
 
 PlayersWindow::~PlayersWindow()
@@ -461,6 +515,9 @@
 	settings.setValue(ASC("playersWindow/state"), saveState());
 	settings.setValue(ASC("playersWindow/fontSize"), playersView->getFontSize());
 	settings.setValue(ASC("playersWindow/showDamageAndHeals"), playersList->getShowDamageAndHeals());
+	settings.setValue(ASC("playersWindow/highlightCurrent"), playersList->getHighlightCurrent());
+	settings.setValue(ASC("playersWindow/highlightCurrentColor"), playersList->getHighlightCurrentColor().name());
+	settings.setValue(ASC("playersWindow/rotatePlayerInitList"), playersList->getRotatePlayerInitList());
 	if (this->isVisible())
 		hideEvent(NULL);
 }
@@ -514,31 +571,87 @@
 	// for QAbstractScrollArea and derived classes you would use:
 	// QPoint globalPos = myWidget->viewport()->mapToGlobal(pos); 
 	
-	QMenu myMenu;
+	bool hlOn = playersList->getHighlightCurrent();
+	QString hlColor = playersList->getHighlightCurrentColor().name();
+
+	QMenu myMenu, *highlightMenu;
+	highlightMenu = new QMenu(ASC("Highlight Current Turn"));
+
 	myMenu.addAction(showYourTurnAction);
 	myMenu.addAction(showLastKillAction);
 	myMenu.addAction(showTickerAction);
 
+	myMenu.addSeparator();
+
 	QAction	*damage_heals_action;
-	bool	dh;
-	if ((dh = playersList->getShowDamageAndHeals()))
-		damage_heals_action = myMenu.addAction(tr("Hide Damage and Heals"));
-	else
-		damage_heals_action = myMenu.addAction(tr("Show Damage and Heals"));
+	damage_heals_action = myMenu.addAction(tr("Show Damage and Heals"));
+	damage_heals_action->setCheckable(true);
+	damage_heals_action->setChecked(playersList->getShowDamageAndHeals());
 
 	QAction *font_size_action;
-	int		fsize;
-	if ((fsize = playersView->getFontSize()))
-		font_size_action = myMenu.addAction(tr("Scale Font Size"));
-	else
-		font_size_action = myMenu.addAction(tr("Fix Font Size)"));
-	// ...
-	
+	font_size_action = myMenu.addAction(tr("Fix Font Size"));
+	font_size_action->setCheckable(true);
+	font_size_action->setChecked(playersView->getFontSize());
+
+	myMenu.addMenu(highlightMenu);
+
+	QAction *highlight_disable;
+	highlight_disable = highlightMenu->addAction(tr("Off"));
+	highlight_disable->setCheckable(true);
+	highlight_disable->setChecked(!hlOn);
+
+	highlightMenu->addSeparator();
+
+	QAction *highlight_darkgray;
+	highlight_darkgray = highlightMenu->addAction(tr("Dark Gray"));
+	highlight_darkgray->setCheckable(true);
+	highlight_darkgray->setChecked(hlOn && hlColor == QColor(Qt::darkGray).name());
+
+	QAction *highlight_lightgreen;
+	highlight_lightgreen = highlightMenu->addAction(tr("Light Green"));
+	highlight_lightgreen->setCheckable(true);
+	highlight_lightgreen->setChecked(hlOn && hlColor == ASC("#aaffaa"));
+
+	QAction *highlight_lightyellow;
+	highlight_lightyellow = highlightMenu->addAction(tr("Light Yellow"));
+	highlight_lightyellow->setCheckable(true);
+	highlight_lightyellow->setChecked(hlOn && hlColor == ASC("#ffff80"));
+
+	QAction *highlight_yellow;
+	highlight_yellow = highlightMenu->addAction(tr("Yellow"));
+	highlight_yellow->setCheckable(true);
+	highlight_yellow->setChecked(hlOn && hlColor == QColor(Qt::yellow).name());
+
+	QAction *rotate_init_action;
+	rotate_init_action = myMenu.addAction(tr("Keep Current Turn on Top"));
+	rotate_init_action->setCheckable(true);
+	rotate_init_action->setChecked(playersList->getRotatePlayerInitList());
+
 	QAction* selected_item = myMenu.exec(globalPos);
 	if (selected_item == font_size_action)
-		playersView->setFontSize(fsize ? 0 : 1);
+		playersView->setFontSize(playersView->getFontSize() ? 0 : 1);
 	else if (selected_item == damage_heals_action)
-		playersList->setShowDamageAndHeals(!dh);
+		playersList->setShowDamageAndHeals(!(playersList->getShowDamageAndHeals()));
+	else if (selected_item == highlight_disable)
+		playersList->setHighlightCurrent(false);
+	else if (selected_item == highlight_darkgray) {
+		playersList->setHighlightCurrent(true);
+		playersList->setHighlightCurrentColor(QColor(Qt::darkGray));
+	}
+	else if (selected_item == highlight_lightgreen) {
+		playersList->setHighlightCurrent(true);
+		playersList->setHighlightCurrentColor(QColor("#aaffaa"));
+	}
+	else if (selected_item == highlight_lightyellow) {
+		playersList->setHighlightCurrent(true);
+		playersList->setHighlightCurrentColor(QColor("#ffff80"));
+	}
+	else if (selected_item == highlight_yellow) {
+		playersList->setHighlightCurrent(true);
+		playersList->setHighlightCurrentColor(QColor(Qt::yellow));
+	}
+	else if (selected_item == rotate_init_action)
+		playersList->toggleRotatePlayerInitList();
 }
 
 void PlayersWindow::drawYourTurnCreature(Creature *creature, QString state)

=== modified file 'src/playerswindow.h'
--- src/playerswindow.h	2012-10-28 21:56:42 +0000
+++ src/playerswindow.h	2013-10-03 04:04:27 +0000
@@ -72,10 +72,19 @@
 	QMap<int, Creature *> getDeadMonsters();
 	void setShowDamageAndHeals(bool dh);
 	bool getShowDamageAndHeals();
+	void setHighlightCurrent(bool hc);
+	void toggleHighlightCurrent() { setHighlightCurrent(!highlightCurrent); }
+	bool getHighlightCurrent() { return highlightCurrent; }
+	void setHighlightCurrentColor(QColor color);
+	QColor getHighlightCurrentColor() { return highlightCurrentColor; }
+	int getHighlightCurrentColorBrightness() const;
+	void setRotatePlayerInitList(bool rl);
+	void toggleRotatePlayerInitList() { setRotatePlayerInitList(!rotatePlayerInitList); }
+	bool getRotatePlayerInitList() { return rotatePlayerInitList; }
 
 private:
 	bool isCurrentIndex(int idx) const;
-	int getCurrentIndex();
+	int getCurrentIndex() const;
 	void refreshList();
 
 	PlayersView			*myView;
@@ -83,6 +92,9 @@
 	PlayersCreatureList	playersView;
 	Creature			*playerCurrentCreature;
 	bool				showDamageAndHeals;
+	bool				highlightCurrent;
+	QColor				highlightCurrentColor;
+	bool				rotatePlayerInitList;
 
 	QIcon		currentIcon;
 	QIcon		emptyIcon;
@@ -95,7 +107,7 @@
 
 class PlayersView : public QTableView
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	PlayersView(QWidget *parent = 0) :
 		QTableView(parent),
@@ -136,7 +148,7 @@
 
 class PlayersWindow : public QMainWindow, public WindowsAndDialogs
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	PlayersWindow(QWidget *parent = 0);
 	virtual ~PlayersWindow();
@@ -169,7 +181,7 @@
 
 class PlayersWidget : public QWidget
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	PlayersWidget(QWidget *parent = 0);
 	virtual ~PlayersWidget() { }
@@ -181,7 +193,7 @@
 };
 
 class YourTurnWidget : public PlayersWidget, public WindowsAndDialogs {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	YourTurnWidget(PlayersListModel *model, QWidget *parent = 0);
 	virtual ~YourTurnWidget();
@@ -209,7 +221,7 @@
 };
 
 class TickerWidget : public PlayersWidget, public WindowsAndDialogs {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	TickerWidget(QWidget *parent = 0);
 	virtual ~TickerWidget();
@@ -229,7 +241,7 @@
 };
 
 class LastKillWidget : public PlayersWidget, public WindowsAndDialogs {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	LastKillWidget(PlayersListModel *model, QWidget *parent = 0);
 	virtual ~LastKillWidget();