-Removed some qDebug() statements

-Removed filtering of extractor output (not tested)
-Changed SelectionMode of filemanager to ExtendedSelection
-Fixed bug in SheMov::setFreeFS
-Size of selected files is now shown in filemanager


git-svn-id: file:///var/svn/repos2/shemov/trunk@407 f440f766-f032-0410-8965-dc7d17de2ca0

5 files changed, 24 insertions, 27 deletions

diff --git a/archiveeditdialog.cpp b/archiveeditdialog.cpp
index 7b1604c..b7b3fd3 100644
--- a/archiveeditdialog.cpp
+++ b/archiveeditdialog.cpp
@@ -19,8 +19,6 @@
 #include <QVariant>
 #include <QFile>
 
-#include <QDebug>
-
 #include "archiveeditdialog.h"
 #include "archivefilewidget.h"
 #include "listeditor.h"
@@ -182,12 +180,10 @@ void ArchiveEditDialog::guess(){
 	if(fileName.isEmpty()){
 		return;
 	}
-	qDebug() << fileName;
 	QFileInfo fi(fileName);
 	QString rfn = fi.completeBaseName();
 	rfn.chop(1);
 	QModelIndexList idx = mMovieModel->columnContains(rfn, MovieItem::Filename);
-	qDebug() << rfn;
 	if(idx.size() > 0){
 		QModelIndex cur = idx.at(0);
 		QList<QVariant> actors = cur.data(MovieModel::ActorsRole).toList();
diff --git a/extractordialog.cpp b/extractordialog.cpp
index 7bb2f81..984c1d8 100644
--- a/extractordialog.cpp
+++ b/extractordialog.cpp
@@ -42,6 +42,8 @@ void ExtractorDialog::extractionFinished(){
 	mCancelClose->disconnect(SIGNAL(clicked()));
 	connect(mCancelClose, SIGNAL(clicked()), this, SLOT(accept()));
 	mCancelClose->setText(tr("Close"));
+	setWindowTitle(tr("Extraction finished"));
+	mOutput->append(tr("\nFinished.\n"));
 }
 
 void ExtractorDialog::killProcess(){
@@ -51,19 +53,7 @@ void ExtractorDialog::killProcess(){
 
 void ExtractorDialog::writeOutput(){
 	if(mExtractor->canReadLine()){
-		QString line = mExtractor->readLine();
-		QRegExp dots("^...\\s+");
-		if(dots.indexIn(line) != -1){
-			line.replace(dots, "File: ");
-			mOutput->append(line);
-			return;
-		}
-		QRegExp extracting("/.*/");
-		if(extracting.indexIn(line) != -1){
-			line.replace(extracting, "");
-			mOutput->append(line);
-		}
-
+		mOutput->append(mExtractor->readLine());
 	}
 }
 
diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp
index 4f4e452..a944c13 100644
--- a/filesystemwidget.cpp
+++ b/filesystemwidget.cpp
@@ -60,7 +60,7 @@ FilesystemWidget::FilesystemWidget(QWidget *parent) : QWidget(parent) {
 	mFileView->setSortingEnabled(true);
 	mFileView->sortByColumn(0, Qt::AscendingOrder);
 	mFileView->setItemsExpandable(false);
-	mFileView->setSelectionMode(QAbstractItemView::MultiSelection);
+	mFileView->setSelectionMode(QAbstractItemView::ExtendedSelection);
 	mFileView->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
 	QString title = QString(tr("%1 - Rename file")).arg(qApp->applicationName()); 
@@ -125,15 +125,14 @@ void FilesystemWidget::setArchiveDialog(ArchiveEditDialog *dlg){
 	mAEDialog->setDirModel(mModel);
 }
 
-void FilesystemWidget::directoryChanged(const QModelIndex &selected, const QModelIndex &deselected){
+void FilesystemWidget::directoryChanged(const QModelIndex &selected, const QModelIndex & /* deselected */){
 	QModelIndex real = mDirProxy->mapToSource(selected);
 	if(!real.isValid()){
 		return;
 	}
 	mDirEdit->setText(mModel->filePath(real));
 	setWindowTitle(mModel->filePath(real));
-	QModelIndex oldSelected = mDirProxy->mapToSource(deselected);
-	mFileView->selectionModel()->setCurrentIndex(mFileProxy->mapFromSource(oldSelected), QItemSelectionModel::NoUpdate);
+	mFileView->selectionModel()->clear();
 	mFileView->setRootIndex(mFileProxy->mapFromSource(real));
 }
 
diff --git a/filesystemwidget.h b/filesystemwidget.h
index b02939c..c41f878 100644
--- a/filesystemwidget.h
+++ b/filesystemwidget.h
@@ -29,8 +29,10 @@ class FilesystemWidget : public QWidget {
 		FilesystemWidget(QWidget *parent = 0);
 		~FilesystemWidget() {};
 		FileView *fileView() { return mFileView; };
+		FilesystemFileProxy *fileProxy() { return mFileProxy; };
+		QDirModel *dirModel() { return mModel; };
 		const QString windowTitle() const { return mWindowTitle; };
-		void setArchiveDialog(ArchiveEditDialog *dlg); // { mAEDialog = dlg; };
+		void setArchiveDialog(ArchiveEditDialog *dlg);
 
 	signals:
 		void windowTitle(const QString &);
diff --git a/shemov.cpp b/shemov.cpp
index 449846c..5b86fef 100644
--- a/shemov.cpp
+++ b/shemov.cpp
@@ -39,6 +39,7 @@
 #include "editarchiveitemdialog.h"
 #include "coverarchiveeditor.h"
 #include "statisticsdialog.h"
+#include "filesystemfileproxy.h"
 
 SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags) {
 	qApp->setWindowIcon(QIcon(":/shemov.png"));
@@ -109,10 +110,20 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla
 void SheMov::updateSelectionCount(const QItemSelection & /* sel */, const QItemSelection & /* prev */){
 	QLocale l;
 	switch (mTab->currentIndex()) {
-		case 0:
-			mSelectedItems->setText(QString::number(mFSWidget->fileView()->selectionModel()->selectedRows().count()));
-			mSelectedSize->setText("<span style=\"color:#000000\">n/a</span>");
+		case 0: {
+			int selCount = mFSWidget->fileView()->selectionModel()->selectedRows().count();
+			mSelectedItems->setText(QString::number(selCount));
+			qint64 selSize(0);
+			foreach(QModelIndex idx, mFSWidget->fileView()->selectionModel()->selectedRows()){
+				QModelIndex real = mFSWidget->fileProxy()->mapToSource(idx);
+				if(real.isValid()){
+					QFileInfo fi = mFSWidget->dirModel()->fileInfo(real);
+					selSize += fi.size();
+				}
+			}
+			mSelectedSize->setText(QString(tr("<span style=\"color:#000000\">%1</span>")).arg(l.toString((selSize))));
 			break;
+		}
 		case 1:
 			mSelectedItems->setText(QString::number(mAVWidget->fileView()->selectionModel()->selectedRows().count()));
 			qint64 s = mAVWidget->currentSize();
@@ -160,7 +171,7 @@ void SheMov::tabChanged(int newTab){
 void SheMov::setFsFree(){
 	struct statfs buf;
 	QSettings s;
-	QString dir = s.value("paths/archive").toString();
+	QString dir = s.value("paths/archivedir").toString();
 	int success = statfs(qPrintable(dir), &buf);
 	if(success == -1){
 		mFsFree->setText(tr("Error"));
@@ -191,7 +202,6 @@ void SheMov::setFsFree(){
 	QSize stringSize = fm.size(Qt::TextSingleLine, freeString);
 	int startx = (100 - stringSize.width()) / 2;
 	int starty = (height - stringSize.height()) / 2 + fm.ascent();
-	qDebug() << startx << starty;
 	p.drawText(QPoint(startx, starty), freeString);
 	mFsFree->setPixmap(QPixmap::fromImage(img));	
 }