From: Manuel Nickschas Date: Sat, 20 Oct 2007 15:11:58 +0000 (+0000) Subject: Syncing my state before starting to reorganize the UI parts of the source... X-Git-Tag: 0.1.0~109 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=c0ca17fde48836a5d2e7ea9ceaaabcdd7225d9b8 Syncing my state before starting to reorganize the UI parts of the source... --- diff --git a/src/client/client.cpp b/src/client/client.cpp index 95748cb1..73316ca4 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -199,7 +199,6 @@ bool Client::isConnected() { void Client::connectToCore(const QVariantMap &conn) { // TODO implement SSL coreConnectionInfo = conn; - if(isConnected()) { emit coreConnectionError(tr("Already connected to Core!")); return; diff --git a/src/qtopia/chatline.cpp b/src/qtopia/chatline.cpp index eff324b2..531fe280 100644 --- a/src/qtopia/chatline.cpp +++ b/src/qtopia/chatline.cpp @@ -68,6 +68,6 @@ QString ChatLine::htmlTimeStamp() const { QString ChatLine::formattedToHtml(const QString &f) { - + return f; } diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp index f7eaed2d..b492fd33 100644 --- a/src/qtopia/chatwidget.cpp +++ b/src/qtopia/chatwidget.cpp @@ -19,6 +19,7 @@ ***************************************************************************/ #include +#include #include "chatwidget.h" ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) { @@ -58,6 +59,16 @@ void ChatWidget::prependChatLine(ChatLine *line) { moveCursor(QTextCursor::Start); insertHtml(line->text()); setTextCursor(cursor); + QTextCharFormat fmt; + fmt.setForeground(QBrush("#eeff33")); + QFont font("Courier", 8); + font.setFixedPitch(true); qDebug() << font.family(); + fmt.setFont(font); + //fmt.setBackground(QBrush("#112233")); + QTextCursor crsor(document()); + crsor.movePosition(QTextCursor::End, QTextCursor::KeepAnchor); + crsor.select(QTextCursor::Document); + crsor.setCharFormat(fmt); } void ChatWidget::prependChatLines(QList list) { diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp index 4d0740c5..d2c8d06d 100644 --- a/src/qtui/coreconnectdlg.cpp +++ b/src/qtui/coreconnectdlg.cpp @@ -208,7 +208,6 @@ void CoreConnectDlg::doAutoConnect() { void CoreConnectDlg::doConnect() { accountChanged(); // save current account info - QVariantMap conninfo; ui.stackedWidget->setCurrentIndex(1); if(ui.internalCore->isChecked()) {