Skip to content

Commit

Permalink
drop trash for previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
drizt committed Feb 19, 2013
1 parent d0fe732 commit 215beab
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions patches/mac/3050-psi-always-enabled-history-dlg.diff
Expand Up @@ -2,33 +2,6 @@ diff --git a/src/historydlg.cpp b/src/historydlg.cpp
index a3631ad..0a1145a 100644
--- a/src/historydlg.cpp
+++ b/src/historydlg.cpp
@@ -256,7 +256,7 @@ void HistoryDlg::highlightBlocks(const QString text)
QTextCursor cur = ui_.msgLog->textCursor();
cur.clearSelection();
cur.movePosition(QTextCursor::Start);
- ui_.msgLog->setTextCursor(cur);
+ ui_.msgLog->setTextCursor(cur);

if (text.isEmpty()) {
getLatest();
@@ -266,7 +266,7 @@ void HistoryDlg::highlightBlocks(const QString text)
QList<QTextEdit::ExtraSelection> extras;
QTextEdit::ExtraSelection highlight;
highlight.format.setBackground(Qt::yellow);
- highlight.cursor = ui_.msgLog->textCursor();
+ highlight.cursor = ui_.msgLog->textCursor();

bool found = ui_.msgLog->find(text);
while (found)
@@ -586,7 +586,7 @@ void HistoryDlg::displayResult(const EDBResult r, int direction, int max)
msg = "<span style='color:"+sent_color+"'>" + me->timeStamp().toString("[dd.MM.yyyy hh:mm:ss]")+" &lt;"+ TextUtil::plain2rich(d->pa->nick()) +"&gt; " + msg + "</span>";
else
msg = "<span style='color:"+received_color+"'>" + me->timeStamp().toString("[dd.MM.yyyy hh:mm:ss]") + " &lt;" + TextUtil::plain2rich(from) + "&gt; " + msg + "</span>";
-
+
ui_.msgLog->appendText(msg);

}
@@ -615,15 +615,23 @@ void HistoryDlg::startRequest()
if(!ui_.busy->isActive()) {
ui_.busy->start();
Expand Down

0 comments on commit 215beab

Please sign in to comment.