code cleaning + copyright update + i18n update

OpenBoard.pro

@@ -87,8 +87,7 @@ FORMS += resources/forms/mainWindow.ui \
    resources/forms/trapFlash.ui \
    resources/forms/youTubePublishingDialog.ui \
    resources/forms/capturePublishing.ui \
-   resources/forms/intranetPodcastPublishingDialog.ui \
-    resources/forms/webPublishing.ui
+   resources/forms/intranetPodcastPublishingDialog.ui
 
 UB_ETC.files = resources/etc
 UB_I18N.files = resources/i18n/*.qm
@@ -384,6 +383,12 @@ macx {
        TRANSLATION_mg.path = "$$RESOURCES_DIR/mg.lproj"
        QMAKE_BUNDLE_DATA += TRANSLATION_mg
    }
+   exists(resources/i18n/OpenBoard_gl.qm) {
+       TRANSLATION_gl.files = resources/i18n/OpenBoard_gl.qm \
+           resources/i18n/localizable.strings
+       TRANSLATION_gl.path = "$$RESOURCES_DIR/gl.lproj"
+       QMAKE_BUNDLE_DATA += TRANSLATION_gl
+   }
 
    QMAKE_BUNDLE_DATA += UB_ETC \
        UB_LIBRARY \
@@ -453,6 +458,7 @@ TRANSLATIONS = resources/i18n/OpenBoard_en.ts \
    resources/i18n/OpenBoard_el.ts \
    resources/i18n/OpenBoard_tr.ts \
    resources/i18n/OpenBoard_cs.ts \
+   resources/i18n/OpenBoard_gl.ts \
    resources/i18n/OpenBoard_mg.ts
 
 INSTALLS = UB_ETC \

resources/forms/webPublishing.ui

-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>documentPublishingDialog</class>
- <widget class="QDialog" name="documentPublishingDialog">
-  <property name="windowModality">
-   <enum>Qt::WindowModal</enum>
-  </property>
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>607</width>
-    <height>405</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <property name="fieldGrowthPolicy">
-      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-     </property>
-     <item row="0" column="0">
-      <widget class="QLabel" name="titleLabel">
-       <property name="text">
-        <string>Title</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="title">
-       <property name="maxLength">
-        <number>60</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_2">
-       <property name="text">
-        <string>E-mail</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="email"/>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Author</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="author"/>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="decriptionLabel">
-       <property name="text">
-        <string>Description</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
-      <widget class="QPlainTextEdit" name="description">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>168</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="1">
-      <spacer name="verticalSpacer">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>10</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="5" column="1">
-      <widget class="QCheckBox" name="attachPDF">
-       <property name="text">
-        <string>Attach Downloadable PDF Version</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QCheckBox" name="attachUBZ">
-       <property name="text">
-        <string>Attach Downloadable Uniboard File (UBZ)</string>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="1">
-      <widget class="QLabel" name="videoWarning">
-       <property name="text">
-        <string>Warning: This documents contains video, which will not be displayed properly on the Web</string>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="8" column="1">
-      <widget class="QDialogButtonBox" name="dialogButtons">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/adaptors/UBCFFSubsetAdaptor.h

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBExportCFF.cpp

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBExportCFF.h

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBExportDocumentSetAdaptor.cpp

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBExportDocumentSetAdaptor.h

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBImportCFF.cpp

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBImportCFF.h

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBImportDocumentSetAdaptor.cpp

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBImportDocumentSetAdaptor.h

 /*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
+ * Copyright (C) 2015-2018 Département de l'Instruction Publique (DIP-SEM)
  *
  * Copyright (C) 2013 Open Education Foundation
  *

src/adaptors/UBWebPublisher.cpp

-/*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
- *
- * Copyright (C) 2013 Open Education Foundation
- *
- * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
- * l'Education Numérique en Afrique (GIP ENA)
- *
- * This file is part of OpenBoard.
- *
- * OpenBoard is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * OpenBoard is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-
-#include "UBWebPublisher.h"
-
-#include "document/UBDocumentProxy.h"
-#include "document/UBDocumentController.h"
-
-#include "adaptors/publishing/UBDocumentPublisher.h"
-
-#include "core/memcheck.h"
-
-UBWebPublisher::UBWebPublisher(QObject *parent)
-    : UBExportAdaptor(parent)
-{
-    // NOOP
-}
-
-
-UBWebPublisher::~UBWebPublisher()
-{
-    // NOOP
-}
-
-
-QString UBWebPublisher::exportName()
-{
-    return tr("Publish Document on Sankore Web");
-}
-
-
-void UBWebPublisher::persist(UBDocumentProxy* pDocumentProxy)
-{
-    if (!pDocumentProxy)
-        return;
-
-    //UniboardSankoreTransition document;
-    QString documentPath(pDocumentProxy->persistencePath());
-    //document.checkDocumentDirectory(documentPath);
-
-    UBDocumentPublisher* publisher = new UBDocumentPublisher(pDocumentProxy, this); // the publisher will self delete when publication finishes
-    publisher->publish();
-
-}
-
-bool UBWebPublisher::associatedActionactionAvailableFor(const QModelIndex &selectedIndex)
-{
-    const UBDocumentTreeModel *docModel = qobject_cast<const UBDocumentTreeModel*>(selectedIndex.model());
-    if (!selectedIndex.isValid() || docModel->isCatalog(selectedIndex)) {
-        return false;
-    }
-
-    return true;
-}
-
-

src/adaptors/UBWebPublisher.h

-/*
- * Copyright (C) 2015-2016 Département de l'Instruction Publique (DIP-SEM)
- *
- * Copyright (C) 2013 Open Education Foundation
- *
- * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour
- * l'Education Numérique en Afrique (GIP ENA)
- *
- * This file is part of OpenBoard.
- *
- * OpenBoard is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * OpenBoard is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with OpenBoard. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef UBWEBPUBLISHER_H_
-#define UBWEBPUBLISHER_H_
-
-#include <QtGui>
-
-#include "UBExportAdaptor.h"
-
-#include "frameworks/UBFileSystemUtils.h"
-#include "ui_webPublishing.h"
-
-class UBDocumentProxy;
-class UBServerXMLHttpRequest;
-
-class UBWebPublisher : public UBExportAdaptor
-{
-    Q_OBJECT
-
-    public:
-        UBWebPublisher(QObject *parent = 0);
-        virtual ~UBWebPublisher();
-
-        virtual QString exportName();
-
-        virtual void persist(UBDocumentProxy* pDocument);
-
-        virtual bool associatedActionactionAvailableFor(const QModelIndex &selectedIndex);
-};
-
-
-#endif /* UBWEBPUBLISHER_H_ */