X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fmultilineedit.h;h=61fafa6e810099baa1455a83140cd2aa891718c9;hb=80950b87640acfb2a75902f8aabf3419da094bf4;hp=70e55800c573bec1f82363a15675259339658833;hpb=4e53ef2a62b2b6b4f103b016bf2f4260a9c02ad4;p=quassel.git diff --git a/src/uisupport/multilineedit.h b/src/uisupport/multilineedit.h index 70e55800..61fafa6e 100644 --- a/src/uisupport/multilineedit.h +++ b/src/uisupport/multilineedit.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,16 +18,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef MULTILINEEDIT_H_ -#define MULTILINEEDIT_H_ +#pragma once + +#include "uisupport-export.h" #include #include -#ifdef HAVE_KDE4 -# include -# define MultiLineEditParent KTextEdit -#elif defined HAVE_KF5 +#if defined HAVE_KF5 # include # define MultiLineEditParent KTextEdit #else @@ -35,7 +33,13 @@ # define MultiLineEditParent QTextEdit #endif -class MultiLineEdit : public MultiLineEditParent +#if defined HAVE_SONNET && !defined HAVE_KDE +# include +# include +# include +#endif + +class UISUPPORT_EXPORT MultiLineEdit : public MultiLineEditParent { Q_OBJECT @@ -45,8 +49,8 @@ public: MultiLine }; - MultiLineEdit(QWidget *parent = 0); - ~MultiLineEdit(); + MultiLineEdit(QWidget *parent = nullptr); + ~MultiLineEdit() override; void setCustomFont(const QFont &); // should be used instead setFont(), so we can set our size correctly @@ -74,9 +78,6 @@ public: inline bool emacsMode() const { return _emacsMode; } void addCompletionSpace(); -#if defined HAVE_KF5 || defined HAVE_KDE4 - void createHighlighter() override; -#endif public slots: void setMode(Mode mode); @@ -84,8 +85,7 @@ public slots: void setMaxHeight(int numLines); void setEmacsMode(bool enable = true); void setScrollBarsEnabled(bool enable = true); - void setSpellCheckEnabled(bool enable = true); - void setPasteProtectionEnabled(bool enable = true, QWidget *msgBoxParent = 0); + void setPasteProtectionEnabled(bool enable = true, QWidget *msgBoxParent = nullptr); void setLineWrapEnabled(bool enable = false); inline void setHistory(QStringList history) { _history = history; } @@ -101,6 +101,10 @@ protected: void keyPressEvent(QKeyEvent *event) override; void resizeEvent(QResizeEvent *event) override; +#if defined HAVE_SONNET && !defined HAVE_KDE + void contextMenuEvent(QContextMenuEvent *event) override; +#endif + private slots: void on_returnPressed(); void on_returnPressed(QString text); @@ -115,6 +119,12 @@ private slots: QString convertMircCodesToHtml(const QString &text); bool mircCodesChanged(QTextCursor &cursor, QTextCursor &peekcursor); +private: + void reset(); + void showHistoryEntry(); + void updateScrollBars(); + void updateSizeHint(); + private: QStringList _history; QHash _tempHistory; @@ -133,11 +143,14 @@ private: QMap _mircColorMap; - void reset(); - void showHistoryEntry(); - void updateScrollBars(); - void updateSizeHint(); -}; +#if defined HAVE_SONNET && !defined HAVE_KDE + // This member function is provided by KTextEdit + Sonnet::Highlighter *highlighter() const; +private slots: + void setSpellCheckEnabled(bool enabled); +private: + Sonnet::SpellCheckDecorator *_spellCheckDecorator{nullptr}; #endif +};