[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/sysadmin/ksystemlog/src
From: Nicolas Ternisien <nicolas.ternisien () gmail ! com>
Date: 2007-08-18 9:24:12
Message-ID: 1187429052.052344.23404.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 701439 by ternisien:
Fix item recent state
Fix errors from EBN
M +1 -1 detailDialog.h
M +1 -1 levelPrintPage.h
M +26 -9 lib/logLine.cpp
M +4 -0 lib/logLine.h
M +1 -1 lib/logViewColumn.h
M +3 -0 lib/logViewWidgetItem.cpp
M +1 -1 loggerDialog.cpp
M +1 -1 loggerDialog.h
M +1 -1 modes/apache/apacheAccessReader.h
M +1 -1 modes/apache/apacheReader.h
M +1 -1 modes/cron/cronReader.h
M +1 -1 modes/cups/cupsAccessReader.h
M +1 -1 modes/cups/cupsReader.h
M +1 -1 modes/samba/sambaReader.h
M +1 -1 modes/ssh/sshReader.h
M +1 -1 modes/xorg/xorgReader.h
M +1 -1 modes/xsession/xsessionReader.h
--- trunk/playground/sysadmin/ksystemlog/src/detailDialog.h #701438:701439
@@ -43,7 +43,7 @@
Q_OBJECT
public:
- DetailDialog(View* v, QWidget *parent=NULL);
+ explicit DetailDialog(View* v, QWidget *parent=NULL);
~DetailDialog();
--- trunk/playground/sysadmin/ksystemlog/src/levelPrintPage.h #701438:701439
@@ -45,7 +45,7 @@
class levelPrintPage : public KPrintDialogPage
{
public:
- levelPrintPage( QWidget *parent = 0, const char *name = 0 );
+ explicit levelPrintPage( QWidget *parent = 0, const char *name = 0 );
~levelPrintPage();
//reimplement virtual functions
--- trunk/playground/sysadmin/ksystemlog/src/lib/logLine.cpp #701438:701439
@@ -27,6 +27,7 @@
#include "logging.h"
#include "logViewWidgetItemBuilder.h"
+#include "logViewWidgetItem.h"
class LogLinePrivate {
public:
@@ -44,6 +45,7 @@
bool recent;
LogViewWidgetItemBuilder* itemBuilder;
+ LogViewWidgetItem* item;
};
@@ -67,6 +69,7 @@
//Be careful : Generally initialized with NULL
d->itemBuilder = itemBuilder;
+ d->item = NULL;
//By default in newly created item has the recent state
setRecent(true);
@@ -74,6 +77,10 @@
}
LogLine::~LogLine() {
+ //logLevel is managed by Globals
+ //item is managed by LogViewModel
+ //itemBuilder is managed by Globals
+
delete d;
}
@@ -152,16 +159,15 @@
void LogLine::setRecent(bool recent) {
d->recent = recent;
- //TODO Need a rewritting
- /*
- QFont currentFont = font(columnCount()-1);
-
- //We avoid doing the same process
- if (this->recent != currentFont.bold()) {
- currentFont.setBold(recent);
- setFont(columnCount()-1, currentFont);
+ if (d->item!=NULL) {
+ QFont currentFont = d->item->font(d->item->columnCount()-1);
+
+ //We avoid doing the same process
+ if (d->recent != currentFont.bold()) {
+ currentFont.setBold(recent);
+ d->item->setFont(d->item->columnCount()-1, currentFont);
+ }
}
- */
}
@@ -200,3 +206,14 @@
void LogLine::setItemBuilder(LogViewWidgetItemBuilder* itemBuilder) {
d->itemBuilder = itemBuilder;
}
+
+void LogLine::setItem(LogViewWidgetItem* item) {
+ d->item = item;
+
+ refreshItem();
+}
+
+void LogLine::refreshItem() {
+ //Call methods that change the look of the item
+ setRecent(d->recent);
+}
--- trunk/playground/sysadmin/ksystemlog/src/lib/logLine.h #701438:701439
@@ -91,6 +91,7 @@
void setRecent(bool recent);
void setItemBuilder(LogViewWidgetItemBuilder* itemBuilder);
+ void setItem(LogViewWidgetItem* item);
//Method from LogViewWidgetItem
QString formattedText();
@@ -107,6 +108,9 @@
protected:
LogLinePrivate* const d;
+
+ private:
+ void refreshItem();
};
--- trunk/playground/sysadmin/ksystemlog/src/lib/logViewColumn.h #701438:701439
@@ -34,7 +34,7 @@
public:
LogViewColumn(const LogViewColumn& column);
- LogViewColumn(const QString& name, bool filtred=true, bool grouped=true);
+ explicit LogViewColumn(const QString& name, bool filtred=true, bool grouped=true);
virtual ~LogViewColumn();
--- trunk/playground/sysadmin/ksystemlog/src/lib/logViewWidgetItem.cpp #701438:701439
@@ -69,6 +69,9 @@
}
setToolTip(columnCount()-1, line->itemBuilder()->createToolTipText(line));
+
+ //Add this item to the LogLine at the end, to let the line update it
+ line->setItem(this);
}
--- trunk/playground/sysadmin/ksystemlog/src/loggerDialog.cpp #701438:701439
@@ -201,7 +201,7 @@
process << "-p";
QString p(facilities[facility->currentText()]);
- p+=".";
+ p+='.';
p+=priorities[priority->currentText()];
process << p;
--- trunk/playground/sysadmin/ksystemlog/src/loggerDialog.h #701438:701439
@@ -33,7 +33,7 @@
class LoggerDialog: public Ui::LoggerDialogBase {
Q_OBJECT
public:
- LoggerDialog(QWidget *parent = 0, const char *name = 0);
+ explicit LoggerDialog(QWidget *parent = 0, const char *name = 0);
protected slots:
void sendMessage();
--- trunk/playground/sysadmin/ksystemlog/src/modes/apache/apacheAccessReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- ApacheAccessReader(QObject *parent = 0, const char *name = 0);
+ explicit ApacheAccessReader(QObject *parent = 0, const char *name = 0);
virtual ~ApacheAccessReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/apache/apacheReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- ApacheReader(QObject *parent = 0, const char *name = 0);
+ explicit ApacheReader(QObject *parent = 0, const char *name = 0);
virtual ~ApacheReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/cron/cronReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- CronReader(QObject *parent = 0, const char *name = 0);
+ explicit CronReader(QObject *parent = 0, const char *name = 0);
virtual ~CronReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/cups/cupsAccessReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- CupsAccessReader(QObject *parent = 0, const char *name = 0);
+ explicit CupsAccessReader(QObject *parent = 0, const char *name = 0);
virtual ~CupsAccessReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/cups/cupsReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- CupsReader(QObject *parent = 0, const char *name = 0);
+ explicit CupsReader(QObject *parent = 0, const char *name = 0);
virtual ~CupsReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/samba/sambaReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- SambaReader(QObject *parent = 0, const char *name = 0);
+ explicit SambaReader(QObject *parent = 0, const char *name = 0);
virtual ~SambaReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/ssh/sshReader.h #701438:701439
@@ -41,7 +41,7 @@
Q_OBJECT
public:
- SSHReader(QObject *parent = 0, const char *name = 0);
+ explicit SSHReader(QObject *parent = 0, const char *name = 0);
virtual ~SSHReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/xorg/xorgReader.h #701438:701439
@@ -45,7 +45,7 @@
Q_OBJECT
public:
- XorgReader(QObject *parent = 0, const char *name = 0);
+ explicit XorgReader(QObject *parent = 0, const char *name = 0);
virtual ~XorgReader();
--- trunk/playground/sysadmin/ksystemlog/src/modes/xsession/xsessionReader.h #701438:701439
@@ -40,7 +40,7 @@
Q_OBJECT
public:
- XSessionReader(QObject *parent = 0, const char *name = 0);
+ explicit XSessionReader(QObject *parent = 0, const char *name = 0);
virtual ~XSessionReader();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic