CONFIG *= debug
}
-sputdev {
- DEFINES *= SPUTDEV
-}
-
-win32:static {
- CONFIG = release warn_on uic resources qt windows static
+win32 {
+ CONFIG = warn_on uic resources qt silent windows
+ static {
+ CONFIG += release static
+ }
}
mac:Tiger {
QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
CONFIG += x86 ppc
}
+
+sputdev {
+ DEFINES *= SPUTDEV
+}
--- /dev/null
+src/tools/moc src/tools/rcc src/tools/uic src/corelib src/xml src/network src/sql src/plugins/codecs src/script
--- /dev/null
+[16:35:11] <EgS> 1.)
+[16:35:12] <EgS> ./configure -no-accessibility -qt-sql-sqlite -no-qt3support
+-no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -nomake demos -nomake
+examples -nomake gui -nomake uic -nomake opengl -nomake tools -no-opengl
+-no-sm -no-xshape -no-xinerama -no-xcursor -no-xfixes -no-xrandr -no-xrender
+-no-fontconfig -no-tablet -no-xkb
+[16:35:31] <EgS> 2.)
+[16:35:31] <EgS> $ cat QT4_TARGET_DIRECTORIES
+[16:35:31] <EgS> src/tools/moc src/tools/rcc src/tools/uic src/corelib src/xml src/network src/sql src/plugins/codecs src/script
+[16:35:38] <EgS> so eine datei ist sehr hilfreich
+[16:35:40] <EgS> und dann im src dir:
+[16:36:21] <EgS> for i in `cat /home/irc/QT4_TARGET_DIRECTORIES`; do make -C $i; done
+[16:36:28] <EgS> naja...
+[16:36:33] <EgS> $pfad halt :)
+[16:36:50] <EgS> das ganze kannste dann noch mit "make install" machen
+
+for static core:
+./configure -static -no-accessibility -qt-sql-sqlite -qt-zlib -no-qt3support \
+-no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -nomake demos -nomake examples \
+-nomake gui -nomake uic -nomake opengl -nomake tools -no-opengl -no-sm -no-xshape \
+-no-xinerama -no-xcursor -no-xfixes -no-xrandr -no-xrender -no-fontconfig -no-tablet \
+-no-xkb -no-glib -no-svg -openssl-linked -no-phonon -no-webkit -no-dbus -no-xmlpatterns \
+-prefix /usr/local/Trolltech/qt-4.4-static
+
+for i in `cat /home/sputnick/devel/quassel/dev-notes/QT4_TARGET_DIRECTORIES`; do make -C $i; done
#include "util.h" // get rid of this (needed for isChannelName)
-
/*****************************************
* Fancy Buffer Items
*****************************************/
return qobject_cast<NetworkItem *>(parent())->isActive();
}
-bool BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
- _activity = level;
- emit dataChanged();
- return true;
+void BufferItem::setActivityLevel(Buffer::ActivityLevel level) {
+ if(_activity != level) {
+ _activity = level;
+ emit dataChanged();
+ }
}
void BufferItem::updateActivityLevel(Buffer::ActivityLevel level) {
bool BufferItem::setData(int column, const QVariant &value, int role) {
switch(role) {
case NetworkModel::BufferActivityRole:
- return setActivityLevel((Buffer::ActivityLevel)value.toInt());
+ setActivityLevel((Buffer::ActivityLevel)value.toInt());
+ return true;
default:
return PropertyMapItem::setData(column, value, role);
}
bool isActive() const;
inline Buffer::ActivityLevel activityLevel() const { return _activity; }
- bool setActivityLevel(Buffer::ActivityLevel level);
+ void setActivityLevel(Buffer::ActivityLevel level);
void updateActivityLevel(Buffer::ActivityLevel level);
void setLastMsgInsert(QDateTime msgDate);
selectionStart = qMin(dragStartLine, curLine);
selectionEnd = qMax(dragStartLine, curLine);
// TODO Make X11SelectionMode configurable!
+#ifdef Q_WS_X11
+ QApplication::clipboard()->setText(selectionToString(), QClipboard::Selection);
+#else
QApplication::clipboard()->setText(selectionToString());
+#endif
break;
default:
mouseMode = Normal;
addDockWidget(Qt::RightDockWidgetArea, nickDock);
ui.menuViews->addAction(nickDock->toggleViewAction());
- connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
+ // See NickListDock::NickListDock();
+ // connect(nickDock->toggleViewAction(), SIGNAL(triggered(bool)), nickListWidget, SLOT(showWidget(bool)));
// attach the NickListWidget to the BufferModel and the default selection
nickListWidget->setModel(Client::bufferModel());
BufferId newBufferId = current.data(NetworkModel::BufferIdRole).value<BufferId>();
BufferId oldBufferId = previous.data(NetworkModel::BufferIdRole).value<BufferId>();
-
if(bufferType != BufferInfo::ChannelBuffer) {
ui.stackedWidget->setCurrentWidget(ui.emptyPage);
- QDockWidget *dock_ = dock();
- if(dock_) {
- dock_->close();
- }
return;
- } else {
- QDockWidget *dock_ = dock();
- if(dock_ && dock_->toggleViewAction()->isChecked()) {
- dock_->show();
- }
}
+ // See NickListDock::NickListDock() below
+// if(bufferType != BufferInfo::ChannelBuffer) {
+// ui.stackedWidget->setCurrentWidget(ui.emptyPage);
+// QDockWidget *dock_ = dock();
+// if(dock_) {
+// dock_->close();
+// }
+// return;
+// } else {
+// QDockWidget *dock_ = dock();
+// if(dock_ && dock_->toggleViewAction()->isChecked()) {
+// dock_->show();
+// }
+// }
+
if(newBufferId == oldBufferId)
return;
NickListDock::NickListDock(const QString &title, QWidget *parent)
: QDockWidget(title, parent)
{
- QAction *toggleView = toggleViewAction();
- disconnect(toggleView, SIGNAL(triggered(bool)), this, 0);
- toggleView->setChecked(QtUiSettings().value("ShowNickList", QVariant(true)).toBool());
-
- // reconnecting the closebuttons clicked signal to the action
- foreach(QAbstractButton *button, findChildren<QAbstractButton *>()) {
- if(disconnect(button, SIGNAL(clicked()), this, SLOT(close())))
- connect(button, SIGNAL(clicked()), toggleView, SLOT(trigger()));
- }
+ // THIS STUFF IS NEEDED FOR NICKLIST AUTOHIDE...
+ // AS THIS BRINGS LOTS OF FUCKUPS WITH IT IT'S DEACTIVATED FOR NOW...
+
+// QAction *toggleView = toggleViewAction();
+// disconnect(toggleView, SIGNAL(triggered(bool)), this, 0);
+// toggleView->setChecked(QtUiSettings().value("ShowNickList", QVariant(true)).toBool());
+
+// // reconnecting the closebuttons clicked signal to the action
+// foreach(QAbstractButton *button, findChildren<QAbstractButton *>()) {
+// if(disconnect(button, SIGNAL(clicked()), this, SLOT(close())))
+// connect(button, SIGNAL(clicked()), toggleView, SLOT(trigger()));
+// }
}
-NickListDock::~NickListDock() {
- QtUiSettings().setValue("ShowNickList", toggleViewAction()->isChecked());
-}
-
-bool NickListDock::event(QEvent *event) {
- switch (event->type()) {
- case QEvent::Hide:
- case QEvent::Show:
- emit visibilityChanged(event->type() == QEvent::Show);
- return QWidget::event(event);
- default:
- return QDockWidget::event(event);
- }
-}
+// NickListDock::~NickListDock() {
+// QtUiSettings().setValue("ShowNickList", toggleViewAction()->isChecked());
+// }
+
+// bool NickListDock::event(QEvent *event) {
+// switch (event->type()) {
+// case QEvent::Hide:
+// case QEvent::Show:
+// emit visibilityChanged(event->type() == QEvent::Show);
+// return QWidget::event(event);
+// default:
+// return QDockWidget::event(event);
+// }
+// }
public:
NickListDock(const QString &title, QWidget *parent = 0);
- ~NickListDock();
+ // ~NickListDock();
- virtual bool event(QEvent *event);
+ // virtual bool event(QEvent *event);
};
#endif
Unless you *really* know what you do, leave this as ISO-8859-1!</string>
</property>
<property name="currentIndex" >
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="serversTab" >
<property name="enabled" >
<rect>
<x>0</x>
<y>0</y>
- <width>244</width>
- <height>332</height>
+ <width>301</width>
+ <height>326</height>
</rect>
</property>
<attribute name="title" >
<rect>
<x>0</x>
<y>0</y>
- <width>244</width>
- <height>332</height>
+ <width>301</width>
+ <height>326</height>
</rect>
</property>
<attribute name="title" >
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="label_2" >
+ <property name="text" >
+ <string>Service:</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="1" >
<widget class="QLineEdit" name="autoIdentifyService" >
<property name="enabled" >
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="autoIdentifyPassword" >
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label_3" >
<property name="enabled" >
<bool>true</bool>
</property>
- <property name="echoMode" >
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
<property name="text" >
- <string>Service:</string>
+ <string>Password:</string>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="autoIdentifyPassword" >
<property name="enabled" >
<bool>true</bool>
</property>
- <property name="text" >
- <string>Password:</string>
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
#include "client.h"
#include "networkmodel.h"
-AbstractBufferContainer::AbstractBufferContainer(QWidget *parent) : AbstractItemView(parent), _currentBuffer(0)
+AbstractBufferContainer::AbstractBufferContainer(QWidget *parent)
+ : AbstractItemView(parent),
+ _currentBuffer(0)
{
-
}
AbstractBufferContainer::~AbstractBufferContainer() {
-
}
#include "bufferviewfilter.h"
-#include <QColor>
-
#include "buffermodel.h"
#include "client.h"
#include "networkmodel.h"
connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(source_rowsInserted(const QModelIndex &, int, int)));
setDynamicSortFilter(true);
+
+ loadColors();
+}
+
+void BufferViewFilter::loadColors() {
+ UiSettings s("QtUi/Colors");
+ _FgColorInactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray))).value<QColor>();
+ _FgColorNoActivity = s.value("noActivityFG", QVariant(QColor(Qt::black))).value<QColor>();
+ _FgColorHighlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta))).value<QColor>();
+ _FgColorNewMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green))).value<QColor>();
+ _FgColorOtherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen))).value<QColor>();
}
void BufferViewFilter::setConfig(BufferViewConfig *config) {
}
QVariant BufferViewFilter::foreground(const QModelIndex &index) const {
- UiSettings s("QtUi/Colors");
- QVariant inactiveActivity = s.value("inactiveActivityFG", QVariant(QColor(Qt::gray)));
- QVariant noActivity = s.value("noActivityFG", QVariant(QColor(Qt::black)));
- QVariant highlightActivity = s.value("highlightActivityFG", QVariant(QColor(Qt::magenta)));
- QVariant newMessageActivity = s.value("newMessageActivityFG", QVariant(QColor(Qt::green)));
- QVariant otherActivity = s.value("otherActivityFG", QVariant(QColor(Qt::darkGreen)));
-
if(!index.data(NetworkModel::ItemActiveRole).toBool())
- return inactiveActivity;
+ return _FgColorInactiveActivity;
Buffer::ActivityLevel activity = (Buffer::ActivityLevel)index.data(NetworkModel::BufferActivityRole).toInt();
if(activity & Buffer::Highlight)
- return highlightActivity;
+ return _FgColorHighlightActivity;
if(activity & Buffer::NewMessage)
- return newMessageActivity;
+ return _FgColorNewMessageActivity;
if(activity & Buffer::OtherActivity)
- return otherActivity;
-
- return noActivity;
+ return _FgColorOtherActivity;
+ return _FgColorNoActivity;
}
void BufferViewFilter::source_rowsInserted(const QModelIndex &parent, int start, int end) {
#ifndef BUFFERVIEWFILTER_H_
#define BUFFERVIEWFILTER_H_
+#include <QColor>
#include <QDropEvent>
#include <QFlags>
#include <QPointer>
private:
QPointer<BufferViewConfig> _config;
+ QColor _FgColorInactiveActivity;
+ QColor _FgColorNoActivity;
+ QColor _FgColorHighlightActivity;
+ QColor _FgColorNewMessageActivity;
+ QColor _FgColorOtherActivity;
+ void loadColors();
+
bool filterAcceptBuffer(const QModelIndex &) const;
bool filterAcceptNetwork(const QModelIndex &) const;
void addBuffer(const BufferId &);
{ using namespace Global;
quasselVersion = "0.2.0-beta1-pre";
- quasselDate = "2008-04-21";
- quasselBuild = 786;
+ quasselDate = "2008-04-29";
+ quasselBuild = 797;
//! Minimum client build number the core needs
clientBuildNeeded = 731;