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
ff99bbb
..
bc8edf5
100644
(file)
--- a/
src/qtui/inputwidget.h
+++ b/
src/qtui/inputwidget.h
@@
-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, const QColor &color);
QTextCharFormat getFormatOfWordOrSelection();
QIcon createColorToolButtonIcon(const QIcon &icon, const QColor &color);
QTextCharFormat getFormatOfWordOrSelection();
- void setFormatOn
WordOr
Selection(const QTextCharFormat &format);
+ void setFormatOnSelection(const QTextCharFormat &format);
};
};