projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8dcad46
)
Don't join channels on single click in bufferviews on X11, fixes BR #298
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Sat, 15 Nov 2008 20:37:01 +0000
(21:37 +0100)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Sat, 15 Nov 2008 20:37:01 +0000
(21:37 +0100)
src/uisupport/bufferview.cpp
patch
|
blob
|
history
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
11564b5
..
8751c93
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-97,12
+97,13
@@
void BufferView::init() {
setSortingEnabled(true);
sortByColumn(0, Qt::AscendingOrder);
setSortingEnabled(true);
sortByColumn(0, Qt::AscendingOrder);
-#ifndef Q_WS_QWS
- //
this is a workaround to not join channels automatically... we need a saner way to navigate for qtopia anyway though,
- // such as mark first, activate at second click...
- connect(this, SIGNAL(
activated(QModelIndex)), this
, SLOT(joinChannel(QModelIndex)));
+
+ //
activated() fails on X11 and Qtopia at least
+#if defined Q_WS_QWS or defined Q_WS_X11
+ connect(this, SIGNAL(
doubleClicked(QModelIndex))
, SLOT(joinChannel(QModelIndex)));
#else
#else
- connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(joinChannel(QModelIndex))); // Qtopia uses single click for activation
+ // afaik this is better on Mac and Windows
+ connect(this, SIGNAL(activated(QModelIndex)), SLOT(joinChannel(QModelIndex)));
#endif
}
#endif
}
@@
-389,7
+390,7
@@
QMenu *BufferView::createHideEventsSubMenu(QMenu &menu, BufferId bufferId) {
_hidePartAction.setChecked(filter & Message::Part);
_hideQuitAction.setChecked(filter & Message::Quit);
_hideModeAction.setChecked(filter & Message::Mode);
_hidePartAction.setChecked(filter & Message::Part);
_hideQuitAction.setChecked(filter & Message::Quit);
_hideModeAction.setChecked(filter & Message::Mode);
-
+
QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events"));
hideEventsMenu->addAction(&_hideJoinAction);
hideEventsMenu->addAction(&_hidePartAction);
QMenu *hideEventsMenu = menu.addMenu(tr("Hide Events"));
hideEventsMenu->addAction(&_hideJoinAction);
hideEventsMenu->addAction(&_hidePartAction);