diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/chatdlg.cpp psi-0.10-test3/src/chatdlg.cpp --- psi-0.10-test3-orig/src/chatdlg.cpp 2005-11-07 14:01:25.000000000 +0000 +++ psi-0.10-test3/src/chatdlg.cpp 2005-11-07 14:06:32.000000000 +0000 @@ -30,7 +30,6 @@ #include #include #include -#include #include"profiles.h" #include"psiaccount.h" #include"common.h" @@ -77,7 +76,7 @@ QLabel *lb_ident; IconLabel *lb_status; QLineEdit *le_jid; - QLCDNumber *lcd_count; + QLabel *lb_count; QPopupMenu *pm_settings; QLabel *lb_composing; @@ -135,7 +134,7 @@ } void updateCounter() { - lcd_count->display((int)mle->text().length()); + lb_count->setNum((int)mle->text().length()); } // Records that the user is composing @@ -204,12 +203,15 @@ hb2->addWidget(d->lb_status); d->le_jid = new QLineEdit(sp_top); d->le_jid->setReadOnly(true); - d->lcd_count = new QLCDNumber(sp_top); d->le_jid->setFocusPolicy(QWidget::NoFocus); - QToolTip::add(d->lcd_count, tr("Message length")); - d->lcd_count->setFixedWidth(50); + d->lb_count = new QLabel(sp_top); + QToolTip::add(d->lb_count, tr("Message length")); + d->lb_count->setFrameStyle(QFrame::Panel | QFrame::Sunken); + d->lb_count->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + d->lb_count->setFixedWidth(40); + d->lb_count->setNum((int)0); hb2->addWidget(d->le_jid); - hb2->addWidget(d->lcd_count); + hb2->addWidget(d->lb_count); hb2->addWidget(d->lb_ident); // mid area @@ -459,9 +461,9 @@ doFlash(false); if(option.showCounter && !d->smallChat) - d->lcd_count->show(); + d->lb_count->show(); else - d->lcd_count->hide(); + d->lb_count->hide(); d->mle->setFocus(); } @@ -672,9 +674,9 @@ } if ( option.showCounter && !d->smallChat ) - d->lcd_count->show(); + d->lb_count->show(); else - d->lcd_count->hide(); + d->lb_count->hide(); // update contact info d->status = -2; // sick way of making it redraw the status diff --exclude='*orig' -Naur psi-0.10-test3-orig/src/eventdlg.cpp psi-0.10-test3/src/eventdlg.cpp --- psi-0.10-test3-orig/src/eventdlg.cpp 2005-11-07 14:01:25.000000000 +0000 +++ psi-0.10-test3/src/eventdlg.cpp 2005-11-07 14:06:32.000000000 +0000 @@ -37,7 +37,6 @@ #include #include #include -#include #include #include"psievent.h" #include"psicon.h" @@ -505,7 +504,7 @@ IconLabel *lb_status; ELineEdit *le_to; HLineEdit *le_from, *le_subj; - QLCDNumber *lcd_count; + QLabel *lb_count; IconToolButton *tb_url, *tb_info, *tb_history, *tb_pgp, *tb_icon; IconLabel *lb_pgp; bool enc; @@ -560,7 +559,7 @@ } void updateCounter() { - lcd_count->display((int)mle->text().length()); + lb_count->setNum((int)mle->text().length()); } void sendDecline(const QString &reason) @@ -773,9 +772,12 @@ // message length counter d->le_subj = new HLineEdit(this); - d->lcd_count = new QLCDNumber(this); - QToolTip::add(d->lcd_count, tr("Message length")); - d->lcd_count->setFixedWidth(50); + d->lb_count = new QLabel(this); + QToolTip::add(d->lb_count, tr("Message length")); + d->lb_count->setFrameStyle(QFrame::Panel | QFrame::Sunken); + d->lb_count->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + d->lb_count->setFixedWidth(40); + d->lb_count->setNum((int)0); if(d->composing) { d->tb_pgp = new IconToolButton(this); @@ -807,7 +809,7 @@ l = new QLabel(tr("Subject:"), this); hb3->addWidget(l); hb3->addWidget(d->le_subj); - hb3->addWidget(d->lcd_count); + hb3->addWidget(d->lb_count); hb3->addWidget(d->tb_icon); hb3->addWidget(d->tb_url); hb3->addWidget(d->tb_info); @@ -822,7 +824,7 @@ } else { d->le_subj->hide(); - hb2->addWidget(d->lcd_count); + hb2->addWidget(d->lb_count); hb2->addWidget(d->tb_icon); hb2->addWidget(d->tb_url); hb2->addWidget(d->tb_info); @@ -1284,9 +1286,9 @@ doWhois(true); if ( option.showCounter && d->composing ) - d->lcd_count->show(); + d->lb_count->show(); else - d->lcd_count->hide(); + d->lb_count->hide(); if ( option.useEmoticons && option.emoticonsInEventDlg) d->tb_icon->show();