summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Cellerier <dionoea@videolan.org>2007-09-15 22:13:41 +0000
committerAntoine Cellerier <dionoea@videolan.org>2007-09-15 22:13:41 +0000
commit78d7ece5e914c3f307c42aea2dbb36cf33e7d81c (patch)
tree160b5d8260461456c9db3ab9ed275096b44d21de
parent4bcd0fa2d4a64b6c90c5d07b35001e967bd6ec60 (diff)
downloadrockbox-78d7ece5e914c3f307c42aea2dbb36cf33e7d81c.tar.gz
rockbox-78d7ece5e914c3f307c42aea2dbb36cf33e7d81c.zip
Automatically scroll to the last line of the progress logger when adding a new item.
Cosmetics. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14716 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/rbutilqt/progressloggergui.cpp24
-rw-r--r--rbutil/rbutilqt/progressloggergui.h18
-rw-r--r--rbutil/rbutilqt/progressloggerinterface.h36
3 files changed, 40 insertions, 38 deletions
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp
index 5bf7b92aaa..0d3fcb4187 100644
--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/rbutil/rbutilqt/progressloggergui.cpp
@@ -16,7 +16,7 @@
16 * KIND, either express or implied. 16 * KIND, either express or implied.
17 * 17 *
18 ****************************************************************************/ 18 ****************************************************************************/
19 19
20#include "progressloggergui.h" 20#include "progressloggergui.h"
21 21
22ProgressLoggerGui::ProgressLoggerGui(QObject* parent): ProgressloggerInterface(parent) 22ProgressLoggerGui::ProgressLoggerGui(QObject* parent): ProgressloggerInterface(parent)
@@ -28,18 +28,19 @@ ProgressLoggerGui::ProgressLoggerGui(QObject* parent): ProgressloggerInterface(p
28 connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(abort())); 28 connect(dp.buttonAbort, SIGNAL(clicked()), this, SLOT(abort()));
29} 29}
30 30
31 31void ProgressLoggerGui::addItem(const QString &text)
32void ProgressLoggerGui::addItem(QString text)
33{ 32{
34 dp.listProgress->addItem(text); 33 addItem(text, LOGNOICON);
35} 34}
36 35
37void ProgressLoggerGui::addItem(QString text,int flag) 36void ProgressLoggerGui::addItem(const QString &text, int flag)
38{ 37{
39 QListWidgetItem* item = new QListWidgetItem(text); 38 QListWidgetItem* item = new QListWidgetItem(text);
40 39
41 switch(flag) 40 switch(flag)
42 { 41 {
42 case LOGNOICON:
43 break;
43 case LOGOK: 44 case LOGOK:
44 item->setIcon(QIcon(":/icons/icons/go-next.png")); 45 item->setIcon(QIcon(":/icons/icons/go-next.png"));
45 break; 46 break;
@@ -53,14 +54,15 @@ void ProgressLoggerGui::addItem(QString text,int flag)
53 item->setIcon(QIcon(":/icons/icons/dialog-error.png")); 54 item->setIcon(QIcon(":/icons/icons/dialog-error.png"));
54 break; 55 break;
55 } 56 }
56 57
57 dp.listProgress->addItem(item); 58 dp.listProgress->addItem(item);
58} 59 dp.listProgress->scrollToItem(item);
60}
59 61
60void ProgressLoggerGui::setProgressValue(int value) 62void ProgressLoggerGui::setProgressValue(int value)
61{ 63{
62 dp.progressBar->setValue(value); 64 dp.progressBar->setValue(value);
63} 65}
64 66
65void ProgressLoggerGui::setProgressMax(int max) 67void ProgressLoggerGui::setProgressMax(int max)
66{ 68{
@@ -70,7 +72,7 @@ void ProgressLoggerGui::setProgressMax(int max)
70int ProgressLoggerGui::getProgressMax() 72int ProgressLoggerGui::getProgressMax()
71{ 73{
72 return dp.progressBar->maximum(); 74 return dp.progressBar->maximum();
73} 75}
74 76
75void ProgressLoggerGui::abort() 77void ProgressLoggerGui::abort()
76{ 78{
diff --git a/rbutil/rbutilqt/progressloggergui.h b/rbutil/rbutilqt/progressloggergui.h
index e7ccce8d33..17483150f3 100644
--- a/rbutil/rbutilqt/progressloggergui.h
+++ b/rbutil/rbutilqt/progressloggergui.h
@@ -18,22 +18,22 @@
18 ****************************************************************************/ 18 ****************************************************************************/
19#ifndef PROGRESSLOGGERGUI_H 19#ifndef PROGRESSLOGGERGUI_H
20#define PROGRESSLOGGERGUI_H 20#define PROGRESSLOGGERGUI_H
21 21
22#include <QtGui> 22#include <QtGui>
23 23
24#include "progressloggerinterface.h" 24#include "progressloggerinterface.h"
25#include "ui_installprogressfrm.h" 25#include "ui_installprogressfrm.h"
26 26
27class ProgressLoggerGui :public ProgressloggerInterface 27class ProgressLoggerGui :public ProgressloggerInterface
28{ 28{
29 Q_OBJECT 29 Q_OBJECT
30public: 30public:
31 ProgressLoggerGui(QObject * parent); 31 ProgressLoggerGui(QObject * parent);
32 32
33 virtual void addItem(QString text) ; //adds a string to the list 33 virtual void addItem(const QString &text); //adds a string to the list
34 34
35 virtual void addItem(QString text, int flag) ; //adds a string to the list 35 virtual void addItem(const QString &text, int flag); //adds a string to the list
36 36
37 virtual void setProgressValue(int value); 37 virtual void setProgressValue(int value);
38 virtual void setProgressMax(int max); 38 virtual void setProgressMax(int max);
39 virtual int getProgressMax(); 39 virtual int getProgressMax();
@@ -47,8 +47,8 @@ public slots:
47 virtual void undoAbort(); 47 virtual void undoAbort();
48 virtual void close(); 48 virtual void close();
49 virtual void show(); 49 virtual void show();
50 50
51private: 51private:
52 Ui::InstallProgressFrm dp; 52 Ui::InstallProgressFrm dp;
53 QDialog *downloadProgress; 53 QDialog *downloadProgress;
54 54
diff --git a/rbutil/rbutilqt/progressloggerinterface.h b/rbutil/rbutilqt/progressloggerinterface.h
index cf78bded7e..2f593540fe 100644
--- a/rbutil/rbutilqt/progressloggerinterface.h
+++ b/rbutil/rbutilqt/progressloggerinterface.h
@@ -16,43 +16,43 @@
16 * KIND, either express or implied. 16 * KIND, either express or implied.
17 * 17 *
18 ****************************************************************************/ 18 ****************************************************************************/
19 19
20#ifndef PROGRESSLOGGERINTERFACE_H 20#ifndef PROGRESSLOGGERINTERFACE_H
21#define PROGRESSLOGGERINTERFACE_H 21#define PROGRESSLOGGERINTERFACE_H
22 22
23#include <QtGui> 23#include <QtGui>
24 24
25#define LOGOK 1 25enum {
26#define LOGINFO 2 26 LOGNOICON, LOGOK, LOGINFO, LOGWARNING, LOGERROR
27#define LOGWARNING 3 27};
28#define LOGERROR 4 28
29 29
30 30
31class ProgressloggerInterface : public QObject 31class ProgressloggerInterface : public QObject
32{ 32{
33 Q_OBJECT 33 Q_OBJECT
34 34
35public: 35public:
36 ProgressloggerInterface(QObject* parent) : QObject(parent) {} 36 ProgressloggerInterface(QObject* parent) : QObject(parent) {}
37 virtual void addItem(QString text) =0 ; //adds a string to the list 37 virtual void addItem(const QString &text)=0; //adds a string to the list
38 virtual void addItem(QString text,int flag) =0 ; //adds a string to the list, with icon 38 virtual void addItem(const QString &text, int flag)=0; //adds a string to the list, with icon
39 39
40 virtual void setProgressValue(int value)=0; 40 virtual void setProgressValue(int value)=0;
41 virtual void setProgressMax(int max)=0; 41 virtual void setProgressMax(int max)=0;
42 virtual int getProgressMax()=0; 42 virtual int getProgressMax()=0;
43 43
44signals: 44signals:
45 virtual void aborted()=0; 45 virtual void aborted()=0;
46 46
47 47
48public slots: 48public slots:
49 virtual void abort()=0; 49 virtual void abort()=0;
50 virtual void undoAbort() =0; 50 virtual void undoAbort()=0;
51 virtual void close()=0; 51 virtual void close()=0;
52 virtual void show()=0; 52 virtual void show()=0;
53 53
54private: 54private:
55 55
56}; 56};
57 57
58#endif 58#endif