Merge release 0.6.3

Author: dg0yt

CMakeLists.txt

@@ -35,7 +35,7 @@ set(Mapper_VERSION_MAJOR 0)
 set(Mapper_VERSION_MINOR 6)
 if(NOT Mapper_VERSION_PATCH)
 	# This can be configured when running cmake
-	set(Mapper_VERSION_PATCH 2)
+	set(Mapper_VERSION_PATCH 3)
 endif()
 
 set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")

INSTALL.md

@@ -72,7 +72,6 @@ The standard g++ compiler from a recent distribution should work. The Ubuntu
 PROJ.4 library and of CUPS are installed. For a Ubuntu or Debian system, install
 `libproj-dev` and `libcups2-dev`.
 
-To create a DEB package from CMake, fakeroot must be installed.
 For using the Qt libraries provided by the repositories, the following packages
 need to be installed:
 `qt5-default` (>= 5.2), `qttools5-dev`, `qttools5-dev-tools`, `libqt5sql5-sqlite`
@@ -91,14 +90,6 @@ Now you may start the build process by running
 make
 ```
 
-and generate a DEB package by
-
-```
-make deb
-```
-
-(The deb target works around some issues with CMake's DEB generator.)
-
 
 ## Compiling on OS X
 
@@ -142,7 +133,6 @@ and proceed with
 
 ```
 make
-make package
 ```
 
 
@@ -214,23 +204,16 @@ cmake .. -DCMAKE_BUILD_TYPE=Release
 make
 ```
 
-The actual package maybe built by `make package`. However, this is used
+The actual package may be built by `make package`. However, this is used
 (i.e. tested) only for OS X at the moment.
+Android packages are built in Qt Creator using the provided `oo-mapper.pro` file.
 Windows and Linux packages are regularly build on
-https://build.opensuse.org/project/show/home:dg0yt, so package recipes for
-common distributions can be found there.
-
-
-#Speeding up with parallel build jobs
-
-The build can make use of multiple processor cores. Add the option
-
-```
--jN
-```
+https://build.opensuse.org/project/show/home:dg0yt, so proper package recipes for
+common distributions and package managers can be found there.
 
-to the call to make (or mingw32-make), where N is the number of cores
-to be used.
+Packaging with cmake is not enabled by default for Linux. Add `-DMapper_BUILD_PACKAGE=1`
+to change this. As already stated, this is untested, and you might need to look for
+additional tweaks.
 
 
 ## Making a source package

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.2" android:versionCode="2" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.3" android:versionCode="3" package="org.openorienteering.mapper" android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.openorienteering.mapper.MapperActivity"

images/mapper-icon/Mapper-large.psd

@@ -0,0 +1,4 @@
+There are two Photoshop files for the icons, one for large sized icons and one for small sizes.
+Due to having a few different effects on them the icons where made in PS. The main parts are vector and should be fine to scale up if needed (the large icon is 512px now).
+
+The Photoshop files are licensed under Creative Commons Attribution 4.0 International Licenses.

images/mapper-icon/Mapper-small.psd

@@ -1,4 +1,4 @@
 # Generated in CMakeLists.txt, do not edit here.
 Mapper_VERSION_MAJOR = 0
 Mapper_VERSION_MINOR = 6
-Mapper_VERSION_PATCH = 2
+Mapper_VERSION_PATCH = 3

images/mapper-icon/README.txt

@@ -440,6 +440,8 @@ install(TARGETS Mapper
 
 if(Mapper_BUILD_QT)
 	write_qt_conf()
+elseif(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/qt.conf")
+	file(REMOVE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf")
 endif()
 
 

oo-mapper-version.pri

@@ -370,12 +370,12 @@ void ColorWidget::addRow(int row)
 	item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
 	item->setToolTip(tr("Click to select the name and click again to edit."));
 
-	react_to_changes = true;
-	
 	// Opacity
 	item = color_table->item(row, 6);
 	item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
 
+	react_to_changes = true;
+	
 	updateRow(row);
 }
 
@@ -384,10 +384,11 @@ void ColorWidget::updateRow(int row)
 	react_to_changes = false;
 
 	const MapColor* color = map->getColor(row);
+	auto color_with_opacity = colorWithOpacity(*color);
 
 	// Color preview
 	QTableWidgetItem* item = color_table->item(row, 0);
-	item->setBackground((const QColor&) *color);
+	item->setBackground(color_with_opacity);
 
 	// Name
 	item = color_table->item(row, 1);
@@ -399,7 +400,7 @@ void ColorWidget::updateRow(int row)
 	switch (color->getSpotColorMethod())
 	{
 		case MapColor::SpotColor:
-			item->setData(Qt::DecorationRole, (const QColor&)*color);
+			item->setData(Qt::DecorationRole, color_with_opacity);
 			break;
 		default:
 			item->setData(Qt::DecorationRole, QColor(Qt::transparent));
@@ -422,7 +423,7 @@ void ColorWidget::updateRow(int row)
 			break;
 		default:
 			item->setForeground(palette().color(QPalette::Active, QPalette::Text));
-			item->setData(Qt::DecorationRole, (QColor)(color->getCmyk()));
+			item->setData(Qt::DecorationRole, colorWithOpacity(color->getCmyk(), color->getOpacity()));
 	}
 
 	// RGB
@@ -438,7 +439,7 @@ void ColorWidget::updateRow(int row)
 			break;
 		default:
 			item->setForeground(palette().color(QPalette::Active, QPalette::Text));
-			item->setData(Qt::DecorationRole, (const QColor&)(color->getRgb()));
+			item->setData(Qt::DecorationRole, colorWithOpacity(color->getRgb(), color->getOpacity()));
 	}
 
 	// Knockout

src/CMakeLists.txt

@@ -498,6 +498,21 @@ class MapColorMap
 };
 
 
+/**
+ * Constructs a QColor with the alpha given by opacity from the prototype c.
+ * 
+ * A QColor object must be constructible from c.
+ */
+template <class T>
+QColor colorWithOpacity(T c, float opacity);
+
+/**
+ * Constructs a QColor with opacity from the given MapColor.
+ */
+QColor colorWithOpacity(const MapColor& c);
+
+
+
 // ### MapColorCmyk inline code ###
 
 inline
@@ -851,5 +866,19 @@ const MapColor* & MapColorMap::operator[](const MapColor* key)
 	return mapping[key];
 }
 
+template <class T>
+QColor colorWithOpacity(T c, float opacity)
+{
+	auto color = static_cast<QColor>(c);
+	color.setAlphaF(opacity);
+	return color;
+}
+
+inline
+QColor colorWithOpacity(const MapColor& c)
+{
+	return colorWithOpacity(static_cast<const QColor&>(c), c.getOpacity());
+}
+
 
 #endif