change license to GPL2 and list license and third-party components in…

… "About" page
rabauke · Oct 2, 2023 · 9ab6129 · 9ab6129
1 parent de88780
commit 9ab6129
Show file tree

Hide file tree

Showing 8 changed files with 505 additions and 50 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,6 +58,7 @@ set(QML_FILES
     qml/pages/MainPage.qml
     qml/pages/About.qml
     qml/cover/CoverPage.qml
+    qml/components/ThirdPartyComponent.qml
     )
 
 set(TS_FILES

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -4,6 +4,9 @@
 
 Raw View is a simple image viewer application for Sailfish OS with support for common raw image formats as used by digital cameras. It displays the embedded preview of the raw image and also shows image acquisition conditions such as used camera and lens, aperture, shutter speed and iso. Standard image formats such as jpeg are supported as well.
 
+## License
+
+Raw view is distributed under the GNU General Public License v2.0 or any later version.
 
 ## Screenshots
 

diff --git a/qml/components/ThirdPartyComponent.qml b/qml/components/ThirdPartyComponent.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.2
+import Sailfish.Silica 1.0
+
+Item {
+    property string componnet: ''
+    property string version: ''
+    property string license: ''
+    property string url: ''
+
+    width: parent.width
+    height: label1.height + label2.height + Theme.paddingLarge
+
+    Label {
+        id: label1
+        x: Theme.horizontalPageMargin
+        width: parent.width - 2 * Theme.horizontalPageMargin
+        text: componnet + (version !== '' ? ' ' + qsTr('version') + ' ' + version : '')
+        color: Theme.primaryColor
+        font.pixelSize: Theme.fontSizeMedium
+    }
+    Label {
+        id: label2
+        x: Theme.horizontalPageMargin
+        width: parent.width - 2 * Theme.horizontalPageMargin
+        anchors.top: label1.bottom
+        text: qsTr('license') + ': ' + license + '<br>' + qsTr('url') + ': <a href=\"' + url + '\">' + url + '</a>'
+        color: Theme.secondaryColor
+        font.pixelSize: Theme.fontSizeSmall
+        textFormat: Text.StyledText
+        linkColor: Theme.secondaryColor
+        onLinkActivated: {
+            Qt.openUrlExternally(link)
+        }
+    }
+}
diff --git a/qml/pages/About.qml b/qml/pages/About.qml
@@ -1,5 +1,6 @@
 import QtQuick 2.2
 import Sailfish.Silica 1.0
+import '../components'
 
 Page {
     id: about_page
@@ -12,36 +13,85 @@ Page {
             id: column
 
             width: parent.width
-            spacing: Theme.paddingMedium
+            spacing: 0
             PageHeader {
-                title: "Raw View v" + appModel.version
+                title: 'Raw View v' + appModel.version
             }
-            Text {
+            Label {
                 x: Theme.horizontalPageMargin
                 width: column.width - 2 * x
                 color: Theme.primaryColor
                 wrapMode: TextEdit.Wrap
                 font.pixelSize: Theme.fontSizeMedium
-                horizontalAlignment: TextEdit.AlignJustify
-                text: qsTr("_description_")
-                textFormat: Text.StyledText
-                linkColor: Theme.highlightColor
-                onLinkActivated: {
-                    Qt.openUrlExternally(link)
-                }
+                text: qsTr('_description_')
+            }
+            SectionHeader {
+                text: qsTr('Copyright')
             }
             Label {
-                text: "<br>© Heiko Bauke, 2023<br><br>Fork me on github!<br><a href=\"https://github.com/rabauke/harbour-raw-view\">https://github.com/rabauke/harbour-raw-view</a>"
-                textFormat: Text.StyledText
-                width: column.width
+                x: Theme.horizontalPageMargin
+                width: column.width - 2 * x
                 color: Theme.primaryColor
-                linkColor: Theme.highlightColor
                 wrapMode: TextEdit.Wrap
-                font.pixelSize: Theme.fontSizeSmall
-                horizontalAlignment: TextEdit.AlignHCenter
+                font.pixelSize: Theme.fontSizeMedium
+                text: '© Heiko Bauke, 2023'
+            }
+            SectionHeader {
+                text: qsTr('License')
+            }
+            Label {
+                x: Theme.horizontalPageMargin
+                width: column.width - 2 * x
+                color: Theme.primaryColor
+                wrapMode: TextEdit.Wrap
+                font.pixelSize: Theme.fontSizeMedium
+                text: 'GNU General Public License v2.0 or any later version'
+            }
+            Label {
+                x: Theme.horizontalPageMargin
+                width: column.width - 2 * x
+                color: Theme.primaryColor
+                wrapMode: TextEdit.Wrap
+                font.pixelSize: Theme.fontSizeMedium
+                textFormat: Text.StyledText
+                linkColor: Theme.highlightColor
                 onLinkActivated: {
                     Qt.openUrlExternally(link)
                 }
+                text: '<br>Fork me on <a href=\"https://github.com/rabauke/harbour-raw-view\">github</a>!'
+            }
+            SectionHeader {
+                text: qsTr('External components')
+            }
+            ThirdPartyComponent {
+                componnet: 'LibRaw'
+                version: '0.21.1'
+                license: 'CDDL-1.0, LGPL-2.1-only'
+                url: 'https://github.com/LibRaw/LibRaw'
+            }
+            ThirdPartyComponent {
+                componnet: 'Exiv2 C++ library'
+                version: '0.28.0'
+                license: 'GPL-2.0-only'
+                url: 'https://github.com/Exiv2/exiv2'
+            }
+            ThirdPartyComponent {
+                componnet: 'Qt'
+                version: '5.6.3'
+                license: 'LGPL-2.1-only, GPL-2.0-only'
+                url: 'https://www.qt.io'
+            }
+            ThirdPartyComponent {
+                componnet: 'Sailfish Silica UI'
+                version: '2.0'
+                license: 'BSD-3-Clause, proprietary'
+                url: 'https://sailfishos.org'
+            }
+            ThirdPartyComponent {
+                componnet: 'Libsailfishapp'
+                version: '1.2.13'
+                license: 'LGPL-2.1-only'
+                url: 'https://github.com/sailfishos/libsailfishapp'
             }
         }
     }

diff --git a/rpm/harbour-raw-view.spec b/rpm/harbour-raw-view.spec
@@ -3,7 +3,7 @@ Name:       harbour-raw-view
 Summary:    Raw View image viewer
 Version:    0.4.0
 Release:    1
-License:    BSD
+License:    GPL-2.0-or-later
 URL:        https://github.com/rabauke/harbour-raw-view
 Source0:    %{name}-%{version}.tar.bz2
 Requires:   sailfishsilica-qt5 >= 0.10.9

diff --git a/translations/harbour-raw-view-de.ts b/translations/harbour-raw-view-de.ts
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="de_DE">
 <context>
     <name>About</name>
     <message>
         <source>_description_</source>
         <translation>Bildbetrachter mit Unterstützung von Rohformat-Bildern für Sailfish OS.</translation>
     </message>
+    <message>
+        <source>Copyright</source>
+        <translation>Copyright</translation>
+    </message>
+    <message>
+        <source>License</source>
+        <translation>Lizenz</translation>
+    </message>
+    <message>
+        <source>External components</source>
+        <translation>Externe Komponenten</translation>
+    </message>
 </context>
 <context>
     <name>CoverPage</name>
@@ -62,4 +74,19 @@
         <translation>Schnellauswahl</translation>
     </message>
 </context>
+<context>
+    <name>ThirdPartyComponent</name>
+    <message>
+        <source>version</source>
+        <translation>Version</translation>
+    </message>
+    <message>
+        <source>license</source>
+        <translation>Lizenz</translation>
+    </message>
+    <message>
+        <source>url</source>
+        <translation>URL</translation>
+    </message>
+</context>
 </TS>
diff --git a/translations/harbour-raw-view.ts b/translations/harbour-raw-view.ts
@@ -7,6 +7,18 @@
         <source>_description_</source>
         <translation>Image viewer with raw-format support for Sailfish OS.</translation>
     </message>
+    <message>
+        <source>Copyright</source>
+        <translation>Copyright</translation>
+    </message>
+    <message>
+        <source>License</source>
+        <translation>License</translation>
+    </message>
+    <message>
+        <source>External components</source>
+        <translation>External components</translation>
+    </message>
 </context>
 <context>
     <name>CoverPage</name>
@@ -27,23 +39,23 @@
     </message>
     <message>
         <source>%1&quot;</source>
-        <translation></translation>
+        <translation>%1&quot;</translation>
     </message>
     <message>
         <source>1/%1&quot;</source>
-        <translation></translation>
+        <translation>1/%1&quot;</translation>
     </message>
     <message>
         <source>unknown camera</source>
-        <translation></translation>
+        <translation>unknown camera</translation>
     </message>
     <message>
         <source>Hide image information</source>
-        <translation></translation>
+        <translation>Hide image information</translation>
     </message>
     <message>
         <source>Show image information</source>
-        <translation></translation>
+        <translation>Show image information</translation>
     </message>
     <message>
         <source>About Raw View</source>
@@ -62,4 +74,19 @@
         <translation>Quick selection</translation>
     </message>
 </context>
+<context>
+    <name>ThirdPartyComponent</name>
+    <message>
+        <source>version</source>
+        <translation>version</translation>
+    </message>
+    <message>
+        <source>license</source>
+        <translation>license</translation>
+    </message>
+    <message>
+        <source>url</source>
+        <translation>url</translation>
+    </message>
+</context>
 </TS>