Skip to content

Commit

Permalink
updates for v1.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
luspi committed Jan 18, 2017
1 parent bcebb0f commit d77d233
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
Changelog PhotoQt v1.5 - Copyright (C) 2012-2017, Lukas Spies ([email protected]), License: GPLv2 (or later)
Changelog PhotoQt v1.5.1 - Copyright (C) 2011-2017, Lukas Spies ([email protected]), License: GPLv2 (or later)
----------------------------------------------------------------------------------------------------------


Release 1.5.1 - 17/01/2017
----------------------------
- Replace: Custom histogram drawing implementation (removal of QtCharts dependency)
- Remove: QtQuick.Window and QtQuick.Dialogs dependencies


Release 1.5 - 11/01/2017
----------------------------
- Add: new shortcuts handling, including mouse/touch gestures
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PROJECT(photoqt)
#### GLOBAL VERSION STRING FOR ALL FILES (INCLUDING CPP/QML) ####
##################################################################

ADD_DEFINITIONS(-DVERSION="1.5")
ADD_DEFINITIONS(-DVERSION="1.5.1")


##########################
Expand Down Expand Up @@ -66,9 +66,9 @@ FIND_PACKAGE(LibRaw)
FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/buildlang)
FILE(GLOB files "lang/*.ts")
FOREACH(file ${files})
GET_FILENAME_COMPONENT(filename ${file} NAME)
FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/lang/${filename} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/buildlang)
QT5_CREATE_TRANSLATION(qm_files ${photoqt_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/buildlang/${filename} OPTIONS "-no-obsolete")
# GET_FILENAME_COMPONENT(filename ${file} NAME)
# FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}/lang/${filename} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/buildlang)
# QT5_CREATE_TRANSLATION(qm_files ${photoqt_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/buildlang/${filename} OPTIONS "-no-obsolete")
ENDFOREACH()

# Copy the language QRC file to the output directory, because the files listed in the
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PhotoQt v1.5 - Copyright (C) 2012-2017, Lukas Spies ([email protected]),
PhotoQt v1.5.1 - Copyright (C) 2011-2017, Lukas Spies ([email protected]),
License: GPLv2 (or later) -- Website: http://photoqt.org
--------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# PhotoQt v1.5
__Copyright (C) 2012-2017, Lukas Spies ([email protected])
# PhotoQt v1.5.1
__Copyright (C) 2011-2017, Lukas Spies ([email protected])
License: GPLv2 (or later)
Website: http://photoqt.org__

Expand Down
2 changes: 1 addition & 1 deletion for_photoqt_desktop_FULL
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ Icon=photoqt
Type=Application
Terminal=false
Categories=Graphics;Viewer;
MimeType=image/bmp;image/x-bmp;image/x-ms-bmp;image/dds;image/x-dds;image/gif;image/tiff;image/jp2;image/jpx;image/jpeg;image/x-mng;image/vnd.microsoft.icon;image/x-icon;image/picon;image/png;image/x-portable-anymap;image/x-portable-graymap;image/x-xbitmap;image/x-portable-bitmap;image/pbm;image/x-xpixmap;image/x-portable-pixmap;image/svg+xml;image/svg-xml;image/svg;text/xml-svg;image/vnd.wap.wbmp;image/wbm;video/x-mng;image/fits;image/g3fax;image/mat;image/matlab;image/miff;image/x-mono-bitmap;image/x-otb;image/vnd.nokia.ota-bitmap;image/x-palm;image/pcd;image/x-photo-cd;image/pcx;image/vnd.swiftview-pcx;image/x-pc-paintbrush;image/x-pc-paintbrush;image/x-pcx;image/x-pict;image/x-pix;image/sfw;image/x-sgi;image/sgi;image/tga;image/x-tga;image/targa;image/x-targa;image/tim;image/vicar;image/x-viff;image/x-wpg;image/wpg;image/x-xwindowdump;image/xwd;image/x-xwd;application/x-stardent-avs;application/x-dr-halo-bitmap;application/x-mtv;application/vnd.palm;
MimeType=image/bmp;image/x-bmp;image/x-ms-bmp;image/dds;image/x-dds;image/gif;image/tiff;image/jp2;image/jpx;image/jpeg;image/x-mng;image/vnd.microsoft.icon;image/x-icon;image/picon;image/png;image/x-portable-anymap;image/x-portable-graymap;image/x-xbitmap;image/x-portable-bitmap;image/pbm;image/x-xpixmap;image/x-portable-pixmap;image/svg+xml;image/svg-xml;image/svg;text/xml-svg;image/vnd.wap.wbmp;image/wbm;video/x-mng;image/fits;image/g3fax;image/mat;image/matlab;image/miff;image/x-mono-bitmap;image/x-otb;image/vnd.nokia.ota-bitmap;image/x-palm;image/pcd;image/x-photo-cd;image/pcx;image/vnd.swiftview-pcx;image/x-pc-paintbrush;image/x-pcx;image/x-pict;image/x-pix;image/sfw;image/x-sgi;image/sgi;image/tga;image/x-tga;image/targa;image/x-targa;image/tim;image/vicar;image/x-viff;image/x-wpg;image/wpg;image/x-xwindowdump;image/xwd;image/x-xwd;application/x-stardent-avs;application/x-dr-halo-bitmap;application/x-mtv;application/vnd.palm;

0 comments on commit d77d233

Please sign in to comment.