Splitted KeeShare into secure and insecure parts

KeeShare is now supported in a secure and insecure flavor (set
CMake-Flags accordingly to allow or disallow the corresponding import
and exports)

src/gui/AboutDialog.cpp

@@ -88,8 +88,12 @@ AboutDialog::AboutDialog(QWidget* parent)
 #ifdef WITH_XC_SSHAGENT
     extensions += "\n- " + tr("SSH Agent");
 #endif
-#ifdef WITH_XC_KEESHARE
-    extensions += "\n- " + tr("KeeShare");
+#if defined(WITH_XC_KEESHARE_SECURE) && defined(WITH_XC_KEESHARE_INSECURE)
+    extensions += "\n- " + tr("KeeShare (secure and insecure sharing)");
+#elif defined(WITH_XC_KEESHARE_SECURE)
+    extensions += "\n- " + tr("KeeShare (secure sharing)");
+#elif defined(WITH_XC_KEESHARE_INSECURE)
+    extensions += "\n- " + tr("KeeShare (insecure sharing)");
 #endif
 #ifdef WITH_XC_YUBIKEY
     extensions += "\n- " + tr("YubiKey");

src/gui/DatabaseWidget.cpp

@@ -373,7 +373,7 @@ void DatabaseWidget::replaceDatabase(QSharedPointer<Database> db)
     connectDatabaseSignals();
     m_groupView->changeDatabase(m_db);
     processAutoOpen();
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
     KeeShare::instance()->connectDatabase(m_db, oldDb);
 #endif
 }

src/gui/EntryPreviewWidget.cpp

@@ -26,7 +26,7 @@
 #include "core/FilePath.h"
 #include "entry/EntryAttachmentsModel.h"
 #include "gui/Clipboard.h"
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
 #include "keeshare/KeeShare.h"
 #endif
 
@@ -107,7 +107,7 @@ void EntryPreviewWidget::setGroup(Group* selectedGroup)
     updateGroupGeneralTab();
     updateGroupNotesTab();
 
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
     updateGroupSharingTab();
 #endif
 
@@ -297,7 +297,7 @@ void EntryPreviewWidget::updateGroupNotesTab()
     m_ui->groupNotesEdit->setText(notes);
 }
 
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
 void EntryPreviewWidget::updateGroupSharingTab()
 {
     Q_ASSERT(m_currentGroup);

src/gui/EntryPreviewWidget.h

@@ -57,7 +57,7 @@ private slots:
     void updateGroupHeaderLine();
     void updateGroupGeneralTab();
     void updateGroupNotesTab();
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
     void updateGroupSharingTab();
 #endif
 

src/gui/MainWindow.cpp

@@ -43,7 +43,7 @@
 #include "sshagent/AgentSettingsPage.h"
 #include "sshagent/SSHAgent.h"
 #endif
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
 #include "keeshare/KeeShare.h"
 #include "keeshare/SettingsPageKeeShare.h"
 #endif
@@ -158,7 +158,7 @@ MainWindow::MainWindow()
     m_ui->settingsWidget->addSettingsPage(new AgentSettingsPage(m_ui->tabWidget));
 #endif
 
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
     KeeShare::init(this);
     m_ui->settingsWidget->addSettingsPage(new SettingsPageKeeShare(m_ui->tabWidget));
     connect(KeeShare::instance(), SIGNAL(sharingMessage(QString, MessageWidget::MessageType)),

src/gui/dbsettings/DatabaseSettingsDialog.cpp

@@ -25,7 +25,7 @@
 #ifdef WITH_XC_BROWSER
 #include "DatabaseSettingsWidgetBrowser.h"
 #endif
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
 #include "keeshare/DatabaseSettingsPageKeeShare.h"
 #endif
 
@@ -80,7 +80,7 @@ DatabaseSettingsDialog::DatabaseSettingsDialog(QWidget* parent)
     m_securityTabWidget->addTab(m_masterKeyWidget, tr("Master Key"));
     m_securityTabWidget->addTab(m_encryptionWidget, tr("Encryption Settings"));
 
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
     addSettingsPage(new DatabaseSettingsPageKeeShare());
 #endif
 

src/gui/group/EditGroupWidget.cpp

@@ -23,7 +23,7 @@
 #include "gui/EditWidgetIcons.h"
 #include "gui/EditWidgetProperties.h"
 
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
 #include "keeshare/group/EditGroupPageKeeShare.h"
 #endif
 
@@ -63,7 +63,7 @@ EditGroupWidget::EditGroupWidget(QWidget* parent)
 
     addPage(tr("Group"), FilePath::instance()->icon("actions", "document-edit"), m_editGroupWidgetMain);
     addPage(tr("Icon"), FilePath::instance()->icon("apps", "preferences-desktop-icons"), m_editGroupWidgetIcons);
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
     addEditPage(new EditGroupPageKeeShare(this));
 #endif
     addPage(tr("Properties"), FilePath::instance()->icon("actions", "document-properties"), m_editWidgetProperties);

src/gui/group/GroupModel.cpp

@@ -125,14 +125,14 @@ QVariant GroupModel::data(const QModelIndex& index, int role) const
 
     if (role == Qt::DisplayRole) {
         QString nameTemplate = tr("%1", "Template for name without annotation");
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
         nameTemplate = KeeShare::indicatorSuffix(group, nameTemplate);
 #endif
         return nameTemplate.arg(group->name());
     } else if (role == Qt::DecorationRole) {
         QPixmap pixmap = group->isExpired() ? databaseIcons()->iconPixmap(DatabaseIcons::ExpiredIconIndex)
                                             : group->iconScaledPixmap();
-#ifdef WITH_XC_KEESHARE
+#if defined(WITH_XC_KEESHARE)
         pixmap = KeeShare::indicatorBadge(group, pixmap);
 #endif
         return pixmap;