merge with dev

CMakeLists.txt

@@ -1,8 +1,8 @@
+cmake_minimum_required(VERSION 3.5)
+
+# Compiler id for Apple Clang
 if(APPLE)
-    cmake_minimum_required(VERSION 3.3)
     cmake_policy(SET CMP0025 NEW)
-else()
-    cmake_minimum_required(VERSION 2.8.8)
 endif()
 
 # Must stay before the project() command:

LICENSE.txt

@@ -1,6 +1,6 @@
     RawTherapee - A powerful, cross-platform raw image processing program.
     Copyright (C) 2004-2012 Gabor Horvath <hgabor@rawtherapee.com>
-    Copyright (C) 2010-2018 RawTherapee development team.
+    Copyright (C) 2010-2019 RawTherapee development team.
 
     RawTherapee is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

com.rawtherapee.RawTherapee.appdata.xml

@@ -26,6 +26,7 @@
         <keyword>pp3</keyword>
         <keyword>graphics</keyword>
     </keywords>
+    <content_rating type="oars-1.0" />
     <metadata_license>CC-BY-SA-4.0</metadata_license>
     <project_license>GPL-3.0+</project_license>
     <url type="bugtracker">https://github.com/Beep6581/RawTherapee/issues/new</url>
@@ -36,8 +37,8 @@
     <launchable type="desktop-id">rawtherapee.desktop</launchable>
     <releases>
         <release version="5.6" date="2019-04-20" type="stable"></release>
-        <release version="5.6-rc2" date="2019-04-17" type="development"></release>
-        <release version="5.6-rc1" date="2019-04-10" type="development"></release>
+        <release version="5.6~rc2" date="2019-04-17" type="development"></release>
+        <release version="5.6~rc1" date="2019-04-10" type="development"></release>
         <release version="5.5" date="2018-12-17" type="stable"></release>
     </releases>
     <provides>

rtgui/thumbbrowserbase.cc

@@ -788,7 +788,7 @@ bool ThumbBrowserBase::Internal::on_key_press_event (GdkEventKey* event)
 bool ThumbBrowserBase::Internal::on_button_press_event (GdkEventButton* event)
 {
     // Gtk signals automatically acquire the GUI (i.e. this method is enclosed by gdk_thread_enter and gdk_thread_leave)
-    //grab_focus ();
+    grab_focus ();
 
     parent->eventTime = event->time;