X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fbufferwidget.cpp;h=370ecdc4cb3344e23c4c8da428a2f312fa8af1e6;hp=8590f28cff7214dce9d1855dbd50445cccd6b6f7;hb=f3d6f8088d8be6af9319a99fb8d2fee2837b540a;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/qtui/bufferwidget.cpp b/src/qtui/bufferwidget.cpp
index 8590f28c..370ecdc4 100644
--- a/src/qtui/bufferwidget.cpp
+++ b/src/qtui/bufferwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,9 +15,10 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include <QIcon>
 #include <QLayout>
 #include <QKeyEvent>
 #include <QMenu>
@@ -32,7 +33,6 @@
 #include "chatviewsearchcontroller.h"
 #include "chatviewsettings.h"
 #include "client.h"
-#include "iconloader.h"
 #include "multilineedit.h"
 #include "qtui.h"
 #include "settings.h"
@@ -40,7 +40,8 @@
 BufferWidget::BufferWidget(QWidget *parent)
     : AbstractBufferContainer(parent),
     _chatViewSearchController(new ChatViewSearchController(this)),
-    _autoMarkerLine(true)
+    _autoMarkerLine(true),
+    _autoMarkerLineOnLostFocus(true)
 {
     ui.setupUi(this);
     layout()->setContentsMargins(0, 0, 0, 0);
@@ -76,16 +77,16 @@ BufferWidget::BufferWidget(QWidget *parent)
 
     Action *zoomInChatview = coll->add<Action>("ZoomInChatView", this, SLOT(zoomIn()));
     zoomInChatview->setText(tr("Zoom In"));
-    zoomInChatview->setIcon(SmallIcon("zoom-in"));
+    zoomInChatview->setIcon(QIcon::fromTheme("zoom-in"));
     zoomInChatview->setShortcut(QKeySequence::ZoomIn);
 
     Action *zoomOutChatview = coll->add<Action>("ZoomOutChatView", this, SLOT(zoomOut()));
-    zoomOutChatview->setIcon(SmallIcon("zoom-out"));
+    zoomOutChatview->setIcon(QIcon::fromTheme("zoom-out"));
     zoomOutChatview->setText(tr("Zoom Out"));
     zoomOutChatview->setShortcut(QKeySequence::ZoomOut);
 
     Action *zoomOriginalChatview = coll->add<Action>("ZoomOriginalChatView", this, SLOT(zoomOriginal()));
-    zoomOriginalChatview->setIcon(SmallIcon("zoom-original"));
+    zoomOriginalChatview->setIcon(QIcon::fromTheme("zoom-original"));
     zoomOriginalChatview->setText(tr("Actual Size"));
     //zoomOriginalChatview->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_0)); // used for RTS switching
 
@@ -99,6 +100,7 @@ BufferWidget::BufferWidget(QWidget *parent)
 
     ChatViewSettings s;
     s.initAndNotify("AutoMarkerLine", this, SLOT(setAutoMarkerLine(QVariant)), true);
+    s.initAndNotify("AutoMarkerLineOnLostFocus", this, SLOT(setAutoMarkerLineOnLostFocus(QVariant)), true);
 }
 
 
@@ -114,6 +116,11 @@ void BufferWidget::setAutoMarkerLine(const QVariant &v)
     _autoMarkerLine = v.toBool();
 }
 
+void BufferWidget::setAutoMarkerLineOnLostFocus(const QVariant &v)
+{
+    _autoMarkerLineOnLostFocus = v.toBool();
+}
+
 
 AbstractChatView *BufferWidget::createChatView(BufferId id)
 {
@@ -270,14 +277,14 @@ void BufferWidget::setMarkerLine(ChatView *view, bool allowGoingBack)
     if (lastLine) {
         QModelIndex idx = lastLine->index();
         MsgId msgId = idx.data(MessageModel::MsgIdRole).value<MsgId>();
+        BufferId bufId = view->scene()->singleBufferId();
 
         if (!allowGoingBack) {
-            BufferId bufId = view->scene()->singleBufferId();
             MsgId oldMsgId = Client::markerLine(bufId);
             if (oldMsgId.isValid() && msgId <= oldMsgId)
                 return;
         }
-        view->setMarkerLine(msgId);
+        Client::setMarkerLine(bufId, msgId);
     }
 }