X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.h;h=165c312efebb6ee71888aff10bd432ca826c6d27;hb=4ef342acedf6a7a2176165c741e05d88c6a253de;hp=b18556777840aa7628b6dd57638918ecf3397ddf;hpb=a9c2f4157175cfb775980eb72c8312cdffcbfe00;p=quassel.git

diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index b1855677..165c312e 100644
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -56,11 +56,11 @@ private slots:
   void setUseCustomFont(const QVariant &);
   void setEnableSpellCheck(const QVariant &);
   void setShowNickSelector(const QVariant &);
+  void setShowStyleButtons(const QVariant &);
   void setMaxLines(const QVariant &);
   void setMultiLineEnabled(const QVariant &);
   void setScrollBarsEnabled(const QVariant &);
-
-  void on_inputEdit_textEntered(const QString &text) const;
+  void on_inputEdit_textEntered(const QString &text);
   void changeNick(const QString &newNick) const;
 
   void setNetwork(NetworkId networkId);
@@ -72,26 +72,25 @@ private slots:
   BufferInfo currentBufferInfo() const;
 
   void currentCharFormatChanged(const QTextCharFormat &format);
-  void textBold();
-  void textUnderline();
-  void textItalic();
+  void on_showStyleButton_toggled(bool checked);
+  void on_boldButton_clicked(bool checked);
+  void on_italicButton_clicked(bool checked);
+  void on_underlineButton_clicked(bool checked);
+  void colorChosen(QAction *action);
+  void colorHighlightChosen(QAction *action);
 
 private:
   Ui::InputWidget ui;
 
   NetworkId _networkId;
   IdentityId _identityId;
+  QMenu *_colorMenu, *_colorFillMenu;
 
-  Action *actionTextBold,
-  *actionTextUnderline,
-  *actionTextItalic,
-  *actionTextFgColor,
-  *actionTextBgColor;
-
-  void mergeFormatOnWordOrSelection(const QTextCharFormat &format);
+  void mergeFormatOnSelection(const QTextCharFormat &format);
   void fontChanged(const QFont &f);
-  void colorChanged(const QColor &fg, const QColor &bg);
-
+  QIcon createColorToolButtonIcon(const QIcon &icon, const QColor &color);
+  QTextCharFormat getFormatOfWordOrSelection();
+  void setFormatOnSelection(const QTextCharFormat &format);
 };