Changeset 809b5e5 for src/gui

Timestamp:

08/30/17 20:38:27 (5 years ago)

Author:

gregor herrmann <gregor@…>

Branches:

master, qt5

Children:

79a7671

Parents:

ebe26af (diff), e27a3f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into qt5

Location:

src/gui

Files:

• about.ui (modified) (1 diff)
• conferenceeditor.cpp (modified) (1 diff)
• conferenceeditor.h (modified) (1 diff)
• conflictdialogcontainer.cpp (modified) (1 diff)
• conflictdialogcontainer.h (modified) (1 diff)
• conflictsdialog.cpp (modified) (1 diff)
• conflictsdialog.h (modified) (1 diff)
• daynavigatorwidget.cpp (modified) (1 diff)
• daynavigatorwidget.h (modified) (1 diff)
• dayviewtabcontainer.cpp (modified) (1 diff)
• dayviewtabcontainer.h (modified) (1 diff)
• errormessage.cpp (modified) (1 diff)
• errormessage.h (modified) (1 diff)
• eventdialog.cpp (modified) (5 diffs)
• eventdialog.h (modified) (2 diffs)
• eventdialog.ui (modified) (1 diff)
• favtabcontainer.cpp (modified) (1 diff)
• favtabcontainer.h (modified) (1 diff)
• mainwindow.cpp (modified) (9 diffs)
• mainwindow.h (modified) (3 diffs)
• roomstabcontainer.cpp (modified) (1 diff)
• roomstabcontainer.h (modified) (1 diff)
• searchhead.cpp (modified) (1 diff)
• searchhead.h (modified) (1 diff)
• searchtabcontainer.cpp (modified) (1 diff)
• searchtabcontainer.h (modified) (1 diff)
• settingsdialog.cpp (modified) (1 diff)
• settingsdialog.h (modified) (1 diff)
• tabcontainer.cpp (modified) (1 diff)
• tabcontainer.h (modified) (1 diff)
• trackstabcontainer.cpp (modified) (1 diff)
• trackstabcontainer.h (modified) (1 diff)
• urlinputdialog.cpp (modified) (1 diff)
• urlinputdialog.h (modified) (1 diff)

src/gui/about.ui

@@ -138 +138 @@
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ConfClerk 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; either version 2, or (at your option) any later version.</p>
 <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ConfClerk 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.</p>
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2015 Philipp Spitzer &amp;amp; gregor herrmann &amp;amp; Stefan Strahl&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2017 Philipp Spitzer &amp;amp; gregor herrmann &amp;amp; Stefan Strahl&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="textFormat">

src/gui/conferenceeditor.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/conferenceeditor.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/conflictdialogcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/conflictdialogcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/conflictsdialog.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/conflictsdialog.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/daynavigatorwidget.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/daynavigatorwidget.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/dayviewtabcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/dayviewtabcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/errormessage.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/errormessage.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/eventdialog.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
@@ -49 +49 @@
     // abstract
     info += QString("<h2>%1</h2>\n").arg(tr("Abstract"));
-    info += Qt::convertFromPlainText(event.abstract(), Qt::WhiteSpaceNormal);
+    if (Qt::mightBeRichText(event.abstract())) {
+        info += event.abstract();
+    } else {
+        info += Qt::convertFromPlainText(event.abstract(), Qt::WhiteSpaceNormal);
+    }
 
     // description
     info += QString("<h2>%1</h2>\n").arg(tr("Description"));
-    info += Qt::convertFromPlainText(event.description(), Qt::WhiteSpaceNormal);
+    if (Qt::mightBeRichText(event.description())) {
+        info += event.description();
+    } else {
+        info += Qt::convertFromPlainText(event.description(), Qt::WhiteSpaceNormal);
+    }
 
     // links
@@ -81 +89 @@
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
 
-    if(event.isFavourite())
-    {
-        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
-    }
+    updateFavouriteButton(event);
 
     if(event.hasAlarm())
@@ -95 +100 @@
 {
     Event event = Event::getById(mEventId, mConferenceId);
+    event.cycleFavourite();
+    event.update("favourite");
+    updateFavouriteButton(event);
 
+    // 'conflicts' list may have changed
     QList<Event> conflicts = Event::conflictEvents(event.id(), mConferenceId);
-    if(event.isFavourite())
-    {
-        event.setFavourite(false);
-        favouriteButton->setIcon(QIcon(":/icons/favourite-off.png"));
-    }
-    else
-    {
-        event.setFavourite(true);
-        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
-    }
-    event.update("favourite");
-
-    if(event.isFavourite())
-    {
-        // event has became 'favourite' and so 'conflicts' list may have changed
-        conflicts = Event::conflictEvents(event.id(), mConferenceId);
-    }
 
     // have to emit 'eventChanged' signal on all events in conflict
@@ -155 +147 @@
 }
 
+
+void EventDialog::updateFavouriteButton(const Event& event) {
+    switch (event.favourite()) {
+        case Favourite_no: favouriteButton->setIcon(QIcon(":/icons/favourite-no.png")); break;
+        case Favourite_weak: favouriteButton->setIcon(QIcon(":/icons/favourite-weak.png")); break;
+        case Favourite_strong: favouriteButton->setIcon(QIcon(":/icons/favourite-strong.png")); break;
+    }
+}
+

src/gui/eventdialog.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
@@ -39 +39 @@
     int mConferenceId;
     int mEventId;
+    void updateFavouriteButton(const Event& event);
 };
 

src/gui/eventdialog.ui

@@ -60 +60 @@
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/favourite-off.png</normaloff>:/icons/favourite-off.png</iconset>
+         <normaloff>:/icons/favourite-no.png</normaloff>:/icons/favourite-no.png</iconset>
        </property>
        <property name="iconSize">

src/gui/favtabcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/favtabcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/mainwindow.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
@@ -25 +25 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QSslConfiguration>
 
 #include "sqlengine.h"
@@ -131 +132 @@
     }
 
+    connect(mNetworkAccessManager, SIGNAL(sslErrors(QNetworkReply*, QList<QSslError>)), SLOT(sslErrors(QNetworkReply*, QList<QSslError>)));
     connect(mNetworkAccessManager, SIGNAL(finished(QNetworkReply*)), SLOT(networkQueryFinished(QNetworkReply*)));
     connect(mXmlParser, SIGNAL(parsingScheduleBegin()), conferenceModel, SLOT(newConferenceBegin()));
@@ -270 +272 @@
     systemTrayIcon->show();
     // The next two lines are to prevent a very strange position of the message box the first time at X11/aweseome (not Win32/XP)
-    systemTrayIcon->showMessage("ConfClerk", "Your upcoming events", QSystemTrayIcon::Information);
+    systemTrayIcon->showMessage("ConfClerk", tr("Your upcoming events"), QSystemTrayIcon::Information);
     qApp->processEvents();
     systemTrayIcon->showMessage(title, message, QSystemTrayIcon::Information, 60*60*24*1000);
@@ -309 +311 @@
         // end of optimization
         // initTabs();
-    } catch (OrmException& e) {
+    } catch (const OrmException& e) {
+        qDebug() << "OrmException:" << e.text();
         // cannon set an active conference
         unsetConference();   // TODO: as no active conference is now correctly managed this should be handled as a fatal error
@@ -404 +407 @@
     try {
         initTabs();
-    } catch (OrmException) {
+    } catch (const OrmException& e) {
+        qDebug() << "OrmException:" << e.text();
         clearTabs();
+    }
+}
+
+void MainWindow::sslErrors(QNetworkReply *aReply, const QList<QSslError> &errors) {
+    QString errorString;
+    foreach (const QSslError &error, errors) {
+        if (!errorString.isEmpty()) {
+            errorString += ", ";
+        }
+        errorString += error.errorString();
+    }
+
+    if (QMessageBox::warning(
+                this,
+                tr("SSL errors"),
+                tr("One or more SSL errors have occurred: %1", 0, errors.size()).arg(errorString),
+                QMessageBox::Ignore | QMessageBox::Cancel) == QMessageBox::Ignore) {
+        aReply->ignoreSslErrors();
+    } else {
+        aReply->abort();
     }
 }
@@ -411 +435 @@
 void MainWindow::networkQueryFinished(QNetworkReply *aReply) {
     if (aReply->error() != QNetworkReply::NoError) {
-        error_message(QString("Error occured during download: ") + aReply->errorString());
+        error_message(tr("Error occurred during download: %1").arg(aReply->errorString()));
     } else {
         QUrl redirectUrl = aReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
@@ -419 +443 @@
                 return; // don't enable controls
             } else {
-                error_message(QString("Error: Cyclic redirection from %1 to itself.").arg(redirectUrl.toString()));
+                error_message(tr("Error: Cyclic redirection from %1 to itself.").arg(redirectUrl.toString()));
             }
         } else {
@@ -436 +460 @@
 {
     QNetworkRequest request;
+    QSslConfiguration qSslConfiguration = request.sslConfiguration();
+    qSslConfiguration.setProtocol(QSsl::AnyProtocol);
+    qSslConfiguration.setPeerVerifyMode(QSslSocket::QueryPeer);
     request.setUrl(QUrl(url));
+    request.setSslConfiguration(qSslConfiguration);
     request.setAttribute(QNetworkRequest::User, conferenceId);
 

src/gui/mainwindow.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
@@ -22 +22 @@
 
 #include <QtWidgets>
+#include <QSslError>
 
 #include "ui_mainwindow.h"
@@ -52 +53 @@
     void onSearchResultChanged();
 
+    void sslErrors(QNetworkReply*,const QList<QSslError> &errors);
     void networkQueryFinished(QNetworkReply*);
     void importFromNetwork(const QString&, int conferenceId);

src/gui/roomstabcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/roomstabcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/searchhead.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/searchhead.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/searchtabcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/searchtabcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/settingsdialog.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/settingsdialog.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/tabcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/tabcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/trackstabcontainer.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/trackstabcontainer.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/urlinputdialog.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.

src/gui/urlinputdialog.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2015 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.