krusader-commits Mailing List for Krusader (Page 10)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6086
          http://krusader.svn.sourceforge.net/krusader/?rev=6086&view=rev
Author:   ckarai
Date:     2008-09-23 19:20:22 +0000 (Tue, 23 Sep 2008)

Log Message:
-----------
Queue with basic GUI

Modified Paths:
--------------
    trunk/krusader_kde4/krusader/Queue/queue.cpp
    trunk/krusader_kde4/krusader/Queue/queue.h
    trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
    trunk/krusader_kde4/krusader/Queue/queue_mgr.h
    trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
    trunk/krusader_kde4/krusader/Queue/queuedialog.h
    trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
    trunk/krusader_kde4/krusader/Queue/queuewidget.h

Modified: trunk/krusader_kde4/krusader/Queue/queue.cpp
===================================================================

--- trunk/krusader_kde4/krusader/Queue/queue.cpp	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queue.cpp	2008-09-23 19:20:22 UTC (rev 6086)
@@ -23,6 +23,7 @@
 	if( !isRunning )
 		job->start();
 	
+	emit changed();
 	emit showQueueDialog();
 	dumpQueue();
 }
@@ -41,6 +42,7 @@
 	_jobs.removeAll( jw );
 	if( current && _jobs.count() > 0 )
 		_jobs[ 0 ]->start();
+	emit changed();
 }
 
 void Queue::slotResult( KJob * job )
@@ -65,6 +67,8 @@
 					break;
 				case KMessageBox::No: // delete the queue
 					_jobs.clear();
+					emit changed();
+					emit emptied();
 					return;
 				default: // suspend
 					/* TODO */
@@ -72,8 +76,26 @@
 				}
 			}
 			
+			emit changed();
 			if( _jobs.count() > 0 )
 				_jobs[ 0 ]->start();
+			else
+				emit emptied();
 		}
 	}
 }
+
+QList<KIOJobWrapper *> Queue::items()
+{
+	return _jobs;
+}
+
+QList<QString> Queue::itemDescriptions()
+{
+	QList<QString> ret;
+	foreach( KIOJobWrapper *job, _jobs )
+	{
+		ret.append( job->typeStr() + " : " + job->url().prettyUrl() );
+	}
+	return ret;
+}
\ No newline at end of file

Modified: trunk/krusader_kde4/krusader/Queue/queue.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.h	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queue.h	2008-09-23 19:20:22 UTC (rev 6086)
@@ -23,6 +23,10 @@
 	
 	inline const QString& name() const { return _name; }
 	void enqueue(KIOJobWrapper *job);
+	int  count() { return _jobs.size(); }
+	
+	QList<QString> itemDescriptions();
+	QList<KIOJobWrapper *> items();
 
 protected slots:
 	void slotJobDestroyed( QObject * );
@@ -36,6 +40,8 @@
 
 signals:
 	void showQueueDialog();
+	void changed();
+	void emptied();
 };
 
 #endif // QUEUE_H

Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp	2008-09-23 19:20:22 UTC (rev 6086)
@@ -1,16 +1,18 @@
 #include "queue_mgr.h"
 #include "queuedialog.h"
 #include <QList>
+#include <klocale.h>
 
-const QString QueueManager::defaultName="default";
+const QString QueueManager::defaultName=i18n( "default" );
 QMap<QString, Queue*> QueueManager::_queues;
-QString QueueManager::_current="default";
+QString QueueManager::_current=QueueManager::defaultName;
 QueueManager * QueueManager::_self = 0;
 
 QueueManager::QueueManager()
 {
 	Queue *defaultQ = new Queue(defaultName);
 	connect( defaultQ, SIGNAL( showQueueDialog() ), this, SLOT( slotShowQueueDialog() ) );
+	connect( defaultQ, SIGNAL( emptied() ), this, SLOT( slotQueueEmptied() ) );
 	_queues.insert(defaultQ->name(), defaultQ);
 	_current = defaultName;
 	_self = this;
@@ -31,7 +33,7 @@
 	return _queues[queueName];
 }
 
-QList<QString> QueueManager::queues() const
+QList<QString> QueueManager::queues()
 {
 	return _queues.keys();
 }
@@ -49,5 +51,18 @@
 
 void QueueManager::slotShowQueueDialog()
 {
-//	QueueDialog::showDialog();
+	QueueDialog::showDialog();
 }
+
+void QueueManager::slotQueueEmptied()
+{
+	bool empty = true;
+	QList<Queue *> queues = _queues.values();
+	foreach( Queue * queue, queues ) {
+		if( queue->count() != 0 ) {
+			empty = false;
+			break;
+		}
+	}
+	QueueDialog::everyQueueIsEmpty();
+}

Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.h	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.h	2008-09-23 19:20:22 UTC (rev 6086)
@@ -20,7 +20,7 @@
 	~QueueManager();
 	
 	static Queue* queue(const QString& queueName=defaultName);
-	QList<QString> queues() const;
+	static QList<QString> queues();
 	
 	static Queue* currentQueue();
 	static void setCurrentQueue(const QString& queueName);
@@ -29,6 +29,7 @@
 
 protected slots:
 	void slotShowQueueDialog();
+	void slotQueueEmptied();
 
 protected:
 	static QMap<QString, Queue*> _queues;

Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp	2008-09-23 19:20:22 UTC (rev 6086)
@@ -93,7 +93,7 @@
 
 QueueDialog * QueueDialog::_queueDialog = 0;
 
-QueueDialog::QueueDialog() : QDialog( 0, Qt::FramelessWindowHint )
+QueueDialog::QueueDialog() : QDialog( 0, Qt::FramelessWindowHint ), _autoHide( true )
 {
   setWindowModality( Qt::NonModal );
   setWindowTitle( i18n("Krusader::Queue Manager") );
@@ -169,14 +169,17 @@
   _queueDialog = 0;
 }
 
-void QueueDialog::showDialog()
+void QueueDialog::showDialog( bool autoHide )
 {
   if( _queueDialog == 0 )
     _queueDialog = new QueueDialog();
   else {
+    _queueDialog->show();
     _queueDialog->raise();
     _queueDialog->activateWindow();
   }
+  if( !autoHide )
+    autoHide = false;
 }
 
 void QueueDialog::paintEvent ( QPaintEvent * event )
@@ -200,7 +203,20 @@
   _startPos = pos();
 }
 
+
+void QueueDialog::everyQueueIsEmpty()
+{
+  if( _queueDialog->_autoHide && _queueDialog != 0 && !_queueDialog->isHidden() )
+    _queueDialog->reject();
+}
+
+
 void QueueDialog::mouseMoveEvent(QMouseEvent *me)
 {
   move(_startPos + me->globalPos() - _clickPos);
 }
+
+void QueueDialog::closeEvent ( QCloseEvent * event )
+{
+  _autoHide = true;
+}
\ No newline at end of file

Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h	2008-09-23 19:20:22 UTC (rev 6086)
@@ -34,6 +34,7 @@
 #include <qdialog.h>
 
 class QPaintEvent;
+class QCloseEvent;
 
 class QueueDialog : public QDialog
 {
@@ -45,10 +46,12 @@
 public:
   virtual ~QueueDialog();
 
-  static void showDialog();
+  static void showDialog( bool autoHide = true );
+  static void everyQueueIsEmpty();
 
 protected:
   virtual void paintEvent ( QPaintEvent * event );
+  virtual void closeEvent ( QCloseEvent * event );
   virtual void mousePressEvent(QMouseEvent *me);
   virtual void mouseMoveEvent(QMouseEvent *me);
 
@@ -60,6 +63,7 @@
   int                  _y;
   QPoint               _clickPos;
   QPoint               _startPos;
+  bool                 _autoHide;
 };
 
 #endif // __QUEUEDIALOG_H__
\ No newline at end of file

Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.cpp	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.cpp	2008-09-23 19:20:22 UTC (rev 6086)
@@ -1,10 +1,35 @@
 #include "queuewidget.h"
+#include "queue_mgr.h"
 
 QueueWidget::QueueWidget( QWidget * parent ): KTabWidget( parent )
 {
+  QList<QString> queueList = QueueManager::queues();
+  foreach( QString name, queueList ) {
+    KrQueueListWidget * jobWidget = new KrQueueListWidget( QueueManager::queue( name ), this );
+    addTab( jobWidget, name );
+  }
 }
 
 
 QueueWidget::~QueueWidget()
 {
 }
+
+
+KrQueueListWidget::KrQueueListWidget( Queue * queue, QWidget * parent ) : QListWidget( parent ), 
+                                      _queue( queue )
+{
+  connect( queue, SIGNAL( changed() ), this, SLOT( slotChanged() ) );
+  slotChanged();
+}
+
+void KrQueueListWidget::slotChanged()
+{
+  clear();
+  if( _queue )
+  {
+    QList<QString> itdescs = _queue->itemDescriptions();
+    foreach( QString desc, itdescs )
+      addItem( desc );
+  }
+}

Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.h	2008-09-22 21:12:08 UTC (rev 6085)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.h	2008-09-23 19:20:22 UTC (rev 6086)
@@ -1,7 +1,10 @@
 #ifndef QUEUE_WIDGET_H
 #define QUEUE_WIDGET_H
 
+#include "queue.h"
 #include <ktabwidget.h>
+#include <qlistwidget.h>
+#include <qpointer.h>
 
 class QueueWidget: public KTabWidget
 {
@@ -11,4 +14,18 @@
 	~QueueWidget();
 };
 
+class KrQueueListWidget : public QListWidget
+{
+	Q_OBJECT
+public:
+	KrQueueListWidget( Queue * queue, QWidget * parent );
+
+public slots:
+	void slotChanged();
+	
+private:
+	QPointer<Queue> _queue;
+};
+
+
 #endif // QUEUE_WIDGET_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (98)	Sep (138)	Oct (100)	Nov (49)	Dec (131)
2004	Jan (94)	Feb (65)	Mar (100)	Apr (83)	May (72)	Jun (29)	Jul (167)	Aug (127)	Sep (131)	Oct (269)	Nov (122)	Dec (100)
2005	Jan (228)	Feb (266)	Mar (63)	Apr (135)	May (157)	Jun (52)	Jul (25)	Aug (49)	Sep (184)	Oct (159)	Nov (75)	Dec (37)
2006	Jan (60)	Feb (129)	Mar (110)	Apr (34)	May (31)	Jun (42)	Jul (72)	Aug (90)	Sep (57)	Oct (66)	Nov (42)	Dec (90)
2007	Jan (106)	Feb (54)	Mar (93)	Apr (27)	May (21)	Jun (17)	Jul (19)	Aug (22)	Sep (25)	Oct (2)	Nov (1)	Dec (1)
2008	Jan (65)	Feb (70)	Mar (29)	Apr (45)	May (91)	Jun (20)	Jul (11)	Aug (24)	Sep (23)	Oct (13)	Nov (23)	Dec (39)
2009	Jan (23)	Feb (39)	Mar (15)	Apr (56)	May (5)	Jun	Jul	Aug	Sep	Oct	Nov	Dec