final 34.11 version (22.0)

splintermind · Jul 16, 2014 · c140b0e · c140b0e
1 parent 7993a14
commit c140b0e
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 39 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+### Version 22.0 Patch Notes
+
+***
+
+- overhauled role calculations to allow side by side role comparison and better labor optimization (Thistleknot)
+- updated the labor optimizer to use the new role calculations. this also has the benefit that the optimization plan priorities are now correctly enforced (ie. higher priority is always assigned jobs first)
+- gridview sorting now persists between all views with the same 'group by' set. for example every view grouped by caste will maintain the same sorting, every view grouped by migration wave a distinct sorting, etc.
+- role cells in the gridviews show the related labors and if they're active or pending a change. the related labor is determined by finding the labors associated with the role's skills.
+
 ### Version 21.8 Patch Notes
 
 ***

diff --git a/Makefile b/Makefile
@@ -1,16 +1,16 @@
 #############################################################################
 # Makefile for building: DwarfTherapist
-# Generated by qmake (3.0) (Qt 5.1.1) on: Wed Jul 16 11:33:12 2014
+# Generated by qmake (3.0) (Qt 5.1.1) on: Wed Jul 16 15:17:41 2014
 # Project:  dwarftherapist.pro
 # Template: app
-# Command: Z:\Qt\5.1.1\mingw48_32\bin\qmake.exe -spec win32-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile dwarftherapist.pro
+# Command: Z:\Qt\5.1.1\mingw48_32\bin\qmake.exe -spec win32-g++ -o Makefile dwarftherapist.pro
 #############################################################################
 
 MAKEFILE      = Makefile
 
-first: debug
-install: debug-install
-uninstall: debug-uninstall
+first: release
+install: release-install
+uninstall: release-uninstall
 QMAKE         = Z:\Qt\5.1.1\mingw48_32\bin\qmake.exe
 DEL_FILE      = del
 CHK_DIR_EXISTS= if not exist
@@ -26,24 +26,10 @@ SYMLINK       = copy /y
 DEL_DIR       = rmdir
 MOVE          = move
 SUBTARGETS    =  \
-		debug \
-		release
+		release \
+		debug
 
 
-debug: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug
-debug-make_first: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug 
-debug-all: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug all
-debug-clean: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug clean
-debug-distclean: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug distclean
-debug-install: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug install
-debug-uninstall: FORCE
-	$(MAKE) -f $(MAKEFILE).Debug uninstall
 release: FORCE
 	$(MAKE) -f $(MAKEFILE).Release
 release-make_first: FORCE
@@ -58,6 +44,20 @@ release-install: FORCE
 	$(MAKE) -f $(MAKEFILE).Release install
 release-uninstall: FORCE
 	$(MAKE) -f $(MAKEFILE).Release uninstall
+debug: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug
+debug-make_first: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug 
+debug-all: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug all
+debug-clean: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug clean
+debug-distclean: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug distclean
+debug-install: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug install
+debug-uninstall: FORCE
+	$(MAKE) -f $(MAKEFILE).Debug uninstall
 
 Makefile: dwarftherapist.pro ../../Qt/5.1.1/mingw48_32/mkspecs/win32-g++/qmake.conf ../../Qt/5.1.1/mingw48_32/mkspecs/features/spec_pre.prf \
 		../../Qt/5.1.1/mingw48_32/mkspecs/qdevice.pri \
@@ -111,8 +111,6 @@ Makefile: dwarftherapist.pro ../../Qt/5.1.1/mingw48_32/mkspecs/win32-g++/qmake.c
 		../../Qt/5.1.1/mingw48_32/mkspecs/features/win32/default_pre.prf \
 		../../Qt/5.1.1/mingw48_32/mkspecs/features/resolve_config.prf \
 		../../Qt/5.1.1/mingw48_32/mkspecs/features/default_post.prf \
-		../../Qt/5.1.1/mingw48_32/mkspecs/features/qml_debug.prf \
-		../../Qt/5.1.1/mingw48_32/mkspecs/features/declarative_debug.prf \
 		../../Qt/5.1.1/mingw48_32/mkspecs/features/win32/rtti.prf \
 		../../Qt/5.1.1/mingw48_32/mkspecs/features/warn_on.prf \
 		../../Qt/5.1.1/mingw48_32/mkspecs/features/qt.prf \
@@ -131,7 +129,7 @@ Makefile: dwarftherapist.pro ../../Qt/5.1.1/mingw48_32/mkspecs/win32-g++/qmake.c
 		Z:/Qt/5.1.1/mingw48_32/lib/Qt5Network.prl \
 		Z:/Qt/5.1.1/mingw48_32/lib/Qt5Gui.prl \
 		Z:/Qt/5.1.1/mingw48_32/lib/Qt5Core.prl
-	$(QMAKE) -spec win32-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile dwarftherapist.pro
+	$(QMAKE) -spec win32-g++ -o Makefile dwarftherapist.pro
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\spec_pre.prf:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\qdevice.pri:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\device_config.prf:
@@ -184,8 +182,6 @@ Makefile: dwarftherapist.pro ../../Qt/5.1.1/mingw48_32/mkspecs/win32-g++/qmake.c
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\win32\default_pre.prf:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\resolve_config.prf:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\default_post.prf:
-..\..\Qt\5.1.1\mingw48_32\mkspecs\features\qml_debug.prf:
-..\..\Qt\5.1.1\mingw48_32\mkspecs\features\declarative_debug.prf:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\win32\rtti.prf:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\warn_on.prf:
 ..\..\Qt\5.1.1\mingw48_32\mkspecs\features\qt.prf:
@@ -205,30 +201,30 @@ Z:/Qt/5.1.1/mingw48_32/lib/Qt5Network.prl:
 Z:/Qt/5.1.1/mingw48_32/lib/Qt5Gui.prl:
 Z:/Qt/5.1.1/mingw48_32/lib/Qt5Core.prl:
 qmake: FORCE
-	@$(QMAKE) -spec win32-g++ CONFIG+=debug CONFIG+=declarative_debug CONFIG+=qml_debug -o Makefile dwarftherapist.pro
+	@$(QMAKE) -spec win32-g++ -o Makefile dwarftherapist.pro
 
 qmake_all: FORCE
 
-make_first: debug-make_first release-make_first FORCE
-all: debug-all release-all FORCE
-clean: debug-clean release-clean FORCE
-distclean: debug-distclean release-distclean FORCE
+make_first: release-make_first debug-make_first FORCE
+all: release-all debug-all FORCE
+clean: release-clean debug-clean FORCE
+distclean: release-distclean debug-distclean FORCE
 	-$(DEL_FILE) Makefile
 
-debug-mocclean:
-	$(MAKE) -f $(MAKEFILE).Debug mocclean
 release-mocclean:
 	$(MAKE) -f $(MAKEFILE).Release mocclean
-mocclean: debug-mocclean release-mocclean
+debug-mocclean:
+	$(MAKE) -f $(MAKEFILE).Debug mocclean
+mocclean: release-mocclean debug-mocclean
 
-debug-mocables:
-	$(MAKE) -f $(MAKEFILE).Debug mocables
 release-mocables:
 	$(MAKE) -f $(MAKEFILE).Release mocables
-mocables: debug-mocables release-mocables
+debug-mocables:
+	$(MAKE) -f $(MAKEFILE).Debug mocables
+mocables: release-mocables debug-mocables
 
 check: first
 FORCE:
 
-$(MAKEFILE).Debug: Makefile
 $(MAKEFILE).Release: Makefile
+$(MAKEFILE).Debug: Makefile
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
@@ -32,7 +32,7 @@ AboutDialog::AboutDialog(MainWindow *parent)
 	, m_version(Version())
 {
 	ui->setupUi(this);
-    ui->lbl_our_version->setText(QString("VERSION %1 - BRANCH VERSION %2").arg(m_version.to_string()).arg("22.0 BETA-8"));
+    ui->lbl_our_version->setText(QString("VERSION %1 - BRANCH VERSION %2").arg(m_version.to_string()).arg("22.0"));
     connect(ui->pb_check_version, SIGNAL(clicked()), SLOT(check_version()));
 }