From: <ck...@us...> - 2008-02-19 07:35:01
|
Revision: 2732 http://krusader.svn.sourceforge.net/krusader/?rev=2732&view=rev Author: ckarai Date: 2008-02-18 23:35:00 -0800 (Mon, 18 Feb 2008) Log Message: ----------- K3ListBox -> QListWidget, K3ListView -> QTreeWidget Modified Paths: -------------- trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp trunk/krusader_kde4/krusader/krusaderview.h Modified: trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp =================================================================== --- trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp 2008-02-18 06:08:46 UTC (rev 2731) +++ trunk/krusader_kde4/krusader/Dialogs/checksumdlg.cpp 2008-02-19 07:35:00 UTC (rev 2732) @@ -1,5 +1,7 @@ #include "checksumdlg.h" #include "../krusader.h" +#include "../GUI/krlistwidget.h" +#include "../GUI/krtreewidget.h" #include <klocale.h> #include <kprocess.h> #include <qlayout.h> @@ -8,8 +10,6 @@ #include <QHBoxLayout> #include <QGridLayout> #include <klineedit.h> -#include <k3listview.h> -#include <k3listbox.h> #include <qpixmap.h> #include <kcursor.h> #include <kmessagebox.h> @@ -238,8 +238,8 @@ ++row; // file list - K3ListBox *lb = new K3ListBox(widget); - lb->insertStringList(files); + KrListWidget *lb = new KrListWidget(widget); + lb->addItems(files); layout->addWidget(lb, row, 0, 1, 2); ++row; @@ -353,8 +353,8 @@ ++row; // file list - K3ListBox *lb = new K3ListBox(widget); - lb->insertStringList(files); + KrListWidget *lb = new KrListWidget(widget); + lb->addItems(files); layout->addWidget(lb, row, 0, 1, 2); ++row; @@ -480,8 +480,8 @@ QLabel *l3 = new QLabel(i18n("The following files have failed:"), widget); layout->addWidget(l3, row, 0, 1, 2); ++row; - K3ListBox *lb2 = new K3ListBox(widget); - lb2->insertStringList(failed); + KrListWidget *lb2 = new KrListWidget(widget); + lb2->addItems(failed); layout->addWidget(lb2, row, 0, 1, 2); ++row; } @@ -529,23 +529,32 @@ layout->addWidget(l2, row, 0, 1, 2); ++row; } - K3ListView *lv = new K3ListView(widget); + KrTreeWidget *lv = new KrTreeWidget(widget); + + QStringList columns; if(standardFormat){ - lv->addColumn(i18n("Hash")); - lv->addColumn(i18n("File")); + columns << i18n("Hash"); + columns << i18n("File"); lv->setAllColumnsShowFocus(true); } else { - lv->addColumn(i18n("File and hash")); + columns << i18n("File and hash"); } + lv->setHeaderLabels( columns ); + for ( QStringList::ConstIterator it = stdOut.begin(); it != stdOut.end(); ++it ) { QString line = (*it); if(standardFormat) { int space = line.find(' '); - new K3ListViewItem(lv, line.left(space), line.mid(space+2)); + QTreeWidgetItem * item = new QTreeWidgetItem( lv ); + item->setText(0, line.left(space)); + item->setText(1, line.mid(space+2)); } else { - new K3ListViewItem(lv, line); + QTreeWidgetItem * item = new QTreeWidgetItem( lv ); + item->setText(0, line); } } + lv->sortItems( standardFormat ? 1 : 0, Qt::Ascending ); + layout->addWidget(lv, row, 0, 1, 2); ++row; } @@ -561,8 +570,8 @@ QLabel *l3 = new QLabel(i18n("Here are the errors received:"), widget); layout->addWidget(l3, row, 0, 1, 2); ++row; - K3ListBox *lb = new K3ListBox(widget); - lb->insertStringList(stdErr); + KrListWidget *lb = new KrListWidget(widget); + lb->addItems(stdErr); layout->addWidget(lb, row, 0, 1, 2); ++row; } Modified: trunk/krusader_kde4/krusader/krusaderview.h =================================================================== --- trunk/krusader_kde4/krusader/krusaderview.h 2008-02-18 06:08:46 UTC (rev 2731) +++ trunk/krusader_kde4/krusader/krusaderview.h 2008-02-19 07:35:00 UTC (rev 2732) @@ -33,7 +33,6 @@ #define KRUSADERVIEW_H // KDE includes -#include <k3listview.h> #include <klocale.h> #include <kapplication.h> #include <kparts/part.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |