Add ERDAS ECW licence terms. New licence tab in about dialog

qgis · Aug 7, 2013 · f1ed4ae · f1ed4ae
1 parent ec7d4bf
commit f1ed4ae
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 2 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -20,7 +20,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
-SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
+SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENCE)
 
 INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

diff --git a/doc/LICENCE b/doc/LICENCE
diff --git a/ms-windows/Installer-Files/LICENSE.txt b/ms-windows/Installer-Files/LICENSE.txt
@@ -27,4 +27,43 @@
    obligated to do so. If you do not wish to do so, delete this exception
    statement from your version.
 
+        EULA TERMS FOR ERDAS ECW/JP2 DESKTOP READ-ONLY SDK DESKTOP
+
+1) You have acquired a product ("Product") that includes software licensed
+    from Intergraph Corporation (“Intergraph”).  Those installed software products
+    of Intergraph origin, as well as any associated media, printed materials, and
+    "online" or electronic documentation ("Software) are protected by copyright laws
+    and international copyright treaties. The Software is licensed, not sold.
+
+2) If You do not agree to this End User License Agreement ("EULA"), do not
+    use [or download] the Product. If you have paid consideration in return for
+    authorization to use the Product, promptly contact the person from whom You
+    received this Product for instructions on return of the unused Product(s) for
+    a refund. Any use of the Software, including but not limited to use of the
+    Product, will constitute Your agreement to this EULA (or ratification of any
+    previous consent).
+
+3) NO WARRANTIES FOR THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS" AND WITH
+    ALL FAULTS. THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE AND ACCURACY
+    IS WITH YOU. ALSO, THERE IS NO WARRANTY AGAINST INTERFERENCE WITH YOUR ENJOYMENT
+    OF THE SOFTWARE OR AGAINST INFRINGEMENT. IF YOU HAVE RECEIVED ANY WARRANTIES
+    REGARDING THE PRODUCT OR THE SOFTWARE, THOSE WARRANTIES DO NOT ORIGINATE FROM,
+    AND ARE NOT BINDING ON, INTERGRAPH.
+
+4) NO LIABILITY FOR CERTAIN DAMAGES. EXCEPT AS PROHIBITED BY LAW, INTERGRAPH
+    SHALL HAVE NO LIABILITY FOR ANY INDIRECT, SPECIAL, CONSEQUENTIAL OR INCIDENTAL
+    DAMAGES ARISING FROM OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE SOFTWARE.
+    THIS LIMITATION SHALL APPLY EVEN IF ANY REMEDY FAILS IN ITS ESSENTIAL PURPOSE.
+
+5) Prohibition of Reverse Engineering, Decompilation and Disassembly.You may not
+    reverse engineer, decompile, or disassemble the Software or modifying the Enhanced
+    Compressed Wavelet  (“ECW”) file format in any manner.
+
+6) Export Restrictions. You acknowledge that the Software, or any part thereof,
+    or any process or service that is the direct product of the Software is of U.S. origin.
+    You agree to comply with all applicable international and national laws that apply to
+    these products, including the U.S. Export Administration Regulations, as well as end-user,
+    end-use and destination restrictions and embargoes issued by U.S. and other governments
+    having jurisdiction.
+
 
diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp
@@ -188,6 +188,22 @@ void QgsAbout::init()
     QgsDebugMsg( QString( "translatorHTML:%1" ).arg( translatorHTML.toAscii().constData() ) );
   }
   setWhatsNew();
+  setLicence();
+}
+
+void QgsAbout::setLicence()
+{
+  // read the DONORS file and populate the text widget
+  QFile licenceFile( QgsApplication::licenceFilePath() );
+#ifdef QGISDEBUG
+  printf( "Reading licence file %s.............................................\n",
+          licenceFile.fileName().toLocal8Bit().constData() );
+#endif
+  if ( licenceFile.open( QIODevice::ReadOnly ) )
+  {
+      QString content = licenceFile.readAll();
+      txtLicense->setText(content);
+  }
 }
 
 void QgsAbout::setVersion( QString v )

diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h
@@ -30,6 +30,7 @@ class QgsAbout : public QDialog, private Ui::QgsAbout
 
   private:
     void setWhatsNew( );
+    void setLicence();
     void setPluginInfo();
     void init();
     void openUrl( QString url );

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -448,6 +448,14 @@ const QString QgsApplication::translatorsFilePath()
   return ABISYM( mPkgDataPath ) + QString( "/doc/TRANSLATORS" );
 }
 
+/*!
+  Returns the path to the licence file.
+*/
+const QString QgsApplication::licenceFilePath()
+{
+  return ABISYM( mPkgDataPath ) + QString( "/doc/LICENCE" );
+}
+
 /*!
   Returns the path to the help application.
 */

diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -92,6 +92,11 @@ class CORE_EXPORT QgsApplication: public QApplication
      */
     static const QString translatorsFilePath();
 
+    /*!
+      Returns the path to the licence file.
+    */
+    static const QString licenceFilePath();
+
     //! Returns the path to the help application.
     static const QString helpAppPath();
 

diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui
@@ -266,6 +266,16 @@ p, li { white-space: pre-wrap; }
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>License </string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0">
+        <widget class="QTextBrowser" name="txtLicense"/>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>
@@ -290,7 +300,6 @@ p, li { white-space: pre-wrap; }
  </tabstops>
  <resources>
   <include location="../../images/images.qrc"/>
-  <include location="../../images/images.qrc"/>
  </resources>
  <connections>
   <connection>