X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=39199d39395e692dca4b7ecdb0d0640557370c9f;hp=bf7cda34a82c98b3d5d1296cedb8701582fd9800;hb=e49189fdfac6eadbe0f4a5f46dc43c1585e847f6;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index bf7cda34..39199d39 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -62,6 +62,8 @@
 #include "clientbufferviewconfig.h"
 #include "clientbufferviewmanager.h"
 #include "clientignorelistmanager.h"
+#include "clienttransfer.h"
+#include "clienttransfermanager.h"
 #include "coreconfigwizard.h"
 #include "coreconnectdlg.h"
 #include "coreconnection.h"
@@ -83,6 +85,7 @@
 #include "qtuimessageprocessor.h"
 #include "qtuisettings.h"
 #include "qtuistyle.h"
+#include "receivefiledlg.h"
 #include "settingsdlg.h"
 #include "settingspagedlg.h"
 #include "statusnotifieritem.h"
@@ -94,6 +97,9 @@
 #  ifdef HAVE_PHONON
 #    include "phononnotificationbackend.h"
 #  endif
+#  ifdef HAVE_LIBSNORE
+#    include "snorenotificationbackend.h"
+#  endif
 #  include "systraynotificationbackend.h"
 #  include "taskbarnotificationbackend.h"
 #else /* HAVE_KDE */
@@ -112,6 +118,10 @@
   #include "osxnotificationbackend.h"
 #endif
 
+#ifdef HAVE_DBUS
+  #include "dockmanagernotificationbackend.h"
+#endif
+
 #include "settingspages/aliasessettingspage.h"
 #include "settingspages/appearancesettingspage.h"
 #include "settingspages/backlogsettingspage.h"
@@ -208,7 +218,9 @@ void MainWin::init()
 #  ifdef HAVE_PHONON
     QtUi::registerNotificationBackend(new PhononNotificationBackend(this));
 #  endif
-#  ifndef QT_NO_SYSTEMTRAYICON
+#  ifdef HAVE_LIBSNORE
+    QtUi::registerNotificationBackend(new SnoreNotificationBackend(this));
+#  elif !defined(QT_NO_SYSTEMTRAYICON)
     QtUi::registerNotificationBackend(new SystrayNotificationBackend(this));
 #  endif
 
@@ -226,6 +238,10 @@ void MainWin::init()
     QtUi::registerNotificationBackend(new OSXNotificationBackend(this));
 #endif
 
+#ifdef HAVE_DBUS
+    QtUi::registerNotificationBackend(new DockManagerNotificationBackend(this));
+#endif
+
     // we assume that at this point, all configurable actions are defined!
     QtUi::loadShortcuts();
 
@@ -306,7 +322,9 @@ void MainWin::restoreStateFromSettings(UiSettings &s)
     move(_normalPos);
 #endif
 
-    if (s.value("MainWinHidden").toBool() && QtUi::haveSystemTray())
+    if ((Quassel::isOptionSet("hidewindow")
+            || s.value("MainWinHidden").toBool())
+            && _systemTray->isSystemTrayAvailable())
         QtUi::hideMainWidget();
     else if (s.value("MainWinMinimized").toBool())
         showMinimized();
@@ -370,13 +388,13 @@ void MainWin::setupActions()
             0, 0))->setCheckable(true);
 
 #ifdef HAVE_KDE
-    QAction *fullScreenAct = KStandardAction::fullScreen(this, SLOT(toggleFullscreen()), this, coll);
+    QAction *fullScreenAct = KStandardAction::fullScreen(this, SLOT(onFullScreenToggled()), this, coll);
 #else
     QAction *fullScreenAct = new Action(SmallIcon("view-fullscreen"), tr("&Full Screen Mode"), coll,
-        this, SLOT(toggleFullscreen()), QKeySequence(Qt::Key_F11));
+        this, SLOT(onFullScreenToggled()), QKeySequence(Qt::Key_F11));
     fullScreenAct->setCheckable(true);
 #endif
-    coll->addAction("ToggleFullscreen", fullScreenAct);
+    coll->addAction("ToggleFullScreen", fullScreenAct);
 
     // Settings
     QAction *configureShortcutsAct = new Action(SmallIcon("configure-shortcuts"), tr("Configure &Shortcuts..."), coll,
@@ -642,7 +660,7 @@ void MainWin::removeBufferView(int bufferViewConfigId)
 
 void MainWin::bufferViewToggled(bool enabled)
 {
-    if (!enabled && !isVisible()) {
+    if (!enabled && !isMinimized()) {
         // hiding the mainwindow triggers a toggle of the bufferview (which pretty much sucks big time)
         // since this isn't our fault and we can't do anything about it, we suppress the resulting calls
         return;
@@ -905,7 +923,7 @@ void MainWin::setupTopicWidget()
 void MainWin::setupViewMenuTail()
 {
     _viewMenu->addSeparator();
-    _viewMenu->addAction(QtUi::actionCollection("General")->action("ToggleFullscreen"));
+    _viewMenu->addAction(QtUi::actionCollection("General")->action("ToggleFullScreen"));
 }
 
 
@@ -997,8 +1015,24 @@ void MainWin::setupToolBars()
 
     QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar);
     _toolbarMenu->addAction(_mainToolBar->toggleViewAction());
+
+#ifndef HAVE_KDE
+    QtUiSettings uiSettings;
+
+    bool visible = uiSettings.value("ShowMainToolBar", QVariant(true)).toBool();
+    _mainToolBar->setVisible(visible);
+    connect(_mainToolBar, SIGNAL(visibilityChanged(bool)), this, SLOT(saveMainToolBarStatus(bool)));
+#endif
 }
 
+#ifndef HAVE_KDE
+void MainWin::saveMainToolBarStatus(bool enabled)
+{
+    QtUiSettings uiSettings;
+    uiSettings.setValue("ShowMainToolBar", enabled);
+}
+#endif
+
 
 void MainWin::connectedToCore()
 {
@@ -1007,6 +1041,8 @@ void MainWin::connectedToCore()
     connect(Client::bufferViewManager(), SIGNAL(bufferViewConfigDeleted(int)), this, SLOT(removeBufferView(int)));
     connect(Client::bufferViewManager(), SIGNAL(initDone()), this, SLOT(loadLayout()));
 
+    connect(Client::transferManager(), SIGNAL(transferAdded(const ClientTransfer*)), SLOT(showNewTransferDlg(const ClientTransfer*)));
+
     setConnectedState();
 }
 
@@ -1343,12 +1379,31 @@ void MainWin::showShortcutsDlg()
 }
 
 
-void MainWin::toggleFullscreen()
+void MainWin::showNewTransferDlg(const ClientTransfer *transfer)
 {
-    if (isFullScreen())
-        showNormal();
+    ReceiveFileDlg *dlg = new ReceiveFileDlg(transfer, this);
+    dlg->show();
+}
+
+
+void MainWin::onFullScreenToggled()
+{
+    // Relying on QWidget::isFullScreen is discouraged, see the KToggleFullScreenAction docs
+    // Also, one should not use showFullScreen() or showNormal(), as those reset all other window flags
+
+    QAction *action = QtUi::actionCollection("General")->action("ToggleFullScreen");
+    if (!action)
+        return;
+
+#ifdef HAVE_KDE
+    KToggleFullScreenAction *kAct = static_cast<KToggleFullScreenAction *>(action);
+    kAct->setFullScreen(this, kAct->isChecked());
+#else
+    if (action->isChecked())
+        setWindowState(windowState() | Qt::WindowFullScreen);
     else
-        showFullScreen();
+        setWindowState(windowState() & ~Qt::WindowFullScreen);
+#endif
 }
 
 
@@ -1356,10 +1411,19 @@ void MainWin::toggleFullscreen()
 
 bool MainWin::event(QEvent *event)
 {
-    if (event->type() == QEvent::WindowActivate) {
-        BufferId buffer = Client::bufferModel()->currentBuffer();
-        if (buffer.isValid())
-            Client::instance()->markBufferAsRead(buffer);
+    switch(event->type()) {
+    case QEvent::WindowActivate: {
+        BufferId bufferId = Client::bufferModel()->currentBuffer();
+        if (bufferId.isValid())
+            Client::instance()->markBufferAsRead(bufferId);
+        break;
+    }
+    case QEvent::WindowDeactivate:
+        if (bufferWidget()->autoMarkerLineOnLostFocus())
+            bufferWidget()->setMarkerLine();
+        break;
+    default:
+        break;
     }
     return QMainWindow::event(event);
 }