diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f48ac6f4..f13231586 100644 --- a/CMakeLists.txt +++ b/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: diff --git a/LICENSE.txt b/LICENSE.txt index 7fb1c6515..0aa0df7c8 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ RawTherapee - A powerful, cross-platform raw image processing program. Copyright (C) 2004-2012 Gabor Horvath - 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 diff --git a/com.rawtherapee.RawTherapee.appdata.xml b/com.rawtherapee.RawTherapee.appdata.xml index 32cfe30c7..a53ccbf06 100644 --- a/com.rawtherapee.RawTherapee.appdata.xml +++ b/com.rawtherapee.RawTherapee.appdata.xml @@ -26,6 +26,7 @@ pp3 graphics + CC-BY-SA-4.0 GPL-3.0+ https://github.com/Beep6581/RawTherapee/issues/new @@ -36,8 +37,8 @@ rawtherapee.desktop - - + + diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index fd7032931..334f00e51 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/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;