/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "inputwidget.h"
+#include <QIcon>
+
#include "action.h"
#include "actioncollection.h"
#include "bufferview.h"
#include "client.h"
-#include "iconloader.h"
#include "ircuser.h"
#include "networkmodel.h"
#include "qtui.h"
ui.inputEdit->setMode(MultiLineEdit::MultiLine);
ui.inputEdit->setPasteProtectionEnabled(true);
- ui.boldButton->setIcon(SmallIcon("format-text-bold"));
- ui.italicButton->setIcon(SmallIcon("format-text-italic"));
- ui.underlineButton->setIcon(SmallIcon("format-text-underline"));
- ui.textcolorButton->setIcon(SmallIcon("format-text-color"));
- ui.highlightcolorButton->setIcon(SmallIcon("format-fill-color"));
+ ui.boldButton->setIcon(QIcon::fromTheme("format-text-bold"));
+ ui.italicButton->setIcon(QIcon::fromTheme("format-text-italic"));
+ ui.underlineButton->setIcon(QIcon::fromTheme("format-text-underline"));
+ ui.textcolorButton->setIcon(QIcon::fromTheme("format-text-color"));
+ ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color"));
ui.encryptionIconLabel->hide();
_colorMenu = new QMenu();
UiSettings s("InputWidget");
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
s.notify("EnableSpellCheck", this, SLOT(setEnableSpellCheck(QVariant)));
setEnableSpellCheck(s.value("EnableSpellCheck", false));
#endif
setShowStyleButtons(s.value("ShowStyleButtons", true));
s.notify("EnablePerChatHistory", this, SLOT(setEnablePerChatHistory(QVariant)));
- setEnablePerChatHistory(s.value("EnablePerChatHistory", false));
+ setEnablePerChatHistory(s.value("EnablePerChatHistory", true));
s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
setMaxLines(s.value("MaxNumLines", 5));
setScrollBarsEnabled(s.value("EnableScrollBars", true));
s.notify("EnableLineWrap", this, SLOT(setLineWrapEnabled(QVariant)));
- setLineWrapEnabled(s.value("EnableLineWrap", false));
+ setLineWrapEnabled(s.value("EnableLineWrap", true));
s.notify("EnableMultiLine", this, SLOT(setMultiLineEnabled(QVariant)));
setMultiLineEnabled(s.value("EnableMultiLine", true));
ui.ownNick->addItems(nicks);
if (me && me->isAway())
- ui.ownNick->setItemData(nickIdx, SmallIcon("user-away"), Qt::DecorationRole);
+ ui.ownNick->setItemData(nickIdx, QIcon::fromTheme("user-away"), Qt::DecorationRole);
ui.ownNick->setCurrentIndex(nickIdx);
}
fmt.clearForeground();
fmt.clearBackground();
inputLine()->setCurrentCharFormat(fmt);
-
-#ifdef HAVE_KDE
- // Set highlighter back to active in case it was deactivated by too many errors.
- if (ui.inputEdit->highlighter())
- ui.inputEdit->highlighter()->setActive(true);
-#endif
}
mergeFormatOnSelection(fmt);
}
ui.textcolorButton->setDefaultAction(action);
- ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color));
+ ui.textcolorButton->setIcon(createColorToolButtonIcon(QIcon::fromTheme("format-text-color"), color));
}
mergeFormatOnSelection(fmt);
}
ui.highlightcolorButton->setDefaultAction(action);
- ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), color));
+ ui.highlightcolorButton->setIcon(createColorToolButtonIcon(QIcon::fromTheme("format-fill-color"), color));
}