From 2fde81db52e4c6efc1d2e101cb9c3217378dbe9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anthony=20L=C3=A9onard?=
<anthony.leonard@savoirfairelinux.com>
Date: Mon, 17 Apr 2017 10:06:55 -0400
Subject: [PATCH] code cleanup in multiple files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Last changes were merged quickly without strict code-review
as it was needed to integrate them promptly.
Related modifications:
* callwidget.cpp: Removed unnecessary line feed
* callwidget.{cpp,ui}: Renamed “contactRequestView” to
“contactRequestPage” for consistency
* contactrequestwidget.cpp: Refactoring of a too-long line
* sendcontactrequestwidget.{cpp,ui}: Better placeholders
Moreover, contactrequestwidget.{cpp,ui} were missing the GPL
header and copyrights' years are now updated to 2017 in every
files.
Change-Id: Id52f340fc62340df6cf5bda8d782fefc732beabe
---
aboutdialog.cpp | 2 +-
aboutdialog.h | 2 +-
accountdetails.cpp | 2 +-
accountdetails.h | 2 +-
accountserializationadapter.cpp | 2 +-
accountserializationadapter.h | 2 +-
accountstatedelegate.cpp | 2 +-
accountstatedelegate.h | 2 +-
callutilsdialog.cpp | 2 +-
callutilsdialog.h | 2 +-
callwidget.cpp | 5 ++---
callwidget.h | 2 +-
callwidget.ui | 2 +-
combar.cpp | 2 +-
combar.h | 2 +-
configurationwidget.cpp | 2 +-
configurationwidget.h | 2 +-
contactmethodpicker.cpp | 2 +-
contactmethodpicker.h | 2 +-
contactpicker.cpp | 2 +-
contactpicker.h | 2 +-
contactrequestwidget.cpp | 22 +++++++++++++++++++++-
contactrequestwidget.h | 19 +++++++++++++++++++
currentaccountwidget.cpp | 2 +-
currentaccountwidget.h | 2 +-
globalsystemtray.cpp | 2 +-
globalsystemtray.h | 2 +-
idlabel.cpp | 2 +-
idlabel.h | 2 +-
imdelegate.cpp | 2 +-
imdelegate.h | 2 +-
instantmessagingwidget.cpp | 2 +-
instantmessagingwidget.h | 2 +-
main.cpp | 2 +-
mainwindow.cpp | 2 +-
mainwindow.h | 2 +-
navstack.cpp | 2 +-
navstack.h | 2 +-
navwidget.cpp | 2 +-
navwidget.h | 2 +-
pathpassworddialog.cpp | 2 +-
pathpassworddialog.h | 2 +-
photoboothdialog.cpp | 2 +-
photoboothdialog.h | 2 +-
pixbufmanipulator.cpp | 2 +-
pixbufmanipulator.h | 2 +-
qualitydialog.cpp | 2 +-
qualitydialog.h | 2 +-
ringbutton.cpp | 2 +-
ringbutton.h | 2 +-
ringcontactlineedit.cpp | 2 +-
ringcontactlineedit.h | 2 +-
ringthemeutils.h | 2 +-
selectareadialog.cpp | 2 +-
selectareadialog.h | 2 +-
sendcontactrequestwidget.cpp | 5 ++---
sendcontactrequestwidget.h | 2 +-
sendcontactrequestwidget.ui | 4 ++--
settingskey.h | 2 +-
shmclient.cpp | 2 +-
shmclient.h | 2 +-
smartlist.cpp | 2 +-
smartlist.h | 2 +-
smartlistdelegate.cpp | 2 +-
smartlistdelegate.h | 2 +-
stylesheet.css | 2 +-
utils.cpp | 2 +-
utils.h | 2 +-
videooverlay.cpp | 2 +-
videooverlay.h | 2 +-
videoview.cpp | 2 +-
videoview.h | 2 +-
videowidget.cpp | 2 +-
videowidget.h | 2 +-
windowscontactbackend.cpp | 2 +-
windowscontactbackend.h | 2 +-
wizarddialog.cpp | 2 +-
wizarddialog.h | 2 +-
78 files changed, 119 insertions(+), 82 deletions(-)
diff --git a/aboutdialog.cpp b/aboutdialog.cpp
index 306bb8f..3e69bf8 100644
--- a/aboutdialog.cpp
+++ b/aboutdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/aboutdialog.h b/aboutdialog.h
index 8ee8c3d..5969f7d 100644
--- a/aboutdialog.h
+++ b/aboutdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/accountdetails.cpp b/accountdetails.cpp
index 0ea405d..6960666 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/accountdetails.h b/accountdetails.h
index 7271f2e..f0262bb 100644
--- a/accountdetails.h
+++ b/accountdetails.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/accountserializationadapter.cpp b/accountserializationadapter.cpp
index 0eaa10f..a7d611f 100644
--- a/accountserializationadapter.cpp
+++ b/accountserializationadapter.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/accountserializationadapter.h b/accountserializationadapter.h
index e6b67c2..d4acfbd 100644
--- a/accountserializationadapter.h
+++ b/accountserializationadapter.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/accountstatedelegate.cpp b/accountstatedelegate.cpp
index aff6bb3..b64db0a 100644
--- a/accountstatedelegate.cpp
+++ b/accountstatedelegate.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/accountstatedelegate.h b/accountstatedelegate.h
index ae43c8f..9f135ad 100644
--- a/accountstatedelegate.h
+++ b/accountstatedelegate.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/callutilsdialog.cpp b/callutilsdialog.cpp
index f3c29b5..db2453b 100644
--- a/callutilsdialog.cpp
+++ b/callutilsdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/callutilsdialog.h b/callutilsdialog.h
index 98dc336..5da6643 100644
--- a/callutilsdialog.h
+++ b/callutilsdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/callwidget.cpp b/callwidget.cpp
index 0920293..51bca6d 100644
--- a/callwidget.cpp
+++ b/callwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
@@ -576,7 +576,7 @@ CallWidget::contactReqListCurrentChanged(const QModelIndex ¤tIdx, const QM
ContactRequest* cr = currentIdx.data((int)Ring::Role::Object).value<ContactRequest*>();
ui->contactRequestWidget->setCurrentContactRequest(cr);
- ui->stackedWidget->setCurrentWidget(ui->contactRequestView);
+ ui->stackedWidget->setCurrentWidget(ui->contactRequestPage);
}
void
@@ -856,7 +856,6 @@ CallWidget::contactLineEdit_registeredNameFound(Account* account,NameDirectory::
{
case NameDirectory::LookupStatus::SUCCESS:
{
-
uri = URI("ring:" + address);
qDebug() << "contactLineEdit username to search: " << username_to_lookup;
qDebug() << uri;
diff --git a/callwidget.h b/callwidget.h
index 374ad56..d9f11a3 100644
--- a/callwidget.h
+++ b/callwidget.h
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux *
+* Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
diff --git a/callwidget.ui b/callwidget.ui
index 437187e..fce54b3 100644
--- a/callwidget.ui
+++ b/callwidget.ui
@@ -1663,7 +1663,7 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="contactRequestView">
+ <widget class="QWidget" name="contactRequestPage">
<layout class="QVBoxLayout" name="verticalLayout_8">
<property name="leftMargin">
<number>5</number>
diff --git a/combar.cpp b/combar.cpp
index 73c8fd8..757f319 100644
--- a/combar.cpp
+++ b/combar.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/combar.h b/combar.h
index dd9a706..ca01889 100644
--- a/combar.h
+++ b/combar.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index 641ab3c..5137b19 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
diff --git a/configurationwidget.h b/configurationwidget.h
index 9dfae60..517d2a9 100644
--- a/configurationwidget.h
+++ b/configurationwidget.h
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux *
+* Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
diff --git a/contactmethodpicker.cpp b/contactmethodpicker.cpp
index 010475b..9d7d11a 100644
--- a/contactmethodpicker.cpp
+++ b/contactmethodpicker.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/contactmethodpicker.h b/contactmethodpicker.h
index fbebba7..489ab98 100644
--- a/contactmethodpicker.h
+++ b/contactmethodpicker.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/contactpicker.cpp b/contactpicker.cpp
index ff8b295..f4793a8 100644
--- a/contactpicker.cpp
+++ b/contactpicker.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/contactpicker.h b/contactpicker.h
index 0931ba6..1ad718e 100644
--- a/contactpicker.h
+++ b/contactpicker.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/contactrequestwidget.cpp b/contactrequestwidget.cpp
index 07d7ec4..b8cb31c 100644
--- a/contactrequestwidget.cpp
+++ b/contactrequestwidget.cpp
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
+ * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
+ * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
+ * *
+ * This program 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 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
+
#include "contactrequestwidget.h"
#include "ui_contactrequestwidget.h"
@@ -18,7 +37,8 @@ ContactRequestWidget::setCurrentContactRequest(ContactRequest *cr)
{
cr_ = cr;
if (cr_ != nullptr) {
- ui->remoteIdLabel->setText(QString("Current ContactRequest: %1").arg(QString::fromLocal8Bit(cr_->roleData(Qt::DisplayRole).value<QByteArray>())));
+ QString remoteId = QString::fromLocal8Bit(cr_->roleData(Qt::DisplayRole).value<QByteArray>());
+ ui->remoteIdLabel->setText(QString("Current ContactRequest: %1").arg(remoteId));
}
}
diff --git a/contactrequestwidget.h b/contactrequestwidget.h
index 41b3840..75da142 100644
--- a/contactrequestwidget.h
+++ b/contactrequestwidget.h
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
+ * Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
+ * Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
+ * *
+ * This program 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 3 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ **************************************************************************/
+
#ifndef CONTACTREQUESTWIDGET_H
#define CONTACTREQUESTWIDGET_H
diff --git a/currentaccountwidget.cpp b/currentaccountwidget.cpp
index 6cf1bd6..cfb1060 100644
--- a/currentaccountwidget.cpp
+++ b/currentaccountwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
* *
diff --git a/currentaccountwidget.h b/currentaccountwidget.h
index 88165c1..cc6ee6a 100644
--- a/currentaccountwidget.h
+++ b/currentaccountwidget.h
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux *
+* Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
* *
diff --git a/globalsystemtray.cpp b/globalsystemtray.cpp
index 2c61b84..54ba4dc 100644
--- a/globalsystemtray.cpp
+++ b/globalsystemtray.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/globalsystemtray.h b/globalsystemtray.h
index 53d1d6a..f74ef5c 100644
--- a/globalsystemtray.h
+++ b/globalsystemtray.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/idlabel.cpp b/idlabel.cpp
index 6ce42b2..8bb7e77 100644
--- a/idlabel.cpp
+++ b/idlabel.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/idlabel.h b/idlabel.h
index cd63fdd..70cfd6e 100644
--- a/idlabel.h
+++ b/idlabel.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/imdelegate.cpp b/imdelegate.cpp
index 054f4fc..db4f1e7 100644
--- a/imdelegate.cpp
+++ b/imdelegate.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/imdelegate.h b/imdelegate.h
index 7a1ba98..5a6151a 100644
--- a/imdelegate.h
+++ b/imdelegate.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/instantmessagingwidget.cpp b/instantmessagingwidget.cpp
index c4cb4f1..9cfef99 100644
--- a/instantmessagingwidget.cpp
+++ b/instantmessagingwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/instantmessagingwidget.h b/instantmessagingwidget.h
index ddbea73..6d5d3d4 100644
--- a/instantmessagingwidget.h
+++ b/instantmessagingwidget.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/main.cpp b/main.cpp
index f269fa8..362d22a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e05a432..01deade 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/mainwindow.h b/mainwindow.h
index 7eecdee..557dcdf 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/navstack.cpp b/navstack.cpp
index 2c79361..071c652 100644
--- a/navstack.cpp
+++ b/navstack.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/navstack.h b/navstack.h
index 23b4d1b..71b08c8 100644
--- a/navstack.h
+++ b/navstack.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/navwidget.cpp b/navwidget.cpp
index cb02c97..7ec947a 100644
--- a/navwidget.cpp
+++ b/navwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/navwidget.h b/navwidget.h
index 4471e31..80b6761 100644
--- a/navwidget.h
+++ b/navwidget.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/pathpassworddialog.cpp b/pathpassworddialog.cpp
index 8d4ddfa..a75344c 100644
--- a/pathpassworddialog.cpp
+++ b/pathpassworddialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/pathpassworddialog.h b/pathpassworddialog.h
index 1bb102a..7fa9e76 100644
--- a/pathpassworddialog.h
+++ b/pathpassworddialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/photoboothdialog.cpp b/photoboothdialog.cpp
index 826144f..6a804f3 100644
--- a/photoboothdialog.cpp
+++ b/photoboothdialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/photoboothdialog.h b/photoboothdialog.h
index 3c19492..9330f97 100644
--- a/photoboothdialog.h
+++ b/photoboothdialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/pixbufmanipulator.cpp b/pixbufmanipulator.cpp
index 0f341d4..0f774ad 100644
--- a/pixbufmanipulator.cpp
+++ b/pixbufmanipulator.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
diff --git a/pixbufmanipulator.h b/pixbufmanipulator.h
index d42237e..7ebc92b 100644
--- a/pixbufmanipulator.h
+++ b/pixbufmanipulator.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/qualitydialog.cpp b/qualitydialog.cpp
index 7859fe3..9be1531 100644
--- a/qualitydialog.cpp
+++ b/qualitydialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> *
* *
diff --git a/qualitydialog.h b/qualitydialog.h
index d6d596a..6408375 100644
--- a/qualitydialog.h
+++ b/qualitydialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/ringbutton.cpp b/ringbutton.cpp
index a4e4fcb..7d7b56c 100644
--- a/ringbutton.cpp
+++ b/ringbutton.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/ringbutton.h b/ringbutton.h
index 4ee0db9..547a6c8 100644
--- a/ringbutton.h
+++ b/ringbutton.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/ringcontactlineedit.cpp b/ringcontactlineedit.cpp
index e9f825f..f5e2b8d 100644
--- a/ringcontactlineedit.cpp
+++ b/ringcontactlineedit.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/ringcontactlineedit.h b/ringcontactlineedit.h
index 2d58783..84300a9 100644
--- a/ringcontactlineedit.h
+++ b/ringcontactlineedit.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/ringthemeutils.h b/ringthemeutils.h
index 76bb6f3..0f8c962 100644
--- a/ringthemeutils.h
+++ b/ringthemeutils.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/selectareadialog.cpp b/selectareadialog.cpp
index d2a75d5..7154cac 100644
--- a/selectareadialog.cpp
+++ b/selectareadialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/selectareadialog.h b/selectareadialog.h
index 4d3cf0d..8d53900 100644
--- a/selectareadialog.h
+++ b/selectareadialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/sendcontactrequestwidget.cpp b/sendcontactrequestwidget.cpp
index e9ae6cc..79d66cc 100644
--- a/sendcontactrequestwidget.cpp
+++ b/sendcontactrequestwidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
* *
@@ -32,8 +32,7 @@ SendContactRequestWidget::SendContactRequestWidget(QWidget *parent) :
ui(new Ui::SendContactRequestWidget)
{
ui->setupUi(this);
- ui->contactRequestInfo->setText("Contact Request Bruh!!!!\n");
- ui->peerContactID->setText("ContactID\n");
+ ui->peerContactID->setText("ContactID"); // TODO: Display RingID/Username
}
SendContactRequestWidget::~SendContactRequestWidget()
diff --git a/sendcontactrequestwidget.h b/sendcontactrequestwidget.h
index 9780791..d23788d 100644
--- a/sendcontactrequestwidget.h
+++ b/sendcontactrequestwidget.h
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux *
+* Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
* *
diff --git a/sendcontactrequestwidget.ui b/sendcontactrequestwidget.ui
index 6f06016..7a4182e 100644
--- a/sendcontactrequestwidget.ui
+++ b/sendcontactrequestwidget.ui
@@ -23,7 +23,7 @@
</size>
</property>
<property name="text">
- <string/>
+ <string>ContactID</string>
</property>
</widget>
</item>
@@ -36,7 +36,7 @@
</size>
</property>
<property name="text">
- <string/>
+ <string>TODO: Explain the purpose of a contact request</string>
</property>
</widget>
</item>
diff --git a/settingskey.h b/settingskey.h
index 11008fc..d09a91e 100644
--- a/settingskey.h
+++ b/settingskey.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/shmclient.cpp b/shmclient.cpp
index c175fb1..54dcca1 100644
--- a/shmclient.cpp
+++ b/shmclient.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/shmclient.h b/shmclient.h
index bfbae32..54d80d8 100644
--- a/shmclient.h
+++ b/shmclient.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2016 by Savoir-faire Linux *
+ * Copyright (C) 2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/smartlist.cpp b/smartlist.cpp
index f6bb5ff..cda019a 100644
--- a/smartlist.cpp
+++ b/smartlist.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
diff --git a/smartlist.h b/smartlist.h
index 1314950..1dfa915 100644
--- a/smartlist.h
+++ b/smartlist.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Jäger Nicolas <nicolas.jager@savoirfairelinux.com> *
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/smartlistdelegate.cpp b/smartlistdelegate.cpp
index 56ba2b6..fa4418e 100644
--- a/smartlistdelegate.cpp
+++ b/smartlistdelegate.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/smartlistdelegate.h b/smartlistdelegate.h
index 313a15e..718bd1a 100644
--- a/smartlistdelegate.h
+++ b/smartlistdelegate.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/stylesheet.css b/stylesheet.css
index 52ff700..25443df 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -288,7 +288,7 @@ QListView#contactView{
background: transparent;
}
-QWidget#messagingPage, QWidget#contactRequestView{
+QWidget#messagingPage, QWidget#contactRequestPage{
background: rgb(242, 242, 242);
}
diff --git a/utils.cpp b/utils.cpp
index 2f133b7..cc45a9f 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/utils.h b/utils.h
index 1ac3dfd..4698fef 100644
--- a/utils.h
+++ b/utils.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/videooverlay.cpp b/videooverlay.cpp
index 637279b..718d5fa 100644
--- a/videooverlay.cpp
+++ b/videooverlay.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/videooverlay.h b/videooverlay.h
index ec447d6..4b354ef 100644
--- a/videooverlay.h
+++ b/videooverlay.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/videoview.cpp b/videoview.cpp
index aa696f1..dda4bfb 100644
--- a/videoview.cpp
+++ b/videoview.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/videoview.h b/videoview.h
index 08f2a0f..5731dc0 100644
--- a/videoview.h
+++ b/videoview.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/videowidget.cpp b/videowidget.cpp
index b7ab005..29381ef 100644
--- a/videowidget.cpp
+++ b/videowidget.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/videowidget.h b/videowidget.h
index 662d11c..88246d5 100644
--- a/videowidget.h
+++ b/videowidget.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/windowscontactbackend.cpp b/windowscontactbackend.cpp
index 6d5b528..901a2dc 100644
--- a/windowscontactbackend.cpp
+++ b/windowscontactbackend.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/windowscontactbackend.h b/windowscontactbackend.h
index 4d0f7c3..5f99168 100644
--- a/windowscontactbackend.h
+++ b/windowscontactbackend.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* *
* This program is free software; you can redistribute it and/or modify *
diff --git a/wizarddialog.cpp b/wizarddialog.cpp
index 9777e11..e15510c 100644
--- a/wizarddialog.cpp
+++ b/wizarddialog.cpp
@@ -1,5 +1,5 @@
/**************************************************************************
- * Copyright (C) 2015-2016 by Savoir-faire Linux *
+ * Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
diff --git a/wizarddialog.h b/wizarddialog.h
index 67193c1..b6faa45 100644
--- a/wizarddialog.h
+++ b/wizarddialog.h
@@ -1,5 +1,5 @@
/**************************************************************************
-* Copyright (C) 2015-2016 by Savoir-faire Linux *
+* Copyright (C) 2015-2017 by Savoir-faire Linux *
* Author: Edric Ladent Milaret <edric.ladent-milaret@savoirfairelinux.com>*
* Author: Anthony Léonard <anthony.leonard@savoirfairelinux.com> *
* Author: Olivier Soldano <olivier.soldano@savoirfairelinux.com> *
--
GitLab