GeneralSettings: Remove references to protocolwidget.

The ProtocolWidget is now the Activitytab Widget

diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index 9a745e26aa88c55a8ceadd28122eb89955443573..288d4b1938f55a97da736f71ad2efd69fd41aa8b 100644 (file)
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -22,7 +22,6 @@
 #include "owncloudsetupwizard.h"
 #include "accountmanager.h"
 #include "synclogdialog.h"
-#include "protocolwidget.h"
 
 #include "updater/updater.h"
 #include "updater/ocupdater.h"
@@ -71,8 +70,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
     _ui->crashreporterCheckBox->setVisible(false);
 #endif
 
-    _protocolWidget = new ProtocolWidget;
-
     /* Set the left contents margin of the layout to zero to make the checkboxes
      * align properly vertically , fixes bug #3758
      */
@@ -88,7 +85,6 @@ GeneralSettings::GeneralSettings(QWidget *parent) :
 
     connect(_ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));
     connect(_ui->addAccountButton, SIGNAL(clicked()), SLOT(slotOpenAccountWizard()));
-    connect(_ui->openSyncLog, SIGNAL(clicked()), SLOT(slotOpenSyncLog()));
 
     connect(AccountManager::instance(), SIGNAL(accountAdded(AccountState*)),
             SLOT(slotAccountAddedOrRemoved()));
@@ -156,20 +152,6 @@ void GeneralSettings::slotToggleOptionalDesktopNotifications(bool enable)
     cfgFile.setOptionalDesktopNotifications(enable);
 }
 
-void GeneralSettings::slotOpenSyncLog()
-{
-    // the protocolwidget is connected to the ProgressDispatcher ot collect
-    // notifications also in case the logwindow is not visible. It is passed
-    // here to the LogDialog constructor which is not destroyed once created
-    // except in the destructor here.
-    if (_syncLogDialog.isNull()) {
-        _syncLogDialog = new SyncLogDialog(0, _protocolWidget);
-        _syncLogDialog->open();
-    } else {
-        ownCloudGui::raiseDialog(_syncLogDialog);
-    }
-}
-
 void GeneralSettings::slotIgnoreFilesEditor()
 {
     if (_ignoreEditor.isNull()) {

diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h
index d4ac27475f85b154860879605563dd23b5bb8256..aa28d115573ae61c65ccd70fb1203dfd04dba22c 100644 (file)
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -20,7 +20,6 @@
 namespace OCC {
 class IgnoreListEditor;
 class SyncLogDialog;
-class ProtocolWidget;
 
 namespace Ui {
 class GeneralSettings;
@@ -56,7 +55,6 @@ private:
     Ui::GeneralSettings *_ui;
     QPointer<IgnoreListEditor> _ignoreEditor;
     QPointer<SyncLogDialog> _syncLogDialog;
-    ProtocolWidget *_protocolWidget;
 };
 
 

diff --git a/src/gui/generalsettings.ui b/src/gui/generalsettings.ui
index 81750525adfd07d94fa2f7d2cb1b53c594a489d6..cf4ba97131259035401de09dbec886c1d35b659c 100644 (file)
--- a/src/gui/generalsettings.ui
+++ b/src/gui/generalsettings.ui
@@ -160,13 +160,6 @@
       </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
-         <widget class="QPushButton" name="openSyncLog">
-          <property name="text">
-           <string>&amp;Open Synclog</string>
-          </property>
-         </widget>
-        </item>
         <item>
          <spacer name="horizontalSpacer_5">
           <property name="orientation">
@@ -276,7 +269,6 @@
   <tabstop>newFolderLimitCheckBox</tabstop>
   <tabstop>newFolderLimitSpinBox</tabstop>
   <tabstop>crashreporterCheckBox</tabstop>
-  <tabstop>openSyncLog</tabstop>
   <tabstop>restartButton</tabstop>
  </tabstops>
  <resources/>