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 95748cb..73316ca 100644 (file)
--- 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;
 void Client::connectToCore(const QVariantMap &conn) {
   // TODO implement SSL
   coreConnectionInfo = conn;

-  

   if(isConnected()) {
     emit coreConnectionError(tr("Already connected to Core!"));
     return;
   if(isConnected()) {
     emit coreConnectionError(tr("Already connected to Core!"));
     return;

diff --git a/src/qtopia/chatline.cpp b/src/qtopia/chatline.cpp
index eff324b..531fe28 100644 (file)
--- a/src/qtopia/chatline.cpp
+++ b/src/qtopia/chatline.cpp
@@ -68,6 +68,6 @@ QString ChatLine::htmlTimeStamp() const {
 
 
 QString ChatLine::formattedToHtml(const QString &f) {
 
 
 QString ChatLine::formattedToHtml(const QString &f) {

-  
+   

   return f;
 }
   return f;
 }

diff --git a/src/qtopia/chatwidget.cpp b/src/qtopia/chatwidget.cpp
index f7eaed2..b492fd3 100644 (file)
--- a/src/qtopia/chatwidget.cpp
+++ b/src/qtopia/chatwidget.cpp
@@ -19,6 +19,7 @@
  ***************************************************************************/
 
 #include <QDebug>
  ***************************************************************************/
 
 #include <QDebug>

+#include <QtGui>

 #include "chatwidget.h"
 
 ChatWidget::ChatWidget(QWidget *parent) : QTextEdit(parent) {
 #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);
   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<ChatLine *> list) {
 }
 
 void ChatWidget::prependChatLines(QList<ChatLine *> list) {

diff --git a/src/qtui/coreconnectdlg.cpp b/src/qtui/coreconnectdlg.cpp
index 4d0740c..d2c8d06 100644 (file)
--- 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
 
 void CoreConnectDlg::doConnect() {
   accountChanged(); // save current account info

-

   QVariantMap conninfo;
   ui.stackedWidget->setCurrentIndex(1);
   if(ui.internalCore->isChecked()) {
   QVariantMap conninfo;
   ui.stackedWidget->setCurrentIndex(1);
   if(ui.internalCore->isChecked()) {