projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed behaviour of color buttons and text selection
[quassel.git]
/
src
/
qtui
/
inputwidget.h
diff --git
a/src/qtui/inputwidget.h
b/src/qtui/inputwidget.h
index
c29b3ed
..
bc8edf5
100644
(file)
--- 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 *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-56,10
+56,10
@@
private slots:
void setUseCustomFont(const QVariant &);
void setEnableSpellCheck(const QVariant &);
void setShowNickSelector(const QVariant &);
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 setMaxLines(const QVariant &);
void setMultiLineEnabled(const QVariant &);
void setScrollBarsEnabled(const QVariant &);
-
void on_inputEdit_textEntered(const QString &text) const;
void changeNick(const QString &newNick) const;
void on_inputEdit_textEntered(const QString &text) const;
void changeNick(const QString &newNick) const;
@@
-76,8
+76,8
@@
private slots:
void on_boldButton_clicked(bool checked);
void on_italicButton_clicked(bool checked);
void on_underlineButton_clicked(bool checked);
void on_boldButton_clicked(bool checked);
void on_italicButton_clicked(bool checked);
void on_underlineButton_clicked(bool checked);
- void colorCho
osen(QAction *
action);
- void colorHighlightCho
osen(QAction *
action);
+ void colorCho
sen(QAction *
action);
+ void colorHighlightCho
sen(QAction *
action);
private:
Ui::InputWidget ui;
private:
Ui::InputWidget ui;
@@
-86,13
+86,11
@@
private:
IdentityId _identityId;
QMenu *_colorMenu, *_colorFillMenu;
IdentityId _identityId;
QMenu *_colorMenu, *_colorFillMenu;
- void mergeFormatOn
WordOr
Selection(const QTextCharFormat &format);
+ void mergeFormatOnSelection(const QTextCharFormat &format);
void fontChanged(const QFont &f);
void fontChanged(const QFont &f);
- void colorChanged(const QColor &fg);
- void colorHighlightChanged(const QColor &bg);
- QIcon createColorToolButtonIcon(const QIcon &icon, QColor color);
+ QIcon createColorToolButtonIcon(const QIcon &icon, const QColor &color);
QTextCharFormat getFormatOfWordOrSelection();
QTextCharFormat getFormatOfWordOrSelection();
- void setFormatOn
WordOr
Selection(const QTextCharFormat &format);
+ void setFormatOnSelection(const QTextCharFormat &format);
};
};