Menu
▾
▴
krusader-commits
You can subscribe to this list here.
| 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
|
|
From: <ck...@us...> - 2008-10-31 03:45:24
|
Revision: 6111
http://krusader.svn.sourceforge.net/krusader/?rev=6111&view=rev
Author: ckarai
Date: 2008-10-31 03:45:05 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
FIXED: [ 2202522 ] newly created hidden files are shown for a short time
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp
trunk/krusader_kde4/krusader/VFS/vfs.cpp
trunk/krusader_kde4/krusader/VFS/vfs.h
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-10-23 10:59:19 UTC (rev 6110)
+++ trunk/krusader_kde4/ChangeLog 2008-10-31 03:45:05 UTC (rev 6111)
@@ -11,6 +11,7 @@
ARCH: QuickSearch is moved to KrView from Detailed/Brief views
ARCH: Keyboard handling is moved to KrView from Detailed/Brief views
+ FIXED: [ 2202522 ] newly created hidden files are shown for a short time
FIXED: calc space doesn't work on remote file systems
FIXED: searcher doesn't start because of corrupt config files
FIXED: Konfigurator doesn't detect every mimetype for "zip" files
Modified: trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-10-23 10:59:19 UTC (rev 6110)
+++ trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-10-31 03:45:05 UTC (rev 6111)
@@ -388,6 +388,9 @@
KUrl url = KUrl(path);
QString name = url.fileName();
+ if ( name.left(1) == "." && !vfs_showHidden() )
+ return;
+
// do we have it already ?
if( !vfs_search(name ) ) return vfs_slotCreated(path);
@@ -407,9 +410,12 @@
if( burstRefresh( path ) )
return;
-
KUrl url = KUrl(path);
QString name = url.fileName();
+
+ if ( name.left(1) == "." && !vfs_showHidden() )
+ return;
+
// if it's in the CVS - it's an update not new file
if( vfs_search(name) )
return vfs_slotDirty(path);
Modified: trunk/krusader_kde4/krusader/VFS/vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/vfs.cpp 2008-10-23 10:59:19 UTC (rev 6110)
+++ trunk/krusader_kde4/krusader/VFS/vfs.cpp 2008-10-31 03:45:05 UTC (rev 6111)
@@ -365,4 +365,9 @@
return result;
}
+bool vfs::vfs_showHidden() {
+ KConfigGroup gl( krConfig, "Look&Feel");
+ return gl.readEntry("Show Hidden",_ShowHidden);
+}
+
#include "vfs.moc"
Modified: trunk/krusader_kde4/krusader/VFS/vfs.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/vfs.h 2008-10-23 10:59:19 UTC (rev 6110)
+++ trunk/krusader_kde4/krusader/VFS/vfs.h 2008-10-31 03:45:05 UTC (rev 6111)
@@ -97,6 +97,8 @@
inline VFS_TYPE vfs_getType() { return vfs_type; }
/// Returns true if vfs is busy
inline bool vfs_isBusy() { return vfs_busy; }
+ /// Returns true if hidden files has to be shown
+ bool vfs_showHidden();
/// Return the first file in the VFS and set the internal iterator to the beginning of the list.
inline vfile* vfs_getFirstFile(){ vfileIterator = vfs_filesP->begin(); return (vfileIterator == vfs_filesP->end() ? 0 : *vfileIterator ); }
/// Return the the next file in the list and advance the iterator.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-10-23 13:37:57
|
Revision: 6110
http://krusader.svn.sourceforge.net/krusader/?rev=6110&view=rev
Author: ckarai
Date: 2008-10-23 10:59:19 +0000 (Thu, 23 Oct 2008)
Log Message:
-----------
Added: evolution can be used as the default email sender
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
trunk/krusader_kde4/krusader/krslots.cpp
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-10-22 15:06:35 UTC (rev 6109)
+++ trunk/krusader_kde4/ChangeLog 2008-10-23 10:59:19 UTC (rev 6110)
@@ -1,3 +1,4 @@
+ ADDED: Evolution can be used as the default e-mail sender (thanks to Agustin Henze)
ADDED: enqueue operation for copy / move
ADDED: Konfigurator mouse selection mode: Possibility to select a predefined
mode and change a detail.
Modified: trunk/krusader_kde4/krusader/krslots.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krslots.cpp 2008-10-22 15:06:35 UTC (rev 6109)
+++ trunk/krusader_kde4/krusader/krslots.cpp 2008-10-23 10:59:19 UTC (rev 6110)
@@ -133,6 +133,14 @@
}
param+="\',subject=\'" + subject + "\'";
proc << mailProg << "--compose" << param;
+ } else if ( KUrl( mailProg ).fileName() == "evolution") {
+ QString param="mailto:?cc=&subject=" + subject + "&attach=";
+ separator = "";
+ foreach( KUrl url2, urls ){
+ param += separator + url2.prettyUrl();
+ separator = "&attach=";
+ }
+ proc << mailProg << param + "";
}
if (!proc.startDetached())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-10-22 15:06:50
|
Revision: 6109
http://krusader.svn.sourceforge.net/krusader/?rev=6109&view=rev
Author: vaclavjuza
Date: 2008-10-22 15:06:35 +0000 (Wed, 22 Oct 2008)
Log Message:
-----------
Install application icon under Windows and Mac, update windows installation instructions
Modified Paths:
--------------
trunk/krusader_kde4/INSTALL
trunk/krusader_kde4/krusader/CMakeLists.txt
Modified: trunk/krusader_kde4/INSTALL
===================================================================
--- trunk/krusader_kde4/INSTALL 2008-10-07 09:15:20 UTC (rev 6108)
+++ trunk/krusader_kde4/INSTALL 2008-10-22 15:06:35 UTC (rev 6109)
@@ -227,6 +227,11 @@
* kdebase
* ... (TODO: check if this list is complete)
+- In order to have the icon in the krusader executable, download
+ png2ico (from http://winterdrache.de/freeware/png2ico/) and put
+ png2ico.exe to c:\kde4\bin (If you skip this step, krusader will
+ compile fine it will only miss the application icon )
+
- Create the source directory for krusader and checked out svn
(you can use TortoiseSVN for that http://tortoisesvn.net/)
In this example, c:/kde4/src/krusader_kde4 was used.
@@ -248,20 +253,24 @@
it is necessary to replace it manually to c:/kde4.
- Run cmake in the build directory with the following parameters:
- c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4 -DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include -DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4 -DCMAKE_BUILD_TYPE=debugful
+ c:\kde4\bin\cmake.exe -G "MinGW Makefiles" c:/kde4/src/krusader_kde4 -DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include -DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4 -DCMAKE_BUILD_TYPE=debugfull -DCMAKE_PREFIX_PATH=c:/kde4;c:/MinGW
+ If you want to use eclipse IDE, you may want to run instead:
+ c:\kde4\bin\cmake.exe -G "Eclipse CDT4 - MinGW Makefiles" c:/krusader/src/krusader_kde4 -DCMAKE_INSTALL_PREFIX=c:/kde4 -DCMAKE_INCLUDE_PATH=c:/kde4/include -DCMAKE_LIBRARY_PATH=c:/kde4/lib -DKDEWIN_DIR:PATH=c:/kde4 -DCMAKE_BUILD_TYPE=debugfull -DCMAKE_PREFIX_PATH=c:/kde4;c:/MinGW
+ and in Eclipse with C++ development tools 4 rigth click in the Project Explorer, choose Import...,
+ select "General->Existing projects into workspace" and choose the c:/kde4/build/krusader_kde4 directory.
+
- Run make from mingw:
C:\MinGW\bin\mingw32-make.exe install
-- Run krusader.exe and enjoy!
+- Run krusader.exe (or choose it from the start menu) and enjoy!
-- Known severe run-time problems on windows at the moment (19 Jun 2008):
- + Konfigurator crashes (launched even in the first run)
- + Slow start before the splashscreen appears
- + If C: is put to the location bar, you get incorrect content of panel.
- Using file:///C:/ is more reliable
- + Not possible to navigate inside ftp
- + ...
+- Known problems on windows at the moment (22 Oct 2008):
+ + Archives don't work
+ + The media button does not work (seems to be a problem in KDEwin libraries, it used to work)
+ + Most external tools don't work
+ + No support of "My Computer" yet (It is planned to be supported by kdelibs in the future)
+ + Many useful kio slaves missing (KDE issue)
FYI
Modified: trunk/krusader_kde4/krusader/CMakeLists.txt
===================================================================
--- trunk/krusader_kde4/krusader/CMakeLists.txt 2008-10-07 09:15:20 UTC (rev 6108)
+++ trunk/krusader_kde4/krusader/CMakeLists.txt 2008-10-22 15:06:35 UTC (rev 6109)
@@ -38,6 +38,8 @@
qt4_add_dbus_adaptor(krusader_SRCS org.krusader.Instance.xml krusader.h Krusader)
+kde4_add_app_icon(krusader_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-krusader_user.png")
+
kde4_add_executable(krusader ${krusader_SRCS})
target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-10-07 09:16:24
|
Revision: 6108
http://krusader.svn.sourceforge.net/krusader/?rev=6108&view=rev
Author: vaclavjuza
Date: 2008-10-07 09:15:20 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
FIXED: handling the root folder under Windows
Modified Paths:
--------------
trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp
Modified: trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-10-05 18:02:44 UTC (rev 6107)
+++ trunk/krusader_kde4/krusader/VFS/normal_vfs.cpp 2008-10-07 09:15:20 UTC (rev 6108)
@@ -71,6 +71,12 @@
bool normal_vfs::populateVfsList(const KUrl& origin, bool showHidden){
QString path = origin.path(KUrl::RemoveTrailingSlash);
+#ifdef Q_WS_WIN
+ if(! path.contains("/"))
+ { //change C: to C:/
+ path = path + QString( "/" );
+ }
+#endif
// set the writable attribute to true, if that's not the case - the KIO job
// will give the warnings and errors
@@ -81,7 +87,8 @@
// set the origin...
vfs_origin = origin;
- vfs_origin.adjustPath(KUrl::RemoveTrailingSlash);
+ vfs_origin.setPath(path);
+ //vfs_origin.adjustPath(KUrl::RemoveTrailingSlash);
vfs_origin.setProtocol("file"); // do not remove !
vfs_origin.cleanPath();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-10-05 18:07:15
|
Revision: 6107
http://krusader.svn.sourceforge.net/krusader/?rev=6107&view=rev
Author: ckarai
Date: 2008-10-05 18:02:44 +0000 (Sun, 05 Oct 2008)
Log Message:
-----------
Keyboard handling for QueueManager
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
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/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-10-04 15:32:05 UTC (rev 6106)
+++ trunk/krusader_kde4/ChangeLog 2008-10-05 18:02:44 UTC (rev 6107)
@@ -1,4 +1,4 @@
- ADDED: enqueue operation for copy / move (with an almost finished gui)
+ ADDED: enqueue operation for copy / move
ADDED: Konfigurator mouse selection mode: Possibility to select a predefined
mode and change a detail.
ADDED: [ 1704953 ] highlight quick search match
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-10-04 15:32:05 UTC (rev 6106)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-10-05 18:02:44 UTC (rev 6107)
@@ -117,6 +117,8 @@
grid_time->addWidget( _timeEdit, 1, 0 );
mainWidget->setLayout( grid_time );
setMainWidget( mainWidget );
+
+ _timeEdit->setFocus();
}
QTime getStartTime() { return _timeEdit->time(); }
@@ -174,13 +176,13 @@
_newTabButton = new QToolButton( this );
_newTabButton->setIcon( KIcon( "tab-new" ) );
- _newTabButton->setToolTip( i18n( "Create a new queue" ) );
+ _newTabButton->setToolTip( i18n( "Create a new queue (Ctrl+T)" ) );
connect( _newTabButton, SIGNAL( clicked() ), this, SLOT( slotNewTab() ) );
hbox2->addWidget( _newTabButton );
_closeTabButton = new QToolButton( this );
_closeTabButton->setIcon( KIcon( "tab-close" ) );
- _closeTabButton->setToolTip( i18n( "Remove the current queue" ) );
+ _closeTabButton->setToolTip( i18n( "Remove the current queue (Ctrl+W)" ) );
connect( _closeTabButton, SIGNAL( clicked() ), this, SLOT( slotDeleteCurrentTab() ) );
hbox2->addWidget( _closeTabButton );
@@ -199,7 +201,7 @@
_scheduleButton = new QToolButton( this );
_scheduleButton->setIcon( KIcon( "chronometer" ) );
- _scheduleButton->setToolTip( i18n( "Schedule queue starting" ) );
+ _scheduleButton->setToolTip( i18n( "Schedule queue starting (Ctrl+S)" ) );
connect( _scheduleButton, SIGNAL( clicked() ), this, SLOT( slotScheduleClicked() ) );
hbox2->addWidget( _scheduleButton );
@@ -241,6 +243,7 @@
connect( QueueManager::instance(), SIGNAL( percent( Queue *, int ) ), this, SLOT( slotPercentChanged( Queue *, int ) ) );
show();
+ _queueWidget->currentWidget()->setFocus();
_queueDialog = this;
}
@@ -258,8 +261,10 @@
_queueDialog = new QueueDialog();
else {
_queueDialog->show();
- _queueDialog->raise();
- _queueDialog->activateWindow();
+ if( !autoHide ) {
+ _queueDialog->raise();
+ _queueDialog->activateWindow();
+ }
}
if( !autoHide )
_queueDialog->_autoHide = false;
@@ -335,7 +340,7 @@
{
if( currentQueue->isSuspended() ) {
_pauseButton->setIcon( KIcon( "media-playback-start" ) );
- _pauseButton->setToolTip( i18n( "Start processing the queue" ) );
+ _pauseButton->setToolTip( i18n( "Start processing the queue (Ctrl+P)" ) );
QTime time = currentQueue->scheduleTime();
if( time.isNull() )
_statusLabel->setText( i18n( "The queue is paused." ) );
@@ -345,7 +350,7 @@
} else {
_statusLabel->setText( i18n( "The queue is running." ) );
_pauseButton->setIcon( KIcon( "media-playback-pause" ) );
- _pauseButton->setToolTip( i18n( "Pause processing the queue" ) );
+ _pauseButton->setToolTip( i18n( "Pause processing the queue (Ctrl+P)" ) );
}
_closeTabButton->setEnabled( _queueWidget->count() > 1 );
@@ -436,4 +441,79 @@
break;
}
}
+}
+
+void QueueDialog::keyPressEvent(QKeyEvent *ke)
+{
+ switch( ke->key() )
+ {
+ case Qt::Key_T :
+ {
+ if ( ke->modifiers() == Qt::ControlModifier )
+ {
+ slotNewTab();
+ return;
+ }
+ }
+ break;
+ case Qt::Key_W :
+ {
+ if ( ke->modifiers() == Qt::ControlModifier )
+ {
+ slotDeleteCurrentTab();
+ return;
+ }
+ }
+ break;
+ case Qt::Key_S :
+ {
+ if ( ke->modifiers() == Qt::ControlModifier )
+ {
+ slotScheduleClicked();
+ return;
+ }
+ }
+ break;
+ case Qt::Key_Right :
+ {
+ if ( ke->modifiers() == Qt::ShiftModifier )
+ {
+ int curr = _queueWidget->currentIndex();
+ curr = ( curr + 1 ) % _queueWidget->count();
+ _queueWidget->setCurrentIndex( curr );
+ return;
+ }
+ }
+ break;
+ case Qt::Key_Left :
+ {
+ if ( ke->modifiers() == Qt::ShiftModifier )
+ {
+ int curr = _queueWidget->currentIndex();
+ curr = ( curr + _queueWidget->count() - 1 ) % _queueWidget->count();
+ _queueWidget->setCurrentIndex( curr );
+ return;
+ }
+ }
+ break;
+ case Qt::Key_P :
+ {
+ if ( ke->modifiers() == Qt::ControlModifier )
+ {
+ slotPauseClicked();
+ return;
+ }
+ }
+ break;
+ case Qt::Key_Delete :
+ {
+ if( ke->modifiers() == 0 )
+ {
+ _queueWidget->deleteCurrent();
+ return;
+ }
+ }
+ break;
+ }
+ QDialog::keyPressEvent( ke );
}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-10-04 15:32:05 UTC (rev 6106)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-10-05 18:02:44 UTC (rev 6107)
@@ -69,6 +69,7 @@
virtual void paintEvent ( QPaintEvent * event );
virtual void mousePressEvent(QMouseEvent *me);
virtual void mouseMoveEvent(QMouseEvent *me);
+ virtual void keyPressEvent(QKeyEvent *ke);
void saveSettings();
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-04 15:32:05 UTC (rev 6106)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-05 18:02:44 UTC (rev 6107)
@@ -66,6 +66,20 @@
setCurrentWidget( queueWidget );
}
+void QueueWidget::deleteCurrent()
+{
+ QWidget * current = currentWidget();
+ if( current )
+ {
+ KrQueueListWidget * lw = (KrQueueListWidget *)current;
+ QListWidgetItem * lvitem = lw->currentItem();
+ if( lvitem == 0 )
+ lvitem = lw->item( 0 );
+ if( lvitem )
+ lw->deleteItem( lvitem );
+ }
+}
+
class KrQueueListWidgetItem : public QListWidgetItem
{
public:
@@ -116,17 +130,21 @@
QAction * res = popup.exec( QCursor::pos() );
if( res == actDelete )
- {
- if( kitem->job()->isStarted() )
- {
- if( KMessageBox::warningContinueCancel(this,
- i18n("Deleting this job will abort the pending job. Do you wish to continue?"),
- i18n("Warning") ) != KMessageBox::Continue )
- return;
- }
- if( kitem->job() )
- _queue->remove( kitem->job() );
- }
+ deleteItem( kitem );
}
}
-}
\ No newline at end of file
+}
+
+void KrQueueListWidget::deleteItem( QListWidgetItem * item )
+{
+ KrQueueListWidgetItem * kitem = (KrQueueListWidgetItem * )item;
+ if( kitem->job() && kitem->job()->isStarted() )
+ {
+ if( KMessageBox::warningContinueCancel(this,
+ i18n("Deleting this job will abort the pending job. Do you wish to continue?"),
+ i18n("Warning") ) != KMessageBox::Continue )
+ return;
+ }
+ if( kitem->job() )
+ _queue->remove( kitem->job() );
+}
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.h 2008-10-04 15:32:05 UTC (rev 6106)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.h 2008-10-05 18:02:44 UTC (rev 6107)
@@ -15,6 +15,8 @@
QueueWidget( QWidget * parent = 0 );
~QueueWidget();
+ void deleteCurrent();
+
protected slots:
void slotQueueAdded( Queue * );
void slotQueueDeleted( Queue * );
@@ -34,6 +36,7 @@
public:
KrQueueListWidget( Queue * queue, QWidget * parent );
Queue * queue() { return _queue; }
+ void deleteItem( QListWidgetItem * item );
public slots:
void slotChanged();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-10-04 15:32:18
|
Revision: 6106
http://krusader.svn.sourceforge.net/krusader/?rev=6106&view=rev
Author: ckarai
Date: 2008-10-04 15:32:05 +0000 (Sat, 04 Oct 2008)
Log Message:
-----------
QueueManager: queues are saved at exit
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
trunk/krusader_kde4/krusader/Queue/queue_mgr.h
trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
trunk/krusader_kde4/krusader/krusader.cpp
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-10-04 12:06:13 UTC (rev 6105)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-10-04 15:32:05 UTC (rev 6106)
@@ -2,26 +2,74 @@
#include "queuedialog.h"
#include "queue.h"
#include <QList>
+#include <QVariant>
#include <klocale.h>
+#include "../krusader.h"
const QString QueueManager::defaultName=i18n( "default" );
QMap<QString, Queue*> QueueManager::_queues;
Queue * QueueManager::_current=0;
QueueManager * QueueManager::_self = 0;
+int QueueManager::_nextId = 1;
QueueManager::QueueManager()
{
_self = this;
- createQueue( defaultName );
+ QStringList queues;
+ queues << defaultName;
+ int current = 0;
+ KConfigGroup group( krConfig, "QueueManager");
+ queues = group.readEntry( "Queues", queues );
+ current = group.readEntry( "Active", current );
+
+ if( queues.count() == 0 )
+ queues << defaultName;
+
+ Queue *queueArray [ queues.count() ];
+
+ int counter = 0;
+ foreach( QString queueName, queues )
+ queueArray[ counter++ ] = createQueue( queueName );
+
+ if( current < queues.count() )
+ setCurrentQueue( queueArray[ current ] );
+ else
+ setCurrentQueue( queueArray[ 0 ] );
}
QueueManager::~QueueManager()
{
+ QList<int> idList;
+ QStringList nameList;
+ int currentId = 0;
QMap<QString, Queue*>::iterator it;
- for (it = _queues.begin(); it != _queues.end(); ++it )
- delete it.value();
+ for (it = _queues.begin(); it != _queues.end(); ++it ) {
+ QString name = it.key();
+ int id = (*it)->property( "QueueID" ).toInt();
+ if( (*it) == currentQueue() )
+ currentId = id;
+
+ int pos = 0;
+ while( pos < idList.count() && idList[ pos ] < id )
+ pos++;
+ idList.insert( pos, id );
+ nameList.insert( pos, name );
+
+ delete it.value();
+ }
_queues.clear();
QueueDialog::deleteDialog();
+
+ KConfigGroup group( krConfig, "QueueManager");
+ group.writeEntry( "Queues", nameList );
+ int active = 0;
+ for( int p=0; p < idList.count(); p++ )
+ if( idList[ p ] == currentId )
+ {
+ active = p;
+ break;
+ }
+ group.writeEntry( "Active", active );
}
Queue* QueueManager::queue(const QString& queueName)
@@ -43,6 +91,9 @@
void QueueManager::setCurrentQueue(Queue * queue)
{
+ if( queue == 0 )
+ return;
+
if (_queues.contains(queue->name())) {
_current = queue;
_self->emit currentChanged( queue );
@@ -72,6 +123,8 @@
if( _queues.contains( queueName ) )
return 0;
Queue *queue = new Queue(queueName);
+ int id = _nextId++;
+ queue->setProperty( "QueueID", QVariant( id ) );
connect( queue, SIGNAL( showQueueDialog() ), _self, SLOT( slotShowQueueDialog() ) );
connect( queue, SIGNAL( emptied() ), _self, SLOT( slotQueueEmptied() ) );
connect( queue, SIGNAL( percent( Queue *, int ) ), _self, SIGNAL( percent( Queue *, int ) ) );
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.h 2008-10-04 12:06:13 UTC (rev 6105)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.h 2008-10-04 15:32:05 UTC (rev 6106)
@@ -43,6 +43,7 @@
static QMap<QString, Queue*> _queues;
static Queue * _current;
static QueueManager * _self;
+ static int _nextId;
};
#endif // QUEUE_MGR_H
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-04 12:06:13 UTC (rev 6105)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-04 15:32:05 UTC (rev 6106)
@@ -18,6 +18,7 @@
connect( QueueManager::instance(), SIGNAL( queueInserted( Queue * ) ), this, SLOT( slotQueueAdded( Queue * ) ) );
connect( QueueManager::instance(), SIGNAL( queueDeleted( Queue * ) ), this, SLOT( slotQueueDeleted( Queue * ) ) );
connect( QueueManager::instance(), SIGNAL( currentChanged( Queue * ) ), this, SLOT( slotCurrentChanged( Queue * ) ) );
+ connect( this, SIGNAL( currentChanged ( int ) ), this, SLOT( slotCurrentChanged ( int ) ) );
Queue * current = QueueManager::currentQueue();
if( current )
@@ -25,8 +26,6 @@
QString name = current->name();
setCurrentWidget( _queueWidgets[ name ] );
}
-
- connect( this, SIGNAL( currentChanged ( int ) ), this, SLOT( slotCurrentChanged ( int ) ) );
}
Modified: trunk/krusader_kde4/krusader/krusader.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krusader.cpp 2008-10-04 12:06:13 UTC (rev 6105)
+++ trunk/krusader_kde4/krusader/krusader.cpp 2008-10-04 15:32:05 UTC (rev 6106)
@@ -440,11 +440,11 @@
}
Krusader::~Krusader() {
+ delete queueManager;
if( !isExiting ) // save the settings if it was not saved (SIGTERM)
saveSettings();
delete mainView;
- delete queueManager;
mainView = 0;
App = 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-10-04 12:06:26
|
Revision: 6105
http://krusader.svn.sourceforge.net/krusader/?rev=6105&view=rev
Author: ckarai
Date: 2008-10-04 12:06:13 +0000 (Sat, 04 Oct 2008)
Log Message:
-----------
ToolTip for QueueManager
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp
trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-03 17:08:36 UTC (rev 6104)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-04 12:06:13 UTC (rev 6105)
@@ -71,7 +71,10 @@
{
public:
KrQueueListWidgetItem( const QString & label_, KIOJobWrapper * job_ ) :
- QListWidgetItem( label_ ), _job( job_ ) {}
+ QListWidgetItem( label_ ), _job( job_ )
+ {
+ setToolTip( job_->toolTip() );
+ }
KIOJobWrapper * job() { return _job; }
Modified: trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp 2008-10-03 17:08:36 UTC (rev 6104)
+++ trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp 2008-10-04 12:06:13 UTC (rev 6105)
@@ -40,6 +40,7 @@
#include <iostream>
#include <klocale.h>
#include "virtualcopyjob.h"
+#include <QTextDocument>
class JobStartEvent : public QEvent {
public:
@@ -210,4 +211,19 @@
void KIOJobWrapper::abort() {
if( m_job )
m_job->kill();
-}
\ No newline at end of file
+}
+
+QString KIOJobWrapper::toolTip() {
+ QString tip = "<qt><div align=\"center\">";
+ tip += "<h3>" + Qt::escape( typeStr() ) + "</h3>";
+ tip += "<table frame=\"box\" border=\"1\"><tbody>";
+ tip += "<tr><td>" + Qt::escape( i18n( "Target" ) ) + "</td><td>" + Qt::escape( url().prettyUrl() ) + "</td></tr>";
+ tip += "<tr><td>" + Qt::escape( i18n( "Source" ) ) + "</td><td>";
+ foreach( KUrl urlIn, urlList() ) {
+ tip += "<li>" + Qt::escape( urlIn.prettyUrl() ) + "</li>";
+ }
+ tip += "</td></tr>";
+ tip += "</tbody></table>";
+ tip += "</div></qt>";
+ return tip;
+}
Modified: trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h 2008-10-03 17:08:36 UTC (rev 6104)
+++ trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h 2008-10-04 12:06:13 UTC (rev 6105)
@@ -93,6 +93,8 @@
KIOJobWrapperType type() { return m_type; }
QString typeStr();
KUrl url() { return m_url; }
+ KUrl::List urlList() { return m_urlList; }
+ QString toolTip();
static KIOJobWrapper * stat( KUrl &url );
static KIOJobWrapper * directorySize( KUrl &url );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-10-03 17:08:42
|
Revision: 6104
http://krusader.svn.sourceforge.net/krusader/?rev=6104&view=rev
Author: vaclavjuza
Date: 2008-10-03 17:08:36 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
i18n fixes II
Modified Paths:
--------------
trunk/krusader_kde4/krusader/main.cpp
Modified: trunk/krusader_kde4/krusader/main.cpp
===================================================================
--- trunk/krusader_kde4/krusader/main.cpp 2008-10-03 16:31:39 UTC (rev 6103)
+++ trunk/krusader_kde4/krusader/main.cpp 2008-10-03 17:08:36 UTC (rev 6104)
@@ -117,14 +117,14 @@
aboutData.addAuthor(ki18n("Karai Csaba"), ki18n("Developer"), "ck...@us...", 0);
aboutData.addAuthor(ki18n("Heiner Eichmann"), ki18n("Developer"), "h.e...@gm...", 0);
aboutData.addAuthor(ki18n("Jonas Bähr"), ki18n("Developer"), "jon...@we...", 0);
- aboutData.addAuthor(ki18n("Václav Juza"), ki18n("Developer"), "vac...@gm...", 0);
+ aboutData.addAuthor(ki18n("Václav Jůza"), ki18n("Developer"), "vac...@gm...", 0);
aboutData.addAuthor(ki18n("Dirk Eschler"), ki18n("Webmaster and i18n coordinator"), "des...@us...", 0);
aboutData.addAuthor(ki18n("Frank Schoolmeesters"), ki18n("Documentation and marketing coordinator"), "fra...@ya...", 0);
aboutData.addAuthor(ki18n("Richard Holt"), ki18n("Documentation & Proofing"), "ric...@gm...", 0);
aboutData.addAuthor(ki18n("Matej Urbancic"), ki18n("Marketing & Product Research"), "mat...@gm...", 0);
- aboutData.addCredit(ki18n("Václav Juza"), ki18n("QA, bug-hunting, patches and general help"), "vac...@gm...", 0);
- aboutData.addCredit(ki18n("Jiri Palecek"), ki18n("QA, bug-hunting, patches and general help"), "jpa...@we...", 0);
- aboutData.addCredit(ki18n("Jiri Klement"),ki18n("Important help in KDE 4 porting"),0,0);
+ aboutData.addCredit(ki18n("Václav Jůza"), ki18n("QA, bug-hunting, patches and general help"), "vac...@gm...", 0);
+ aboutData.addCredit(ki18n("Jiří Paleček"), ki18n("QA, bug-hunting, patches and general help"), "jpa...@we...", 0);
+ aboutData.addCredit(ki18n("Jiří Klement"),ki18n("Important help in KDE 4 porting"),0,0);
aboutData.addCredit(ki18n("Andrew Neupokoev"), ki18n("Killer Logo and Icons for Krusader (contest winner)"), "doo...@ya...", 0);
aboutData.addCredit(ki18n("The UsefulArts Organization"), ki18n("Icon for krusader"), "mail@usefularts.rg", 0);
aboutData.addCredit(ki18n("Gábor Lehel"), ki18n("Viewer module for 3rd Hand"), "ill...@gm...", 0);
@@ -144,7 +144,7 @@
aboutData.addCredit(ki18n("Jinghua Luo"),ki18n("Chinese Simplified translation"),"luo...@ms...",0);
aboutData.addCredit(ki18n("Mitek"),ki18n("Old Czech translation"),"mi...@em...",0);
aboutData.addCredit(ki18n("Martin Sixta"),ki18n("Old Czech translation"),"luk...@se...",0);
- aboutData.addCredit(ki18n("Vaclav Juza"),ki18n("Czech translation"),"Vac...@gm...",0);
+ aboutData.addCredit(ki18n("Vaclav Jůza"),ki18n("Czech translation"),"Vac...@gm...",0);
aboutData.addCredit(ki18n("Anders Bruun Olsen"), ki18n("Old Danish translation"), "an...@br...", 0);
aboutData.addCredit(ki18n("Peter H. Sorensen"), ki18n("Danish translation"), "pe...@sk...", 0);
aboutData.addCredit(ki18n("Frank Schoolmeesters"),ki18n("Dutch translation"),"fra...@ya...",0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <des...@us...> - 2008-10-03 16:31:56
|
Revision: 6103
http://krusader.svn.sourceforge.net/krusader/?rev=6103&view=rev
Author: deschler
Date: 2008-10-03 16:31:39 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-10-03 16:30:17 UTC (rev 6102)
+++ trunk/krusader_kde4/ChangeLog 2008-10-03 16:31:39 UTC (rev 6103)
@@ -41,6 +41,7 @@
FIXED: Do not duplicate menu entries in UserAction menu while still not crashing when
configuring toolbars.
+ I18N: Updated German translation
I18N: Updated Dutch translation
I18N: Updated Czech translation
I18N: Updated Ukrainian translation (thanks Yuri Chornoivan)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <des...@us...> - 2008-10-03 16:30:23
|
Revision: 6102
http://krusader.svn.sourceforge.net/krusader/?rev=6102&view=rev
Author: deschler
Date: 2008-10-03 16:30:17 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/krusader_kde4/po/de.po
Modified: trunk/krusader_kde4/po/de.po
===================================================================
--- trunk/krusader_kde4/po/de.po 2008-10-03 16:04:51 UTC (rev 6101)
+++ trunk/krusader_kde4/po/de.po 2008-10-03 16:30:17 UTC (rev 6102)
@@ -4,22 +4,22 @@
# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package
#
+#
# Christoph Thielecke <cri...@gm...>, 2003.
# Dirk Eschler <des...@us...>, 2003, 2004, 2005, 2006, 2007, 2008.
-#
msgid ""
msgstr ""
-"Project-Id-Version: krusader-2.0.0-beta1\n"
+"Project-Id-Version: krusader-1.70.0\n"
"Report-Msgid-Bugs-To: kru...@go...\n"
"POT-Creation-Date: 2008-09-22 20:47+0200\n"
-"PO-Revision-Date: 2007-03-27 16:13+0200\n"
+"PO-Revision-Date: 2008-10-03 18:29+0200\n"
"Last-Translator: Dirk Eschler <des...@us...>\n"
-"Language-Team: German <kru...@go...>\n"
+"Language-Team: krusader-i18n <kru...@go...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: GUI/dirhistorybutton.cpp:36 GUI/dirhistorybutton.cpp:37
#, kde-format
@@ -93,24 +93,24 @@
msgstr "Diskette"
#: GUI/mediabutton.cpp:179
-#, fuzzy, kde-format
+#, kde-format
msgid "CD/DVD-ROM"
-msgstr "CD-ROM"
+msgstr "CD/DVD-ROM"
#: GUI/mediabutton.cpp:181
#, kde-format
msgid "USB pen drive"
-msgstr ""
+msgstr "USB-Stick"
#: GUI/mediabutton.cpp:183
#, kde-format
msgid "USB device"
-msgstr ""
+msgstr "USB-Gerät"
#: GUI/mediabutton.cpp:185
#, kde-format
msgid "Removable media"
-msgstr ""
+msgstr "Wechseldatenträger"
#: GUI/mediabutton.cpp:187
#, kde-format
@@ -118,24 +118,24 @@
msgstr "Festplatte"
#: GUI/mediabutton.cpp:189
-#, fuzzy, kde-format
+#, kde-format
msgid "Camera"
-msgstr "Name"
+msgstr "Kamera"
#: GUI/mediabutton.cpp:191
#, kde-format
msgid "Video CD/DVD-ROM"
-msgstr ""
+msgstr "Video-CD/DVD-ROM"
#: GUI/mediabutton.cpp:193
#, kde-format
msgid "Audio CD/DVD-ROM"
-msgstr ""
+msgstr "Audio-CD/DVD-ROM"
#: GUI/mediabutton.cpp:195
#, kde-format
msgid "Recordable CD/DVD-ROM"
-msgstr ""
+msgstr "Beschreibbare CD/DVD-ROM"
#: GUI/mediabutton.cpp:325 Panel/krpopupmenu.cpp:69
#: BookMan/krbookmarkhandler.cpp:557
@@ -169,12 +169,12 @@
#: GUI/mediabutton.cpp:423
#, kde-format
msgid "An error occurred while accessing '%1', the system responded: %2"
-msgstr ""
+msgstr "Beim Zugriff auf '%1' ist ein Fehler aufgetreten, die Systemnachricht lautet: %2"
#: GUI/mediabutton.cpp:426
#, kde-format
msgid "An error occurred while accessing '%1'"
-msgstr ""
+msgstr "Beim Zugriff auf '%1' ist ein Fehler aufgetreten"
#: GUI/syncbrowsebutton.cpp:45 GUI/syncbrowsebutton.cpp:48
#, kde-format
@@ -215,8 +215,7 @@
#: GUI/kcmdline.cpp:103 ActionMan/ui_actionproperty.h:698 rc.cpp:92
#, kde-format
msgid "Add <b>Placeholders</b> for the selected files in the panel."
-msgstr ""
-"<b>Platzhalter</b> für die im Dateifenster selektierten Dateien hinzufügen."
+msgstr "<b>Platzhalter</b> für die im Dateifenster selektierten Dateien hinzufügen."
#: GUI/kfnkeys.cpp:50
#, kde-format
@@ -400,16 +399,16 @@
#: VFS/preserveattrcopyjob.cpp:335 VFS/preserveattrcopyjob.cpp:342
#: VFS/preserveattrcopyjob.cpp:349 VFS/preserveattrcopyjob.cpp:373
#: VFS/virtualcopyjob.cpp:384 VFS/virtualcopyjob.cpp:390
-#, fuzzy, kde-format
+#, kde-format
msgid "Source"
-msgstr "Quelle:"
+msgstr "Quelle"
#: VFS/preserveattrcopyjob.cpp:336 VFS/preserveattrcopyjob.cpp:343
#: VFS/preserveattrcopyjob.cpp:350 VFS/preserveattrcopyjob.cpp:374
#: VFS/virtualcopyjob.cpp:385 VFS/virtualcopyjob.cpp:391
-#, fuzzy, kde-format
+#, kde-format
msgid "Destination"
-msgstr "Ziel:"
+msgstr "Ziel"
#: VFS/preserveattrcopyjob.cpp:341 VFS/preserveattrcopyjob.cpp:348
#: VFS/preserveattrcopyjob.cpp:372 VFS/virtualcopyjob.cpp:383
@@ -432,9 +431,9 @@
msgstr "Verzeichnis"
#: VFS/preserveattrcopyjob.cpp:793
-#, fuzzy, kde-format
+#, kde-format
msgid "Folder Already Exists"
-msgstr "Die Datei existiert bereits"
+msgstr "Das Verzeichnis existiert bereits"
#: VFS/preserveattrcopyjob.cpp:1074 VFS/preserveattrcopyjob.cpp:1594
#: Synchronizer/synchronizer.cpp:1171 Synchronizer/synchronizer.cpp:1181
@@ -443,9 +442,9 @@
msgstr "Die Datei existiert bereits"
#: VFS/preserveattrcopyjob.cpp:1074 VFS/preserveattrcopyjob.cpp:1594
-#, fuzzy, kde-format
+#, kde-format
msgid "Already Exists as Folder"
-msgstr "Die Datei existiert bereits"
+msgstr "Existiert bereits als Verzeichnis"
#: VFS/normal_vfs.cpp:91
#, kde-format
@@ -492,8 +491,7 @@
#: VFS/virt_vfs.cpp:180
#, kde-format
msgid "Creating new directories is allowed only in the 'virt:/' directory."
-msgstr ""
-"Das Erstellen neuer Verzeichnisse ist nur im 'virt:/'-Verzeichnis erlaubt."
+msgstr "Das Erstellen neuer Verzeichnisse ist nur im 'virt:/'-Verzeichnis erlaubt."
#: VFS/kiojobwrapper.cpp:179 Konfigurator/krresulttable.cpp:305
#, kde-format
@@ -501,19 +499,19 @@
msgstr "Status"
#: VFS/kiojobwrapper.cpp:181
-#, fuzzy, kde-format
+#, kde-format
msgid "Directory Size"
-msgstr "Verzeichnisse"
+msgstr "Verzeichnisgröße"
#: VFS/kiojobwrapper.cpp:184
-#, fuzzy, kde-format
+#, kde-format
msgid "Copy"
-msgstr " Kopieren"
+msgstr "Kopieren"
#: VFS/kiojobwrapper.cpp:187
-#, fuzzy, kde-format
+#, kde-format
msgid "Move"
-msgstr " Verschieben"
+msgstr "Verschieben"
#: VFS/krquery.cpp:159 Filter/generalfilter.cpp:142
#: Konfigurator/konfigurator.cpp:159
@@ -667,33 +665,31 @@
#: Filter/generalfilter.cpp:56
msgid "Any Character"
-msgstr ""
+msgstr "Jedes Zeichen"
#: Filter/generalfilter.cpp:57
-#, fuzzy
msgid "Start of Line"
-msgstr "Startprofil:"
+msgstr "Zeilenanfang"
#: Filter/generalfilter.cpp:58
msgid "End of Line"
-msgstr ""
+msgstr "Zeilenende"
#: Filter/generalfilter.cpp:59
msgid "Set of Characters"
-msgstr ""
+msgstr "Zeichengruppe"
#: Filter/generalfilter.cpp:60
msgid "Repeats, Zero or More Times"
-msgstr ""
+msgstr "Wiederholt sich, keinmal oder mehrmals"
#: Filter/generalfilter.cpp:61
msgid "Repeats, One or More Times"
-msgstr ""
+msgstr "Wiederholt sich, einmal oder mehrmals"
#: Filter/generalfilter.cpp:62
-#, fuzzy
msgid "Optional"
-msgstr "&Optionen"
+msgstr "Optional"
#: Filter/generalfilter.cpp:63
msgid "Escape"
@@ -701,26 +697,23 @@
#: Filter/generalfilter.cpp:64
msgid "TAB"
-msgstr ""
+msgstr "TAB"
#: Filter/generalfilter.cpp:65
-#, fuzzy
msgid "Newline"
-msgstr "Neue Verknüpfung"
+msgstr "Neue Zeile"
#: Filter/generalfilter.cpp:66
msgid "Carriage Return"
-msgstr ""
+msgstr "Wagenrücklauf"
#: Filter/generalfilter.cpp:67
-#, fuzzy
msgid "White Space"
-msgstr "Weiß"
+msgstr "Leerzeichen"
#: Filter/generalfilter.cpp:68
-#, fuzzy
msgid "Digit"
-msgstr "Rechts"
+msgstr "Zahl"
#: Filter/generalfilter.cpp:101
#, kde-format
@@ -837,12 +830,12 @@
#: Filter/generalfilter.cpp:265
#, kde-format
msgid "RegExp"
-msgstr ""
+msgstr "RegExp"
#: Filter/generalfilter.cpp:286
-#, fuzzy, kde-format
+#, kde-format
msgid "Encoding:"
-msgstr "Wird bearbeitet"
+msgstr "Kodierung:"
#: Filter/generalfilter.cpp:301
#, kde-format
@@ -1614,8 +1607,7 @@
#: UserAction/kraction.cpp:224
#, kde-format
-msgid ""
-"Embedded terminal emulator does not work, using output collection instead."
+msgid "Embedded terminal emulator does not work, using output collection instead."
msgstr ""
"Der eingebettete Terminal-Emulator funktioniert nicht, stattdessen werden "
"die Ausgaben eingefangen."
@@ -1833,8 +1825,7 @@
#: Panel/listpanel.cpp:759
#, kde-format
msgid "Can't drop here, no write permissions."
-msgstr ""
-"Aufgrund mangelnder Schreibberechtigung kann hier nichts abgelegt werden."
+msgstr "Aufgrund mangelnder Schreibberechtigung kann hier nichts abgelegt werden."
#: Panel/listpanel.cpp:785 Panel/panelpopup.cpp:112
#, kde-format
@@ -2271,8 +2262,7 @@
#: Panel/panelfunc.cpp:385
#, kde-format
msgid "No permissions to edit this file."
-msgstr ""
-"Sie verfügen nicht über die nötigen Rechte, um diese Datei zu editieren."
+msgstr "Sie verfügen nicht über die nötigen Rechte, um diese Datei zu editieren."
#: Panel/panelfunc.cpp:406
#, kde-format
@@ -2481,8 +2471,7 @@
#: Panel/panelfunc.cpp:1228
#, kde-format
msgid "Cannot cut a virtual URL collection to the clipboard!"
-msgstr ""
-"Virtuelle Elemente können nicht in die Zwischenablage ausgeschnitten werden!"
+msgstr "Virtuelle Elemente können nicht in die Zwischenablage ausgeschnitten werden!"
#: Panel/panelfunc.cpp:1230
#, kde-format
@@ -2492,7 +2481,7 @@
#: Queue/queue.cpp:55
#, kde-format
msgid "An error occurred during processing the queue.\n"
-msgstr ""
+msgstr "Bei der Abarbeitung der Warteschlange ist ein Fehler aufgetreten.\n"
#: Queue/queue.cpp:57
#, kde-format
@@ -2507,14 +2496,14 @@
msgstr ""
#: Queue/queue.cpp:60
-#, fuzzy, kde-format
+#, kde-format
msgid "Krusader::Queue"
-msgstr "Krusader::Lokalisieren"
+msgstr "Krusader::Queue"
#: Queue/queue.cpp:61
-#, fuzzy, kde-format
+#, kde-format
msgid "Suspend"
-msgstr "Anhängen"
+msgstr ""
#: Locate/locate.cpp:119 Locate/locate.cpp:123 Locate/locate.cpp:390
#, kde-format
@@ -3158,8 +3147,7 @@
#: KViewer/panelviewer.cpp:33
#, kde-format
msgid "No file selected or selected file can't be displayed."
-msgstr ""
-"Keine Datei ausgewählt oder ausgewählte Datei kann nicht angezeigt werden."
+msgstr "Keine Datei ausgewählt oder ausgewählte Datei kann nicht angezeigt werden."
#: KViewer/panelviewer.cpp:170 KViewer/krviewer.cpp:694
#, kde-format
@@ -3418,9 +3406,9 @@
msgstr "Erstellen in:"
#: BookMan/kraddbookmarkdlg.cpp:74
-#, fuzzy, kde-format
+#, kde-format
msgid "Folders"
-msgstr "Verzeichnis ..."
+msgstr "Verzeichnisse"
#: BookMan/kraddbookmarkdlg.cpp:118
#, kde-format
@@ -3468,7 +3456,7 @@
msgstr "MountMan ist nicht funktionstüchtig."
#: MountMan/kmountmangui.cpp:65
-#, fuzzy, kde-format
+#, kde-format
msgid "Mount.Man"
msgstr "MountMan"
@@ -3503,9 +3491,9 @@
msgstr "Frei %"
#: MountMan/kmountmangui.cpp:164
-#, fuzzy, kde-format
+#, kde-format
msgid "MountMan.Info"
-msgstr "MountMan"
+msgstr "MountMan.Info"
#: MountMan/kmountmangui.cpp:214 MountMan/kmountmangui.cpp:332
#, kde-format
@@ -3532,8 +3520,7 @@
#: MountMan/kmountmangui.cpp:364
#, kde-format
-msgid ""
-"MountMan has an internal error. Please notify the developers. Thank you."
+msgid "MountMan has an internal error. Please notify the developers. Thank you."
msgstr ""
"Interner Fehler in MountMan\n"
"Bitte benachrichtigen Sie die Entwickler"
@@ -3561,9 +3548,10 @@
"(c) 2000-2003, Shie Erlich, Rafi Yanai\n"
"(c) 2004-2008, Krusader Krew"
msgstr ""
+"(c) 2000-2003, Shie Erlich, Rafi Yanai\n"
+"(c) 2004-2008, Krusader Krew"
#: main.cpp:112
-#, fuzzy
msgid ""
"Feedback:\n"
"http://www.krusader.org/phpBB/\n"
@@ -3579,48 +3567,47 @@
#: main.cpp:115
msgid "Rafi Yanai"
-msgstr ""
+msgstr "Rafi Yanai"
#: main.cpp:115 main.cpp:116
-#, fuzzy
msgid "Author"
-msgstr "Std"
+msgstr "Autor"
#: main.cpp:116
msgid "Shie Erlich"
-msgstr ""
+msgstr "Shie Erlich"
#: main.cpp:117
msgid "Karai Csaba"
-msgstr ""
+msgstr "Karai Csaba"
#: main.cpp:117 main.cpp:118 main.cpp:119 main.cpp:120
msgid "Developer"
-msgstr ""
+msgstr "Entwickler"
#: main.cpp:118
msgid "Heiner Eichmann"
-msgstr ""
+msgstr "Heiner Eichmann"
#: main.cpp:119
msgid "Jonas Baehr"
-msgstr ""
+msgstr "Jonas Bähr"
#: main.cpp:120 main.cpp:125
msgid "Václav Juza"
-msgstr ""
+msgstr "Václav Juza"
#: main.cpp:121 main.cpp:154
msgid "Dirk Eschler"
-msgstr ""
+msgstr "Dirk Eschler"
#: main.cpp:121
msgid "Webmaster and i18n coordinator"
-msgstr ""
+msgstr "Webmaster und i18n Koordinator"
#: main.cpp:122 main.cpp:150
msgid "Frank Schoolmeesters"
-msgstr ""
+msgstr "Frank Schoolmeesters"
#: main.cpp:122
msgid "Documentation and marketing coordinator"
@@ -3628,7 +3615,7 @@
#: main.cpp:123
msgid "Richard Holt"
-msgstr ""
+msgstr "Richard Holt"
#: main.cpp:123
msgid "Documentation & Proofing"
@@ -3636,7 +3623,7 @@
#: main.cpp:124 main.cpp:170
msgid "Matej Urbancic"
-msgstr ""
+msgstr "Matej Urbancic"
#: main.cpp:124
msgid " Marketing & Product Research"
@@ -3648,11 +3635,11 @@
#: main.cpp:126
msgid "Jiri Palecek"
-msgstr ""
+msgstr "Jiri Palecek"
#: main.cpp:127
msgid "Jiri Klement"
-msgstr ""
+msgstr "Jiri Klement"
#: main.cpp:127
msgid "Important help in KDE 4 porting"
@@ -3660,7 +3647,7 @@
#: main.cpp:128
msgid "Andrew Neupokoev"
-msgstr ""
+msgstr "Andrew Neupokoev"
#: main.cpp:128
msgid "Killer Logo and Icons for Krusader (contest winner)"
@@ -3668,16 +3655,15 @@
#: main.cpp:129
msgid "The UsefulArts Organization"
-msgstr ""
+msgstr "The UsefulArts Organization"
#: main.cpp:129
-#, fuzzy
msgid "Icon for krusader"
-msgstr "&Krusader einrichten ..."
+msgstr "Symbol für Krusader"
#: main.cpp:130
msgid "Gábor Lehel"
-msgstr ""
+msgstr "Gábor Lehel"
#: main.cpp:130
msgid "Viewer module for 3rd Hand"
@@ -3685,7 +3671,7 @@
#: main.cpp:131
msgid "Mark Eatough"
-msgstr ""
+msgstr "Mark Eatough"
#: main.cpp:131
msgid "Handbook Proof-Reader"
@@ -3693,7 +3679,7 @@
#: main.cpp:132
msgid "Jan Halasa"
-msgstr ""
+msgstr "Jan Halasa"
#: main.cpp:132
msgid "The old Bookmark Module"
@@ -3701,7 +3687,7 @@
#: main.cpp:133
msgid "Hans Loeffler"
-msgstr ""
+msgstr "Hans Loeffler"
#: main.cpp:133
msgid "Dir history button"
@@ -3709,7 +3695,7 @@
#: main.cpp:134
msgid "Szombathelyi György"
-msgstr ""
+msgstr "Szombathelyi György"
#: main.cpp:134
msgid "ISO KIO slave"
@@ -3717,147 +3703,143 @@
#: main.cpp:135
msgid "Jan Willem van de Meent (Adios)"
-msgstr ""
+msgstr "Jan Willem van de Meent (Adios)"
#: main.cpp:135
-#, fuzzy
msgid "Icons for Krusader"
-msgstr "&Krusader einrichten ..."
+msgstr "Symbole für Krusader"
#: main.cpp:136
msgid "Mikolaj Machowski"
-msgstr ""
+msgstr "Mikolaj Machowski"
#: main.cpp:136
msgid "Usability and QA"
-msgstr ""
+msgstr "Usability und QA"
#: main.cpp:137
msgid "Cristi Dumitrescu"
-msgstr ""
+msgstr "Cristi Dumitrescu"
#: main.cpp:138
msgid "Aurelien Gateau"
-msgstr ""
+msgstr "Aurelien Gateau"
#: main.cpp:138
-#, fuzzy
msgid "patch for KViewer"
-msgstr "Nach Dateien suchen"
+msgstr "Patch für KViewer"
#: main.cpp:139
msgid "Milan Brabec"
-msgstr ""
+msgstr "Milan Brabec"
#: main.cpp:139
msgid "the first patch ever !"
-msgstr ""
+msgstr "Der erste Patch überhaupt!"
#: main.cpp:140
msgid "Asim Husanovic"
-msgstr ""
+msgstr "Asim Husanovic"
#: main.cpp:140
msgid "Bosnian translation"
-msgstr ""
+msgstr "Bosnische Übersetzung"
#: main.cpp:141
msgid "Doutor Zero"
-msgstr ""
+msgstr "Doutor Zero"
#: main.cpp:141
msgid "Brazilian Portuguese"
-msgstr ""
+msgstr "Brazilianisches Portugiesisch Übersetzung"
#: main.cpp:142
msgid "Milen Ivanov"
-msgstr ""
+msgstr "Milen Ivanov"
#: main.cpp:142
msgid "Bulgarian translation"
-msgstr ""
+msgstr "Bulgarische Übersetzung"
#: main.cpp:143
msgid "Quim Perez"
-msgstr ""
+msgstr "Quim Perez"
#: main.cpp:143
msgid "Catalan translation"
-msgstr ""
+msgstr "Katalanische Übersetzung"
#: main.cpp:144
msgid "Jinghua Luo"
-msgstr ""
+msgstr "Jinghua Luo"
#: main.cpp:144
msgid "Chinese Simplified translation"
-msgstr ""
+msgstr "Chinesische (Simplified) Übersetzung"
#: main.cpp:145
-#, fuzzy
msgid "Mitek"
-msgstr "Titel"
+msgstr "Mitek"
#: main.cpp:145 main.cpp:146
msgid "Old Czech translation"
-msgstr ""
+msgstr "Alte tschechische Übersetzung"
#: main.cpp:146
msgid "Martin Sixta"
-msgstr ""
+msgstr "Martin Sixta"
#: main.cpp:147
msgid "Vaclav Juza"
-msgstr ""
+msgstr "Vaclav Juza"
#: main.cpp:147
msgid "Czech translation"
-msgstr ""
+msgstr "Tschechische Übersetzung"
#: main.cpp:148
msgid "Anders Bruun Olsen"
-msgstr ""
+msgstr "Anders Bruun Olsen"
#: main.cpp:148
msgid "Old Danish translation"
-msgstr ""
+msgstr "Alte dänische Übersetzung"
#: main.cpp:149
msgid "Peter H. Sorensen"
-msgstr ""
+msgstr "Peter H. Sorensen"
#: main.cpp:149
-#, fuzzy
msgid "Danish translation"
-msgstr "Ziel:"
+msgstr "Dänische Übersetzung"
#: main.cpp:150
msgid "Dutch translation"
-msgstr ""
+msgstr "Höllandische Übersetzung"
#: main.cpp:151
msgid "Rene-Pierre Lehmann"
-msgstr ""
+msgstr "Rene-Pierre Lehmann"
#: main.cpp:151
msgid "Old French translation"
-msgstr ""
+msgstr "Alte französische Übersetzung"
#: main.cpp:152
msgid "David Guillerm"
-msgstr ""
+msgstr "David Guillerm"
#: main.cpp:152
msgid "French translation"
-msgstr ""
+msgstr "Französische Übersetzung"
#: main.cpp:153
msgid "Christoph Thielecke"
-msgstr ""
+msgstr "Christoph Thielecke"
#: main.cpp:153
msgid "Old German translation"
-msgstr ""
+msgstr "Alte deutsche Übersetzung"
#: main.cpp:154
msgid "German translation"
@@ -3865,176 +3847,175 @@
#: main.cpp:155
msgid "Spiros Georgaras"
-msgstr ""
+msgstr "Spiros Georgaras"
#: main.cpp:155
msgid "Greek translation"
-msgstr ""
+msgstr "Griechische Übersetzung"
#: main.cpp:156
msgid "Kukk Zoltan"
-msgstr ""
+msgstr "Kukk Zoltan"
#: main.cpp:156
msgid "Old Hungarian translation"
-msgstr ""
+msgstr "Alte ungarische Übersetzung"
#: main.cpp:157
msgid "Arpad Biro"
-msgstr ""
+msgstr "Arpad Biro"
#: main.cpp:157
msgid "Hungarian translation"
-msgstr ""
+msgstr "Ungarische Übersetzung"
#: main.cpp:158
msgid "Giuseppe Bordoni"
-msgstr ""
+msgstr "Giuseppe Bordoni"
#: main.cpp:158
msgid "Italian translation"
-msgstr ""
+msgstr "Italienische Übersetzung"
#: main.cpp:159
msgid "Hideki Kimura"
-msgstr ""
+msgstr "Hideki Kimura"
#: main.cpp:159
msgid "Japanese translation"
-msgstr ""
+msgstr "Japanische Übersetzung"
#: main.cpp:160
msgid "UTUMI Hirosi"
-msgstr ""
+msgstr "UTUMI Hirosi"
#: main.cpp:160
msgid "Old Japanese translation"
-msgstr ""
+msgstr "Alte japanische Übersetzung"
#: main.cpp:161
msgid "Dovydas Sankauskas"
-msgstr ""
+msgstr "Dovydas Sankauskas"
#: main.cpp:161
msgid "Lithuanian translation"
-msgstr ""
+msgstr "Lithuanische Übersetzung"
#: main.cpp:162
msgid "Bruno Queiros"
-msgstr ""
+msgstr "Bruno Queiros"
#: main.cpp:162
-#, fuzzy
msgid "Portuguese translation"
-msgstr "Aktionen importieren"
+msgstr "Portugisische Übersetzung"
#: main.cpp:163
msgid "Lukasz Janyst"
-msgstr ""
+msgstr "Lukasz Janyst"
#: main.cpp:163
msgid "Old Polish translation"
-msgstr ""
+msgstr "Alte polnische Übersetzung"
#: main.cpp:164
msgid "Pawel Salawa"
-msgstr ""
+msgstr "Pawel Salawa"
#: main.cpp:164 main.cpp:165
msgid "Polish translation"
-msgstr ""
+msgstr "Polnische Übersetzung"
#: main.cpp:165
msgid "Tomek Grzejszczyk"
-msgstr ""
+msgstr "Tomek Grzejszczyk"
#: main.cpp:166
msgid "Dmitry A. Bugay"
-msgstr ""
+msgstr "Dmitry A. Bugay"
#: main.cpp:166
msgid "Russian translation"
-msgstr ""
+msgstr "Russische Übersetzung"
#: main.cpp:167
msgid "Dmitry Chernyak"
-msgstr ""
+msgstr "Dmitry Chernyak"
#: main.cpp:167
msgid "Old Russian translation"
-msgstr ""
+msgstr "Alte russische Übersetzung"
#: main.cpp:168
msgid "Sasa Tomic"
-msgstr ""
+msgstr "Sasa Tomic"
#: main.cpp:168
msgid "Serbian translation"
-msgstr ""
+msgstr "Serbische Übersetzung"
#: main.cpp:169
msgid "Zdenko Podobna"
-msgstr ""
+msgstr "Zdenko Podobna"
#: main.cpp:169
msgid "Slovak translation"
-msgstr ""
+msgstr "Slowakische Übersetzung"
#: main.cpp:170
msgid "Slovenian translation"
-msgstr ""
+msgstr "Slowenische Übersetzung"
#: main.cpp:171
msgid "Rafael Munoz"
-msgstr ""
+msgstr "Rafael Munoz"
#: main.cpp:171
msgid "Old Spanish translation"
-msgstr ""
+msgstr "Alte spanische Übersetzung"
#: main.cpp:172
msgid "Alejandro Araiza Alvarado"
-msgstr ""
+msgstr "Alejandro Araiza Alvarado"
#: main.cpp:172
msgid "Spanish translation"
-msgstr ""
+msgstr "Spanische Übersetzung"
#: main.cpp:173
msgid "Erik Johanssen"
-msgstr ""
+msgstr "Erik Johanssen"
#: main.cpp:173 main.cpp:174
msgid "Old Swedish translation"
-msgstr ""
+msgstr "Alte schwedische Übersetzung"
#: main.cpp:174
msgid "Anders Linden"
-msgstr ""
+msgstr "Anders Linden"
#: main.cpp:175
msgid "Peter Landgren"
-msgstr ""
+msgstr "Peter Landgren"
#: main.cpp:175
msgid "Swedish translation"
-msgstr ""
+msgstr "Swedische Übersetzung"
#: main.cpp:176
msgid "Bekir Sonat"
-msgstr ""
+msgstr "Bekir Sonat"
#: main.cpp:176
msgid "Turkish translation"
-msgstr ""
+msgstr "Türkische Übersetzung"
#: main.cpp:177
msgid "Ivan Petrouchtchak"
-msgstr ""
+msgstr "Ivan Petrouchtchak"
#: main.cpp:177
msgid "Ukrainian translation"
-msgstr ""
+msgstr "Ukrainische Übersetzung"
#: main.cpp:183
msgid "Start left panel at <path>"
@@ -4056,18 +4037,17 @@
#: krusaderview.cpp:95
#, kde-format
msgid "Function keys allow performing fast operations on files."
-msgstr ""
-"Funktionstasten ermöglichen eine schnelle Ausführung von Datei-Operationen."
+msgstr "Funktionstasten ermöglichen eine schnelle Ausführung von Datei-Operationen."
#: krusaderview.cpp:307
-#, fuzzy, kde-format
+#, kde-format
msgid "Horizontal Mode"
-msgstr "Vertikaler Modus"
+msgstr "Horizontaler Modus"
#: Dialogs/krdialogs.cpp:142
#, kde-format
msgid "F2 Queue"
-msgstr ""
+msgstr "F2 Queue"
#: Dialogs/krdialogs.cpp:158
#, kde-format
@@ -4297,8 +4277,7 @@
#: Dialogs/popularurls.cpp:64
#, kde-format
msgid "Saved 'Popular Urls' are invalid. List will be cleared"
-msgstr ""
-"Die gespeicherten 'Beliebten Adressen' sind ungültig. Die Liste wird geleert."
+msgstr "Die gespeicherten 'Beliebten Adressen' sind ungültig. Die Liste wird geleert."
#: Dialogs/popularurls.cpp:235
#, kde-format
@@ -4404,8 +4383,7 @@
#: Dialogs/krkeydialog.cpp:135
#, kde-format
-msgid ""
-"<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
+msgid "<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
msgstr "<qt>Datei <b>%1</b> existiert bereits. Wirklich überschreiben?"
#: Dialogs/krkeydialog.cpp:144
@@ -4612,8 +4590,7 @@
#: Dialogs/checksumdlg.cpp:306 Dialogs/checksumdlg.cpp:437
#, kde-format
msgid "Error reading stdout or stderr"
-msgstr ""
-"Fehler beim Lesen von Standardausgabe (stdout) und Standardfehler (stderr)"
+msgstr "Fehler beim Lesen von Standardausgabe (stdout) und Standardfehler (stderr)"
#: Dialogs/checksumdlg.cpp:324 Dialogs/checksumdlg.cpp:462
#, kde-format
@@ -4750,8 +4727,7 @@
#: Dialogs/checksumdlg.cpp:656
#, kde-format
msgid "Errors occured while saving multiple checksums. Stopping"
-msgstr ""
-"Beim Erstellen der Prüfsummen wurden Fehler gefunden. Vorgang abgebrochen."
+msgstr "Beim Erstellen der Prüfsummen wurden Fehler gefunden. Vorgang abgebrochen."
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 14
@@ -5035,9 +5011,9 @@
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 401
#: ActionMan/ui_actionproperty.h:725 rc.cpp:119
-#, fuzzy, kde-format
+#, kde-format
msgid "Enabled"
-msgstr "aktiviert"
+msgstr "Aktiviert"
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 420
@@ -5091,16 +5067,16 @@
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 463
#: ActionMan/ui_actionproperty.h:748 rc.cpp:146
-#, fuzzy, kde-format
+#, kde-format
msgid "Run the command in the embedded terminal emulator."
-msgstr "Das Kommando in einem Terminal ausführen."
+msgstr "Kommando im eingebetteten Terminal-Emulator ausführen."
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 466
#: ActionMan/ui_actionproperty.h:751 rc.cpp:149
-#, fuzzy, kde-format
+#, kde-format
msgid "Run in the embedded terminal emulator"
-msgstr "An eingebetteten Terminal-&Emulator senden"
+msgstr "Im eingebetteten Terminal-&Emulator ausführen"
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 39
@@ -5295,10 +5271,8 @@
#: ActionMan/useractionpage.cpp:134
#, kde-format
-msgid ""
-"The current action has been modified. Do you want to apply these changes?"
-msgstr ""
-"Die aktuelle Aktion wurde verändert. Möchten Sie die Änderungen übernehmen?"
+msgid "The current action has been modified. Do you want to apply these changes?"
+msgstr "Die aktuelle Aktion wurde verändert. Möchten Sie die Änderungen übernehmen?"
#: ActionMan/useractionpage.cpp:211
#, kde-format
@@ -5540,8 +5514,7 @@
#: Synchronizer/synchronizergui.cpp:1215
#, kde-format
msgid "Follow symbolic links during the compare process."
-msgstr ""
-"Symbolischen Verknüpfungen während des Synchronisationsprozesses folgen."
+msgstr "Symbolischen Verknüpfungen während des Synchronisationsprozesses folgen."
#: Synchronizer/synchronizergui.cpp:1216
#, kde-format
@@ -5632,7 +5605,7 @@
"wurden (Strg+R)."
#: Synchronizer/synchronizergui.cpp:1297
-#, fuzzy, kde-format
+#, kde-format
msgid "Show files marked to delete (CTRL+T)."
msgstr "Dateien anzeigen, die als <i>Zu löschen</i> markiert wurden (Strg+T)."
@@ -5935,10 +5908,10 @@
#: Synchronizer/synchronizedialog.cpp:64 Synchronizer/synchronizedialog.cpp:77
#: Synchronizer/synchronizedialog.cpp:90
-#, fuzzy, kde-format
+#, kde-format
msgid "Ready: %2/1 file, %3/%4"
msgid_plural "Ready: %2/%1 files, %3/%4"
-msgstr[0] "Bereit: %2/1 Datei, %4/%5"
+msgstr[0] "Bereit: %2/1 Datei, %3/%4"
msgstr[1] "Bereit: %2/%1 Dateien, %4/%5"
#: Synchronizer/synchronizedialog.cpp:70
@@ -6020,9 +5993,9 @@
#: Synchronizer/synchronizer.cpp:1457 krslots.cpp:138 krslots.cpp:215
#: krslots.cpp:500 krslots.cpp:542 krslots.cpp:560
-#, fuzzy, kde-format
+#, kde-format
msgid "Error executing %1!"
-msgstr "Fehler beim Ausführen von "
+msgstr "Fehler beim Ausführen von %1!"
#: Synchronizer/feedtolistboxdialog.cpp:56
#, kde-format
@@ -6546,8 +6519,7 @@
msgid ""
"Hint: use 'internal editor' if you want to use Krusader's fast built-in "
"editor"
-msgstr ""
-"Hinweis: 'internal editor' für Krusaders schnellen, internen Editor verwenden"
+msgstr "Hinweis: 'internal editor' für Krusaders schnellen, internen Editor verwenden"
#: Konfigurator/kggeneral.cpp:100
#, kde-format
@@ -6587,8 +6559,7 @@
#: Konfigurator/kggeneral.cpp:112
#, kde-format
msgid "Internal editor and viewer opens each file in a separate window"
-msgstr ""
-"Interner Editor und Viewer öffnen jede Datei in einem separaten Fenster"
+msgstr "Interner Editor und Viewer öffnen jede Datei in einem separaten Fenster"
#: Konfigurator/kggeneral.cpp:113
#, kde-format
@@ -6640,8 +6611,7 @@
#: Konfigurator/kggeneral.cpp:213
#, kde-format
-msgid ""
-"Make sure to install new tools in your <code>$PATH</code> (e.g. /usr/bin)"
+msgid "Make sure to install new tools in your <code>$PATH</code> (e.g. /usr/bin)"
msgstr ""
"Neue Werkzeuge müssen sich in Ihrem Suchpfad (<code>$PATH</code>) befinden "
"(z.B. /usr/bin)"
@@ -6673,8 +6643,7 @@
#: Konfigurator/krresulttable.cpp:137
#, kde-format
msgid "rpm found, but cpio not found which is required for unpacking"
-msgstr ""
-"rpm gefunden, aber cpio nicht gefunden, welches zum Entpacken benötigt wird"
+msgstr "rpm gefunden, aber cpio nicht gefunden, welches zum Entpacken benötigt wird"
#: Konfigurator/krresulttable.cpp:140 Konfigurator/krresulttable.cpp:304
#, kde-format
@@ -6734,9 +6703,9 @@
msgstr "Werkzeug"
#: Konfigurator/konfigurator.cpp:67
-#, fuzzy, kde-format
+#, kde-format
msgid "Konfigurator"
-msgstr "Bestätigungen"
+msgstr "Konfigurator"
#: Konfigurator/konfigurator.cpp:68
#, kde-format
@@ -6817,8 +6786,7 @@
#: Konfigurator/konfigurator.cpp:221
#, kde-format
msgid "The current page has been changed. Do you want to apply changes?"
-msgstr ""
-"Die aktuelle Seite wurde verändert. Möchten Sie die Änderungen übernehmen?"
+msgstr "Die aktuelle Seite wurde verändert. Möchten Sie die Änderungen übernehmen?"
#: Konfigurator/kglookfeel.cpp:82
#, kde-format
@@ -6988,12 +6956,12 @@
#: Konfigurator/kglookfeel.cpp:183
#, kde-format
msgid "Load the user defined folder icons"
-msgstr ""
+msgstr "Benutzerdefinierte Symbole laden"
#: Konfigurator/kglookfeel.cpp:183
#, kde-format
msgid "Load the user defined folder icons (can cause decrease in performance)."
-msgstr ""
+msgstr "Benutzerdefinierte Symbole laden (kann sich negativ auf die Geschwindigkeit auswirken)."
#: Konfigurator/kglookfeel.cpp:184
#, kde-format
@@ -7003,8 +6971,7 @@
#: Konfigurator/kglookfeel.cpp:184
#, kde-format
msgid "File sizes are displayed in B, KB, MB and GB, not just in bytes."
-msgstr ""
-"Die Dateigröße wird nicht in Bytes, sondern in B, KB, MB und GB angezeigt."
+msgstr "Die Dateigröße wird nicht in Bytes, sondern in B, KB, MB und GB angezeigt."
#: Konfigurator/kglookfeel.cpp:185
#, kde-format
@@ -7129,8 +7096,7 @@
#: Konfigurator/kglookfeel.cpp:264
#, kde-format
-msgid ""
-"Each directory change in the panel is also performed in the other panel."
+msgid "Each directory change in the panel is also performed in the other panel."
msgstr ""
"Jeder Verzeichniswechsel im aktuellen Dateifenster wird auch im anderen "
"Dateifenster durchgeführt."
@@ -7523,8 +7489,7 @@
#: Konfigurator/kgprotocols.cpp:106
#, kde-format
msgid "Add mime to the selected protocol on the link list."
-msgstr ""
-"Dateityp zum ausgewählten Protokoll in der Verknüpfungsliste hinzufügen."
+msgstr "Dateityp zum ausgewählten Protokoll in der Verknüpfungsliste hinzufügen."
#: Konfigurator/kgprotocols.cpp:111
#, kde-format
@@ -7881,9 +7846,9 @@
msgstr "Löschen-Hintergrund:"
#: Konfigurator/kgcolors.cpp:211
-#, fuzzy, kde-format
+#, kde-format
msgid "Other"
-msgstr "Andere..."
+msgstr "Andere"
#: Konfigurator/kgcolors.cpp:219
#, fuzzy, kde-format
@@ -7991,11 +7956,9 @@
msgstr "Eine Farbschema-Datei auswählen"
#: Konfigurator/kgcolors.cpp:564
-#, fuzzy, kde-format
+#, kde-format
msgid "File %1 already exists. Are you sure you want to overwrite it?"
-msgstr ""
-"Datei %1 existiert bereits.\n"
-"Wirklich überschreiben?"
+msgstr "Datei %1 existiert bereits. Wirklich überschreiben?"
#: Konfigurator/kgcolors.cpp:567
#, kde-format
@@ -8242,8 +8205,7 @@
#: Konfigurator/kgarchives.cpp:107
#, kde-format
-msgid ""
-"Some corrupted archives might cause a crash; therefore, testing is suggested."
+msgid "Some corrupted archives might cause a crash; therefore, testing is suggested."
msgstr ""
"Einige korrupte Archive können einen Absturz verursachen, daher ist das "
"Testen zu empfehlen."
@@ -8255,8 +8217,7 @@
#: Konfigurator/kgarchives.cpp:125
#, kde-format
-msgid ""
-"Make sure to install new packers in your <code>$PATH</code> (e.g. /usr/bin)"
+msgid "Make sure to install new packers in your <code>$PATH</code> (e.g. /usr/bin)"
msgstr ""
"Neue Packer müssen sich in Ihrem Suchpfad (<code>$PATH</code>) befinden (z."
"B. /usr/bin)"
@@ -8363,9 +8324,9 @@
"Kdiff3 und Xxdiff."
#: krslots.cpp:196 krslots.cpp:202
-#, fuzzy, kde-format
+#, kde-format
msgid "Krusader is unable to download %1"
-msgstr "Konnte nicht heruntergeladen werden: "
+msgstr "%1 konnte nicht heruntergeladen werden"
#: krslots.cpp:451
#, kde-format
@@ -8582,8 +8543,7 @@
#: Splitter/combiner.cpp:154
#, kde-format
-msgid ""
-"Validity checking is impossible without a good CRC file. Continue combining?"
+msgid "Validity checking is impossible without a good CRC file. Continue combining?"
msgstr ""
"Eine Gültigkeitsüberprüfung ist ohne eine gültige CRC-Datei unmöglich. Mit "
"dem Zusammenfügen fortfahren?"
@@ -8639,9 +8599,9 @@
msgstr ""
#: krarc.cpp:215
-#, fuzzy, kde-format
+#, kde-format
msgid "Creating %1 ..."
-msgstr "Lösche %1..."
+msgstr "Erstelle %1..."
#: krarc.cpp:254
#, fuzzy, kde-format
@@ -8649,9 +8609,9 @@
msgstr "Verschieben in Archive ist deaktiviert"
#: krarc.cpp:307
-#, fuzzy, kde-format
+#, kde-format
msgid "Packing %1 ..."
-msgstr "Es wird neu gepackt..."
+msgstr "Packe %1..."
#: krarc.cpp:347
#, kde-format
@@ -8659,9 +8619,9 @@
msgstr ""
#: krarc.cpp:414 krarc.cpp:667
-#, fuzzy, kde-format
+#, kde-format
msgid "Unpacking %1 ..."
-msgstr "Entpacken"
+msgstr "Entpacke %1..."
#: krarc.cpp:542
#, kde-format
@@ -8669,7 +8629,7 @@
msgstr ""
#: krarc.cpp:558
-#, fuzzy, kde-format
+#, kde-format
msgid "Deleting %1 ..."
msgstr "Lösche %1..."
@@ -8693,192 +8653,20 @@
#: krarc.cpp:1690 krarc.cpp:1714
#, kde-format
msgid "Krarc Password Dialog"
-msgstr ""
+msgstr "Krarc Passwort Dialog"
#: krarc.cpp:1731
#, kde-format
msgid "Accessing the file requires password."
-msgstr ""
+msgstr "Datei ist passwortgeschützt"
#: tar.cc:56
#, kde-format
msgid "This protocol does not support resuming"
-msgstr ""
+msgstr "Protokol unterstützt keine Wiederaufnahme"
#: tar.cc:78
#, kde-format
msgid "Writing to %1 is not supported"
-msgstr ""
+msgstr "Schreiben in %1 wird nicht unterstützt"
-#~ msgid ""
-#~ "Don't use KDE's media protocol for media button (if it's buggy or missing)"
-#~ msgstr ""
-#~ "KDEs Geräte-Protokoll für den Geräte-Knopf deaktivieren (falls fehlerhaft "
-#~ "oder nicht vorhanden)"
-
-#~ msgid ""
-#~ "Select if your media protocol is buggy (in some older KDE versions), or "
-#~ "not present (no kdebase package installed)."
-#~ msgstr ""
-#~ "Dieses Feld ankreuzen, falls das Geräte-Protokoll fehlerhaft ist "
-#~ "(betrifft einige ältere KDE-Versionen), oder nicht verfügbar ist (für den "
-#~ "Fall, dass das Paket kdebase nicht installiert ist)."
-
-#~ msgid "Brief"
-#~ msgstr "Mehrspaltig"
-
-#~ msgid "Clear location bar button"
-#~ msgstr "Löschen des Adressleisteninhalts"
-
-#~ msgid "Clears the location bar"
-#~ msgstr "Löscht den Inhalt der Adressleiste"
-
-#~ msgid "CD Recorder"
-#~ msgstr "CD-Brenner"
-
-#~ msgid "DVD Recorder"
-#~ msgstr "DVD-Brenner"
-
-#~ msgid "DVD"
-#~ msgstr "DVD-ROM"
-
-#~ msgid "Zip Disk"
-#~ msgstr "Zip-Diskette"
-
-#~ msgid "add"
-#~ msgstr "Hinzufügen"
-
-#~ msgid "<qt>Can't open <b>%1</b></qt>"
-#~ msgstr "<qt><b>%1</b> kann nicht geöffnet werden!</qt>"
-
-#~ msgid "Can't open \"%1\""
-#~ msgstr "\"%1\" kann nicht geöffnet werden"
-
-#~ msgid "Clear the location bar"
-#~ msgstr "Adressleiste löschen"
-
-#~ msgid "<qt>Can't read <b>%1</b>. Archive might be corrupted!</qt>"
-#~ msgstr ""
-#~ "<qt><b>%1</b> kann nicht gelesen werden. Das Archiv ist möglicherweise "
-#~ "defekt!</qt>"
-
-#~ msgid "Deleting Files..."
-#~ msgstr "Dateien werden gelöscht..."
-
-#~ msgid "Unpacking Files"
-#~ msgstr "Dateien werden entpackt"
-
-#~ msgid ""
-#~ "In %1:\n"
-#~ "There is an error in the JavaScript"
-#~ msgstr ""
-#~ "In %1:\n"
-#~ "Das JavaScript enthält einen Fehler"
-
-#~ msgid "Shred"
-#~ msgstr "In den Reißwolf schieben"
-
-#~ msgid ""
-#~ "<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone "
-#~ "forever!</qt>"
-#~ msgstr ""
-#~ "<qt>Möchten Sie <b>%1</b> wirklich in den Reißwolf schieben? Einmal in "
-#~ "den Reißwolf geschoben, ist diese Datei für immer verloren!</qt>"
-
-#~ msgid "Tab: switch panel"
-#~ msgstr "Tab: Dateifenster wechseln"
-
-#~ msgid "Error ejecting device! You need to have 'eject' in your path."
-#~ msgstr ""
-#~ "Fehler beim Auswerfen des Mediums!\n"
-#~ "Das Programm 'eject' muss sich in Ihrem Pfad befinden."
-
-#~ msgid "Filesystems"
-#~ msgstr "Dateisysteme"
-
-#~ msgid ""
-#~ "Krusader\n"
-#~ "Twin-Panel File Manager for KDE"
-#~ msgstr ""
-#~ "Krusader\n"
-#~ "Twin-Panel-Dateimanager für KDE"
-
-#~ msgid "%1% of %2 "
-#~ msgstr "%1% von %2 "
-
-#~ msgid "compare mode"
-#~ msgstr "Vergleichsmodus"
-
-#~ msgid "Remove"
-#~ msgstr "Entfernen"
-
-#~ msgid "New group"
-#~ msgstr "Neue Gruppe"
-
-#~ msgid "New session"
-#~ msgstr "Neue Sitzung"
-
-#~ msgid "Sessions"
-#~ msgstr "Sitzungen"
-
-#~ msgid "RemoteMan"
-#~ msgstr "RemoteMan"
-
-#~ msgid "Are you sure you want to delete this item ???"
-#~ msgstr "Möchten Sie dieses Element wirklich löschen?"
-
-#~ msgid "RemoteMan: Connection Manager"
-#~ msgstr "RemoteMan: Verbindungsmanager"
-
-#~ msgid "Session name:"
-#~ msgstr "Sitzungsname:"
-
-#~ msgid "&More"
-#~ msgstr "&Mehr"
-
-#~ msgid "User name:"
-#~ msgstr "Benutzername:"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonymous"
-
-#~ msgid "Remote directory:"
-#~ msgstr "Entferntes Verzeichnis:"
-
-#~ msgid "Co&nnect"
-#~ msgstr "Verbi&nden"
-
-#~ msgid "New &Group"
-#~ msgstr "Neue &Gruppe"
-
-#~ msgid "New Connec&tion"
-#~ msgstr "Neue Verbin&dung"
-
-#~ msgid "Port: "
-#~ msgstr "Port: "
-
-#~ msgid "* Warning: Storing your password is not secure !!!"
-#~ msgstr "* Warnung: Das Speichern des Passwortes ist unsicher!!!"
-
-#~ msgid "File "
-#~ msgstr "Datei "
-
-#~ msgid " already exists. Are you sure you want to overwrite it?"
-#~ msgstr " existiert bereits. Das Archiv wirklich überschreiben?"
-
-#~ msgid ""
-#~ "Important: RemoteMan has been replaced by our new bookmark manager. The "
-#~ "new manager handles local files and remote URLs the same way. RemoteMan "
-#~ "is being left around to allow an easier transition and give you a chance "
-#~ "to move your bookmarks. IT WILL BE REMOVED SOON!\n"
-#~ "Try the new bookmark-manager: open a new remote connection, once done, "
-#~ "press the bookmark button, select 'Add bookmark' and that's it!"
-#~ msgstr ""
-#~ "Wichtig: RemoteMan wurde durch einen neuen Lesezeichenmanager ersetzt. "
-#~ "Der neue Manager kann mit lokale und entfernten Adressen umgehen. "
-#~ "RemoteMan bleibt erhalten, um einen nahtlosen Übergang zu gewährleisten "
-#~ "und Ihnen die Transferierung alter Lesezeichen zu ermöglichen. REMOTEMAN "
-#~ "WIRD IN ZUKUNFT ENTFERNT WERDEN!\n"
-#~ "Probieren Sie den neuen Lesezeichenmanager einfach aus: Öffnen Sie eine "
-#~ "neue Netzwerkverbindung, drücken Sie den Lesezeichen-Knopf und wählen "
-#~ "'Lesezeichen hinzufügen'. Das ist auch schon alles!"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <des...@us...> - 2008-10-03 16:04:55
|
Revision: 6101
http://krusader.svn.sourceforge.net/krusader/?rev=6101&view=rev
Author: deschler
Date: 2008-10-03 16:04:51 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
i18n fixes
Modified Paths:
--------------
trunk/krusader_kde4/krusader/main.cpp
Modified: trunk/krusader_kde4/krusader/main.cpp
===================================================================
--- trunk/krusader_kde4/krusader/main.cpp 2008-10-02 19:50:43 UTC (rev 6100)
+++ trunk/krusader_kde4/krusader/main.cpp 2008-10-03 16:04:51 UTC (rev 6101)
@@ -116,12 +116,12 @@
aboutData.addAuthor(ki18n("Shie Erlich"),ki18n("Author"), "er...@us...");
aboutData.addAuthor(ki18n("Karai Csaba"), ki18n("Developer"), "ck...@us...", 0);
aboutData.addAuthor(ki18n("Heiner Eichmann"), ki18n("Developer"), "h.e...@gm...", 0);
- aboutData.addAuthor(ki18n("Jonas Baehr"), ki18n("Developer"), "jon...@we...", 0);
+ aboutData.addAuthor(ki18n("Jonas Bähr"), ki18n("Developer"), "jon...@we...", 0);
aboutData.addAuthor(ki18n("Václav Juza"), ki18n("Developer"), "vac...@gm...", 0);
aboutData.addAuthor(ki18n("Dirk Eschler"), ki18n("Webmaster and i18n coordinator"), "des...@us...", 0);
aboutData.addAuthor(ki18n("Frank Schoolmeesters"), ki18n("Documentation and marketing coordinator"), "fra...@ya...", 0);
aboutData.addAuthor(ki18n("Richard Holt"), ki18n("Documentation & Proofing"), "ric...@gm...", 0);
- aboutData.addAuthor(ki18n("Matej Urbancic"), ki18n(" Marketing & Product Research"), "mat...@gm...", 0);
+ aboutData.addAuthor(ki18n("Matej Urbancic"), ki18n("Marketing & Product Research"), "mat...@gm...", 0);
aboutData.addCredit(ki18n("Václav Juza"), ki18n("QA, bug-hunting, patches and general help"), "vac...@gm...", 0);
aboutData.addCredit(ki18n("Jiri Palecek"), ki18n("QA, bug-hunting, patches and general help"), "jpa...@we...", 0);
aboutData.addCredit(ki18n("Jiri Klement"),ki18n("Important help in KDE 4 porting"),0,0);
@@ -130,7 +130,7 @@
aboutData.addCredit(ki18n("Gábor Lehel"), ki18n("Viewer module for 3rd Hand"), "ill...@gm...", 0);
aboutData.addCredit(ki18n("Mark Eatough"), ki18n("Handbook Proof-Reader"), "mar...@ya...", 0);
aboutData.addCredit(ki18n("Jan Halasa"), ki18n("The old Bookmark Module"), "xh...@fi...", 0);
- aboutData.addCredit(ki18n("Hans Loeffler"), ki18n("Dir history button"), 0, 0);
+ aboutData.addCredit(ki18n("Hans Löffler"), ki18n("Dir history button"), 0, 0);
aboutData.addCredit(ki18n("Szombathelyi György"), ki18n("ISO KIO slave"), 0, 0);
aboutData.addCredit(ki18n("Jan Willem van de Meent (Adios)"), ki18n("Icons for Krusader"), "jan...@lo...", 0);
aboutData.addCredit(ki18n("Mikolaj Machowski"), ki18n("Usability and QA"), "<mi...@wp...>", 0);
@@ -138,7 +138,7 @@
aboutData.addCredit(ki18n("Aurelien Gateau"),ki18n("patch for KViewer"),"aur...@fr...",0);
aboutData.addCredit(ki18n("Milan Brabec"),ki18n("the first patch ever !"),"mb...@vo...",0);
aboutData.addCredit(ki18n("Asim Husanovic"),ki18n("Bosnian translation"),"as...@me...",0);
- aboutData.addCredit(ki18n("Doutor Zero"),ki18n("Brazilian Portuguese"),"dou...@gm...",0);
+ aboutData.addCredit(ki18n("Doutor Zero"),ki18n("Brazilian Portuguese translation"),"dou...@gm...",0);
aboutData.addCredit(ki18n("Milen Ivanov"),ki18n("Bulgarian translation"),"mil...@ab...",0);
aboutData.addCredit(ki18n("Quim Perez"),ki18n("Catalan translation"),"no...@os...",0);
aboutData.addCredit(ki18n("Jinghua Luo"),ki18n("Chinese Simplified translation"),"luo...@ms...",0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-10-02 19:51:04
|
Revision: 6100
http://krusader.svn.sourceforge.net/krusader/?rev=6100&view=rev
Author: ckarai
Date: 2008-10-02 19:50:43 +0000 (Thu, 02 Oct 2008)
Log Message:
-----------
QueueManager: delete jobs
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Queue/queue.cpp
trunk/krusader_kde4/krusader/Queue/queue.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-10-01 19:20:37 UTC (rev 6099)
+++ trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-10-02 19:50:43 UTC (rev 6100)
@@ -50,7 +50,8 @@
if( _jobs.count() > 0 && _jobs[ 0 ] == jw )
current = true;
_jobs.removeAll( jw );
- slotPercent( 0, PERCENT_UNUSED );
+ if( current )
+ slotPercent( 0, PERCENT_UNUSED );
if( !_suspended && current && _jobs.count() > 0 ) {
_jobs[ 0 ]->start();
slotPercent( 0, PERCENT_UNKNOWN );
@@ -185,3 +186,20 @@
_percent = percent_;
emit percent( this, percent_ );
}
+
+void Queue::remove( KIOJobWrapper * jw )
+{
+ bool current = false;
+ if( _jobs.count() > 0 && _jobs[ 0 ] == jw )
+ current = true;
+ _jobs.removeAll( jw );
+ jw->abort();
+ delete jw;
+ if( current )
+ slotPercent( 0, PERCENT_UNUSED );
+ if( !_suspended && current && _jobs.count() > 0 ) {
+ _jobs[ 0 ]->start();
+ slotPercent( 0, PERCENT_UNKNOWN );
+ }
+ emit changed();
+}
Modified: trunk/krusader_kde4/krusader/Queue/queue.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.h 2008-10-01 19:20:37 UTC (rev 6099)
+++ trunk/krusader_kde4/krusader/Queue/queue.h 2008-10-02 19:50:43 UTC (rev 6100)
@@ -32,6 +32,7 @@
bool isSuspended() { return _suspended; }
QTime scheduleTime();
int getPercent() { return _percent; }
+ void remove( KIOJobWrapper * );
QList<QString> itemDescriptions();
QList<KIOJobWrapper *> items();
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-01 19:20:37 UTC (rev 6099)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-10-02 19:50:43 UTC (rev 6100)
@@ -1,5 +1,9 @@
#include "queuewidget.h"
#include "queue_mgr.h"
+#include <kmessagebox.h>
+#include <klocale.h>
+#include <kmenu.h>
+#include <qcursor.h>
QueueWidget::QueueWidget( QWidget * parent ): KTabWidget( parent )
{
@@ -63,11 +67,25 @@
setCurrentWidget( queueWidget );
}
-KrQueueListWidget::KrQueueListWidget( Queue * queue, QWidget * parent ) : QListWidget( parent ),
+class KrQueueListWidgetItem : public QListWidgetItem
+{
+public:
+ KrQueueListWidgetItem( const QString & label_, KIOJobWrapper * job_ ) :
+ QListWidgetItem( label_ ), _job( job_ ) {}
+
+ KIOJobWrapper * job() { return _job; }
+
+private:
+ QPointer<KIOJobWrapper> _job;
+};
+
+KrQueueListWidget::KrQueueListWidget( Queue * queue, QWidget * parent ) : KrListWidget( parent ),
_queue( queue )
{
connect( queue, SIGNAL( changed() ), this, SLOT( slotChanged() ) );
connect( queue, SIGNAL( stateChanged() ), this, SIGNAL( stateChanged() ) );
+ connect( this, SIGNAL( itemRightClicked( QListWidgetItem *, const QPoint & ) ),
+ this, SLOT( slotItemRightClicked( QListWidgetItem * ) ) );
slotChanged();
}
@@ -77,7 +95,36 @@
if( _queue )
{
QList<QString> itdescs = _queue->itemDescriptions();
- foreach( QString desc, itdescs )
- addItem( desc );
+ QList<KIOJobWrapper *> items = _queue->items();
+ for( int i=0; i != items.count(); i++ )
+ addItem( new KrQueueListWidgetItem( itdescs[ i ], items[ i ] ) );
}
}
+
+void KrQueueListWidget::slotItemRightClicked( QListWidgetItem * item )
+{
+ if( item )
+ {
+ KrQueueListWidgetItem * kitem = (KrQueueListWidgetItem * )item;
+ if( kitem->job() )
+ {
+ KMenu popup( this );
+ popup.setTitle( i18n("Queue Manager"));
+ QAction * actDelete = popup.addAction( i18n("Delete") );
+ QAction * res = popup.exec( QCursor::pos() );
+
+ if( res == actDelete )
+ {
+ if( kitem->job()->isStarted() )
+ {
+ if( KMessageBox::warningContinueCancel(this,
+ i18n("Deleting this job will abort the pending job. Do you wish to continue?"),
+ i18n("Warning") ) != KMessageBox::Continue )
+ return;
+ }
+ if( kitem->job() )
+ _queue->remove( kitem->job() );
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.h 2008-10-01 19:20:37 UTC (rev 6099)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.h 2008-10-02 19:50:43 UTC (rev 6100)
@@ -3,7 +3,7 @@
#include "queue.h"
#include <ktabwidget.h>
-#include <qlistwidget.h>
+#include "../GUI/krlistwidget.h"
#include <qpointer.h>
class KrQueueListWidget;
@@ -28,7 +28,7 @@
QMap<QString, KrQueueListWidget*> _queueWidgets;
};
-class KrQueueListWidget : public QListWidget
+class KrQueueListWidget : public KrListWidget
{
Q_OBJECT
public:
@@ -37,6 +37,7 @@
public slots:
void slotChanged();
+ void slotItemRightClicked( QListWidgetItem * );
signals:
void stateChanged();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-10-01 19:20:53
|
Revision: 6099
http://krusader.svn.sourceforge.net/krusader/?rev=6099&view=rev
Author: ckarai
Date: 2008-10-01 19:20:37 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
QueueManager shows the percent values now
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
Modified: trunk/krusader_kde4/krusader/Queue/queue.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-09-29 22:16:45 UTC (rev 6098)
+++ trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-10-01 19:20:37 UTC (rev 6099)
@@ -5,7 +5,7 @@
#include <kmessagebox.h>
#include <QTime>
-Queue::Queue(const QString& name): _name(name), _suspended( false )
+Queue::Queue(const QString& name): _name(name), _suspended( false ), _percent( PERCENT_UNUSED )
{
connect( &_scheduleTimer, SIGNAL( timeout() ), this, SLOT( resume() ) );
}
@@ -26,9 +26,12 @@
_jobs.append(job);
connect( job, SIGNAL( destroyed( QObject * ) ), this, SLOT( slotJobDestroyed( QObject * ) ) );
job->connectTo( SIGNAL( result( KJob* ) ), this, SLOT( slotResult( KJob* ) ) );
+ job->connectTo( SIGNAL( percent( KJob*, unsigned long ) ), this, SLOT( slotPercent( KJob*, unsigned long ) ) );
- if( !_suspended && !isRunning )
+ if( !_suspended && !isRunning ) {
job->start();
+ slotPercent( 0, PERCENT_UNKNOWN );
+ }
emit changed();
emit showQueueDialog();
@@ -47,8 +50,11 @@
if( _jobs.count() > 0 && _jobs[ 0 ] == jw )
current = true;
_jobs.removeAll( jw );
- if( !_suspended && current && _jobs.count() > 0 )
+ slotPercent( 0, PERCENT_UNUSED );
+ if( !_suspended && current && _jobs.count() > 0 ) {
_jobs[ 0 ]->start();
+ slotPercent( 0, PERCENT_UNKNOWN );
+ }
emit changed();
}
@@ -58,6 +64,7 @@
KIOJobWrapper * jw = _jobs[ 0 ];
KIO::Job * kjob = jw->job();
if( kjob && kjob == job ) {
+ slotPercent( 0, PERCENT_UNUSED );
_jobs.removeAll( jw );
if( job->error() && _jobs.count() > 0 ) {
// what to do with the other elements in the queue
@@ -90,8 +97,10 @@
emit changed();
if( !_suspended ) {
- if( _jobs.count() > 0 )
+ if( _jobs.count() > 0 ) {
_jobs[ 0 ]->start();
+ slotPercent( 0, PERCENT_UNKNOWN );
+ }
else
emit emptied();
}
@@ -130,8 +139,10 @@
if( _jobs.count() > 0 ) {
if( _jobs[ 0 ]->isSuspended() )
_jobs[ 0 ]->resume();
- else if( !_jobs[ 0 ]->isStarted() )
+ else if( !_jobs[ 0 ]->isStarted() ) {
_jobs[ 0 ]->start();
+ slotPercent( 0, PERCENT_UNKNOWN );
+ }
}
emit stateChanged();
@@ -167,4 +178,10 @@
return _scheduleTime;
else
return QTime();
-}
\ No newline at end of file
+}
+
+void Queue::slotPercent( KJob *, unsigned long percent_ )
+{
+ _percent = percent_;
+ emit percent( this, percent_ );
+}
Modified: trunk/krusader_kde4/krusader/Queue/queue.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.h 2008-09-29 22:16:45 UTC (rev 6098)
+++ trunk/krusader_kde4/krusader/Queue/queue.h 2008-10-01 19:20:37 UTC (rev 6099)
@@ -9,6 +9,9 @@
class KJob;
+#define PERCENT_UNUSED -2
+#define PERCENT_UNKNOWN -1
+
/**
* Queue can hold anything which inherits KIO::Job, and schedule it, start it, stop etc...
* the main reason to hold the Job itself (at least for phase 1) is to keep the code
@@ -28,6 +31,7 @@
int count() { return _jobs.size(); }
bool isSuspended() { return _suspended; }
QTime scheduleTime();
+ int getPercent() { return _percent; }
QList<QString> itemDescriptions();
QList<KIOJobWrapper *> items();
@@ -40,6 +44,7 @@
protected slots:
void slotJobDestroyed( QObject * );
void slotResult( KJob * );
+ void slotPercent( KJob *, unsigned long percent );
protected:
void dumpQueue();
@@ -49,12 +54,14 @@
bool _suspended;
QTimer _scheduleTimer;
QTime _scheduleTime;
+ int _percent;
signals:
void showQueueDialog();
void changed();
void emptied();
void stateChanged();
+ void percent( Queue *, int value );
};
#endif // QUEUE_H
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-09-29 22:16:45 UTC (rev 6098)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-10-01 19:20:37 UTC (rev 6099)
@@ -74,6 +74,7 @@
Queue *queue = new Queue(queueName);
connect( queue, SIGNAL( showQueueDialog() ), _self, SLOT( slotShowQueueDialog() ) );
connect( queue, SIGNAL( emptied() ), _self, SLOT( slotQueueEmptied() ) );
+ connect( queue, SIGNAL( percent( Queue *, int ) ), _self, SIGNAL( percent( Queue *, int ) ) );
_queues.insert(queue->name(), queue);
_current = queue;
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.h 2008-09-29 22:16:45 UTC (rev 6098)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.h 2008-10-01 19:20:37 UTC (rev 6099)
@@ -37,6 +37,7 @@
void queueInserted( Queue * );
void queueDeleted( Queue * );
void currentChanged( Queue * );
+ void percent( Queue *, int );
protected:
static QMap<QString, Queue*> _queues;
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-29 22:16:45 UTC (rev 6098)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-10-01 19:20:37 UTC (rev 6099)
@@ -238,6 +238,7 @@
slotUpdateToolbar();
connect( QueueManager::instance(), SIGNAL( queueInserted( Queue * ) ), this, SLOT( slotUpdateToolbar() ) );
+ connect( QueueManager::instance(), SIGNAL( percent( Queue *, int ) ), this, SLOT( slotPercentChanged( Queue *, int ) ) );
show();
@@ -348,6 +349,8 @@
}
_closeTabButton->setEnabled( _queueWidget->count() > 1 );
+
+ slotPercentChanged( currentQueue, currentQueue->getPercent() );
}
}
@@ -406,3 +409,31 @@
QueueManager::removeQueue( currentQueue );
}
}
+
+void QueueDialog::slotPercentChanged( Queue * queue, int percent )
+{
+ if( QueueManager::currentQueue() == queue )
+ {
+ switch( percent )
+ {
+ case PERCENT_UNUSED:
+ _progressBar->setMaximum( 100 );
+ _progressBar->setValue( 0 );
+ _progressBar->setFormat( i18n( "unused" ) );
+ break;
+ case PERCENT_UNKNOWN:
+ if( _progressBar->maximum() != 0 )
+ {
+ _progressBar->setMaximum( 0 );
+ _progressBar->setFormat( "" );
+ }
+ break;
+ default:
+ if( _progressBar->maximum() != 100 )
+ _progressBar->setMaximum( 100 );
+ _progressBar->setValue( percent );
+ _progressBar->setFormat( "%p%" );
+ break;
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-29 22:16:45 UTC (rev 6098)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-10-01 19:20:37 UTC (rev 6099)
@@ -38,6 +38,7 @@
class QueueWidget;
class QLabel;
class QProgressBar;
+class Queue;
class QueueDialog : public QDialog
{
@@ -62,6 +63,7 @@
void slotScheduleClicked();
void slotNewTab();
void slotDeleteCurrentTab();
+ void slotPercentChanged( Queue *, int );
protected:
virtual void paintEvent ( QPaintEvent * event );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-09-29 22:17:17
|
Revision: 6098
http://krusader.svn.sourceforge.net/krusader/?rev=6098&view=rev
Author: codeknight
Date: 2008-09-29 22:16:45 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
enqueue operation for copy / move, usage instructions
Modified Paths:
--------------
trunk/krusader_kde4/README
trunk/krusader_kde4/SVNNEWS
Modified: trunk/krusader_kde4/README
===================================================================
--- trunk/krusader_kde4/README 2008-09-29 19:21:26 UTC (rev 6097)
+++ trunk/krusader_kde4/README 2008-09-29 22:16:45 UTC (rev 6098)
@@ -15,6 +15,9 @@
The highlights of this release are:
- many many bugfixes
- enqueue operation for copy / move (alpha without gui)
+ Use F5 and than F2 to use it.
+ The copy/move operation runs as a background process so
+ that you can continue to use Krusader during the copy/move operation!
- Konfigurator mouse selection mode: Possibility to select a predefined
mode and change a detail.
- highlight quick search match
@@ -32,6 +35,8 @@
- Select encoding in content search and krarc
- New synchronizer shortcuts
+For more explenations about the new features please read the
+SVNNEWS file in this tarball.
Notice: if you've got bugs to report, please do so using Krusader's
website, and not using KDE's bugzilla (bugs.kde.org).
Modified: trunk/krusader_kde4/SVNNEWS
===================================================================
--- trunk/krusader_kde4/SVNNEWS 2008-09-29 19:21:26 UTC (rev 6097)
+++ trunk/krusader_kde4/SVNNEWS 2008-09-29 22:16:45 UTC (rev 6098)
@@ -6,6 +6,14 @@
- extension to the ChangeLog.
------------------------------------------------------------------------
+
+New feature: enqueue operation for copy / move
+ Use F5 and than F2 to use it.
+ The copy/move operation runs as a background process so
+ that you can continue to use Krusader during the copy/move operation!
+
+-------------------------------- 2.0.0-beta1 ---------------------------
+
New feature: Krusader is able to send e-mails by thunderbird
- one can set up thunderbird as an e-mail sender in the dependencies
- from now more than one file can be sent in an attachment
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-09-29 19:22:07
|
Revision: 6097
http://krusader.svn.sourceforge.net/krusader/?rev=6097&view=rev
Author: ckarai
Date: 2008-09-29 19:21:26 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
QueueManager GUI
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
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
trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp
trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/ChangeLog 2008-09-29 19:21:26 UTC (rev 6097)
@@ -1,4 +1,4 @@
- ADDED: enqueue operation for copy / move (alpha without gui)
+ ADDED: enqueue operation for copy / move (with an almost finished gui)
ADDED: Konfigurator mouse selection mode: Possibility to select a predefined
mode and change a detail.
ADDED: [ 1704953 ] highlight quick search match
Modified: trunk/krusader_kde4/krusader/Queue/queue.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-09-29 19:21:26 UTC (rev 6097)
@@ -3,13 +3,20 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
+#include <QTime>
Queue::Queue(const QString& name): _name(name), _suspended( false )
{
+ connect( &_scheduleTimer, SIGNAL( timeout() ), this, SLOT( resume() ) );
}
Queue::~Queue()
{
+ foreach( KIOJobWrapper * job, _jobs ) {
+ job->abort();
+ delete job;
+ }
+ _jobs.clear();
// TODO: save queue on delete? or just delete jobs
}
@@ -66,6 +73,10 @@
case KMessageBox::Yes: // continue
break;
case KMessageBox::No: // delete the queue
+ foreach( KIOJobWrapper * job, _jobs ) {
+ job->abort();
+ delete job;
+ }
_jobs.clear();
emit changed();
emit emptied();
@@ -108,15 +119,52 @@
_suspended = true;
if(( _jobs.count() > 0 ) && _jobs[ 0 ]->isStarted() )
_jobs[ 0 ]->suspend();
+
+ emit stateChanged();
}
void Queue::resume()
{
_suspended = false;
+ _scheduleTimer.stop();
if( _jobs.count() > 0 ) {
if( _jobs[ 0 ]->isSuspended() )
_jobs[ 0 ]->resume();
else if( !_jobs[ 0 ]->isStarted() )
_jobs[ 0 ]->start();
}
+
+ emit stateChanged();
}
+
+void Queue::schedule( const QTime &time )
+{
+ QTime nowTime = QTime::currentTime();
+ _suspended = true;
+ if(( _jobs.count() > 0 ) && _jobs[ 0 ]->isStarted() )
+ _jobs[ 0 ]->suspend();
+
+ int now = ((nowTime.hour() * 60) + nowTime.minute() ) * 60 + nowTime.second();
+ int schedule = ((time.hour() * 60) + time.minute() ) * 60 + time.second();
+
+ int diff = schedule - now;
+ if( diff < 0 )
+ diff += 24 * 60 * 60; // 1 day plus
+
+ diff *= 1000; // milliseconds
+ _scheduleTime = time;
+
+ _scheduleTimer.stop();
+ _scheduleTimer.setSingleShot( true );
+ _scheduleTimer.start( diff );
+
+ emit stateChanged();
+}
+
+QTime Queue::scheduleTime()
+{
+ if( _suspended && _scheduleTimer.isActive() )
+ return _scheduleTime;
+ else
+ return QTime();
+}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/Queue/queue.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.h 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queue.h 2008-09-29 19:21:26 UTC (rev 6097)
@@ -4,6 +4,8 @@
#include <qobject.h>
#include "../VFS/kiojobwrapper.h"
#include <QList>
+#include <QTimer>
+#include <QTime>
class KJob;
@@ -25,6 +27,7 @@
void enqueue(KIOJobWrapper *job);
int count() { return _jobs.size(); }
bool isSuspended() { return _suspended; }
+ QTime scheduleTime();
QList<QString> itemDescriptions();
QList<KIOJobWrapper *> items();
@@ -32,6 +35,7 @@
public slots:
void suspend();
void resume();
+ void schedule( const QTime & );
protected slots:
void slotJobDestroyed( QObject * );
@@ -43,11 +47,14 @@
QString _name;
QList<KIOJobWrapper *> _jobs;
bool _suspended;
+ QTimer _scheduleTimer;
+ QTime _scheduleTime;
signals:
void showQueueDialog();
void changed();
void emptied();
+ void stateChanged();
};
#endif // QUEUE_H
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-09-29 19:21:26 UTC (rev 6097)
@@ -1,21 +1,18 @@
#include "queue_mgr.h"
#include "queuedialog.h"
+#include "queue.h"
#include <QList>
#include <klocale.h>
const QString QueueManager::defaultName=i18n( "default" );
QMap<QString, Queue*> QueueManager::_queues;
-QString QueueManager::_current=QueueManager::defaultName;
+Queue * QueueManager::_current=0;
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;
+ createQueue( defaultName );
}
QueueManager::~QueueManager()
@@ -41,13 +38,15 @@
Queue* QueueManager::currentQueue()
{
- return queue( _current );
+ return _current;
}
-void QueueManager::setCurrentQueue(const QString& queueName)
+void QueueManager::setCurrentQueue(Queue * queue)
{
- if (_queues.contains(queueName))
- _current = queueName;
+ if (_queues.contains(queue->name())) {
+ _current = queue;
+ _self->emit currentChanged( queue );
+ }
}
void QueueManager::slotShowQueueDialog()
@@ -67,3 +66,33 @@
}
QueueDialog::everyQueueIsEmpty();
}
+
+Queue * QueueManager::createQueue(const QString& queueName)
+{
+ if( _queues.contains( queueName ) )
+ return 0;
+ Queue *queue = new Queue(queueName);
+ connect( queue, SIGNAL( showQueueDialog() ), _self, SLOT( slotShowQueueDialog() ) );
+ connect( queue, SIGNAL( emptied() ), _self, SLOT( slotQueueEmptied() ) );
+ _queues.insert(queue->name(), queue);
+ _current = queue;
+
+ _self->emit queueInserted( queue );
+ _self->emit currentChanged( queue );
+ return queue;
+}
+
+void QueueManager::removeQueue( Queue * queue )
+{
+ if( _queues.count() < 2 && _queues.contains( queue->name() ) )
+ return;
+
+ _self->emit queueDeleted( queue );
+ _queues.remove( queue->name() );
+
+ QMap<QString, Queue*>::iterator it;
+ _current = _queues.begin().value();
+ _self->emit currentChanged( queue );
+
+ delete queue;
+}
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.h 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.h 2008-09-29 19:21:26 UTC (rev 6097)
@@ -23,17 +23,24 @@
static QList<QString> queues();
static Queue* currentQueue();
- static void setCurrentQueue(const QString& queueName);
+ static void setCurrentQueue( Queue * queue );
+ static Queue* createQueue(const QString& queueName);
+ static void removeQueue( Queue * queue );
- QueueManager * instance() { return _self; }
+ static QueueManager * instance() { return _self; }
protected slots:
void slotShowQueueDialog();
void slotQueueEmptied();
+
+signals:
+ void queueInserted( Queue * );
+ void queueDeleted( Queue * );
+ void currentChanged( Queue * );
protected:
static QMap<QString, Queue*> _queues;
- static QString _current;
+ static Queue * _current;
static QueueManager * _self;
};
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-29 19:21:26 UTC (rev 6097)
@@ -35,6 +35,7 @@
#include <qlayout.h>
#include <qframe.h>
#include <klocale.h>
+#include <kdialog.h>
#include <qevent.h>
#include <qpainter.h>
#include <qrect.h>
@@ -45,6 +46,10 @@
#include <qtoolbutton.h>
#include <qimage.h>
#include <kiconeffect.h>
+#include <kinputdialog.h>
+#include <kmessagebox.h>
+#include <QTimeEdit>
+#include <QProgressBar>
class KrImageButton : public QToolButton
{
@@ -92,6 +97,33 @@
bool _onIcon;
};
+class KrTimeDialog : public KDialog {
+public:
+ KrTimeDialog( QWidget * parent = 0 ) : KDialog( parent ) {
+ setWindowTitle( i18n( "Krusader::Queue Manager" ) );
+ setButtons( KDialog::Ok | KDialog::Cancel );
+ setDefaultButton( KDialog::Ok );
+ setWindowModality( Qt::WindowModal );
+
+ QWidget *mainWidget = new QWidget( this );
+ QGridLayout *grid_time = new QGridLayout;
+ QLabel * label = new QLabel( i18n( "Please enter the time to start processing the queue:" ), mainWidget );
+ grid_time->addWidget( label, 0, 0 );
+
+ QTime time = QTime::currentTime();
+ time = time.addSecs( 60 * 60 ); // add 1 hour
+ _timeEdit = new QTimeEdit( time, mainWidget );
+ _timeEdit->setDisplayFormat( "hh:mm:ss" );
+ grid_time->addWidget( _timeEdit, 1, 0 );
+ mainWidget->setLayout( grid_time );
+ setMainWidget( mainWidget );
+ }
+ QTime getStartTime() { return _timeEdit->time(); }
+
+private:
+ QTimeEdit * _timeEdit;
+};
+
QueueDialog * QueueDialog::_queueDialog = 0;
QueueDialog::QueueDialog() : QDialog( 0, Qt::FramelessWindowHint ), _autoHide( true )
@@ -138,19 +170,53 @@
QWidget *toolWg = new QWidget( this );
QHBoxLayout * hbox2 = new QHBoxLayout( toolWg );
+ hbox2->setSpacing( 0 );
+ _newTabButton = new QToolButton( this );
+ _newTabButton->setIcon( KIcon( "tab-new" ) );
+ _newTabButton->setToolTip( i18n( "Create a new queue" ) );
+ connect( _newTabButton, SIGNAL( clicked() ), this, SLOT( slotNewTab() ) );
+ hbox2->addWidget( _newTabButton );
+
+ _closeTabButton = new QToolButton( this );
+ _closeTabButton->setIcon( KIcon( "tab-close" ) );
+ _closeTabButton->setToolTip( i18n( "Remove the current queue" ) );
+ connect( _closeTabButton, SIGNAL( clicked() ), this, SLOT( slotDeleteCurrentTab() ) );
+ hbox2->addWidget( _closeTabButton );
+
_pauseButton = new QToolButton( this );
_pauseButton->setIcon( KIcon( "media-playback-pause" ) );
connect( _pauseButton, SIGNAL( clicked() ), this, SLOT( slotPauseClicked() ) );
hbox2->addWidget( _pauseButton );
- hbox2->addItem( new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum) );
+ _progressBar = new QProgressBar( this );
+ _progressBar->setMinimum( 0 );
+ _progressBar->setMaximum( 100 );
+ _progressBar->setValue( 0 );
+ _progressBar->setFormat( i18n( "unused" ) );
+ _progressBar->setTextVisible( true );
+ hbox2->addWidget( _progressBar );
+ _scheduleButton = new QToolButton( this );
+ _scheduleButton->setIcon( KIcon( "chronometer" ) );
+ _scheduleButton->setToolTip( i18n( "Schedule queue starting" ) );
+ connect( _scheduleButton, SIGNAL( clicked() ), this, SLOT( slotScheduleClicked() ) );
+ hbox2->addWidget( _scheduleButton );
+
grid_main->addWidget( toolWg, 1, 0 );
- QueueWidget *wdg = new QueueWidget( this );
- grid_main->addWidget( wdg, 2, 0 );
+ _queueWidget = new QueueWidget( this );
+ connect( _queueWidget, SIGNAL( currentChanged() ), this, SLOT( slotUpdateToolbar() ) );
+ grid_main->addWidget( _queueWidget, 2, 0 );
+ _statusLabel = new QLabel( this );
+ QSizePolicy statuspolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
+ statuspolicy.setHeightForWidth( _statusLabel->sizePolicy().hasHeightForWidth() );
+ _statusLabel->setSizePolicy( statuspolicy );
+ _statusLabel->setFrameShape( QLabel::StyledPanel );
+ _statusLabel->setFrameShadow( QLabel::Sunken );
+ grid_main->addWidget( _statusLabel, 3, 0 );
+
setLayout( grid_main );
KConfigGroup group( krConfig, "QueueManager");
@@ -170,6 +236,9 @@
move( 20, 20 );
slotUpdateToolbar();
+
+ connect( QueueManager::instance(), SIGNAL( queueInserted( Queue * ) ), this, SLOT( slotUpdateToolbar() ) );
+
show();
_queueDialog = this;
@@ -266,10 +335,19 @@
if( currentQueue->isSuspended() ) {
_pauseButton->setIcon( KIcon( "media-playback-start" ) );
_pauseButton->setToolTip( i18n( "Start processing the queue" ) );
+ QTime time = currentQueue->scheduleTime();
+ if( time.isNull() )
+ _statusLabel->setText( i18n( "The queue is paused." ) );
+ else
+ _statusLabel->setText( i18n( "Scheduled to start at %1." )
+ .arg( time.toString( "hh:mm:ss" ) ) );
} else {
+ _statusLabel->setText( i18n( "The queue is running." ) );
_pauseButton->setIcon( KIcon( "media-playback-pause" ) );
_pauseButton->setToolTip( i18n( "Pause processing the queue" ) );
}
+
+ _closeTabButton->setEnabled( _queueWidget->count() > 1 );
}
}
@@ -282,7 +360,49 @@
currentQueue->resume();
else
currentQueue->suspend();
+ }
+}
- slotUpdateToolbar();
+void QueueDialog::slotScheduleClicked()
+{
+ KrTimeDialog dialog( this );
+ if( dialog.exec() == QDialog::Accepted )
+ {
+ QTime startTime = dialog.getStartTime();
+ Queue * queue = QueueManager::currentQueue();
+ queue->schedule( startTime );
}
}
+
+void QueueDialog::slotNewTab()
+{
+ bool ok = false;
+ QString queueName = KInputDialog::getText(
+ i18n("Krusader::Queue Manager"), // Caption
+ i18n("Please enter the name of the new queue"), // Questiontext
+ QString(), // Default
+ &ok, this );
+
+ if( !ok || queueName.isEmpty() )
+ return;
+
+ Queue * queue = QueueManager::createQueue( queueName );
+ if( queue == 0 ) {
+ KMessageBox::error( this, i18n( "A queue already exists with this name!" ) );
+ }
+}
+
+void QueueDialog::slotDeleteCurrentTab()
+{
+ Queue * currentQueue = QueueManager::currentQueue();
+ if( currentQueue )
+ {
+ if( currentQueue->count() != 0 )
+ {
+ if( KMessageBox::warningContinueCancel(this,
+ i18n("Deleting the queue requires aborting all pending jobs. Do you wish to continue?"),
+ i18n("Warning") ) != KMessageBox::Continue ) return;
+ }
+ QueueManager::removeQueue( currentQueue );
+ }
+}
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-29 19:21:26 UTC (rev 6097)
@@ -35,6 +35,9 @@
class QPaintEvent;
class QToolButton;
+class QueueWidget;
+class QLabel;
+class QProgressBar;
class QueueDialog : public QDialog
{
@@ -56,6 +59,9 @@
void slotUpdateToolbar();
void slotPauseClicked();
+ void slotScheduleClicked();
+ void slotNewTab();
+ void slotDeleteCurrentTab();
protected:
virtual void paintEvent ( QPaintEvent * event );
@@ -67,8 +73,15 @@
private:
static QueueDialog * _queueDialog;
+ QToolButton * _newTabButton;
+ QToolButton * _closeTabButton;
QToolButton * _pauseButton;
+ QToolButton * _scheduleButton;
+ QProgressBar * _progressBar;
+ QueueWidget * _queueWidget;
+ QLabel * _statusLabel;
+
QPoint _clickPos;
QPoint _startPos;
bool _autoHide;
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.cpp 2008-09-29 19:21:26 UTC (rev 6097)
@@ -6,8 +6,23 @@
QList<QString> queueList = QueueManager::queues();
foreach( QString name, queueList ) {
KrQueueListWidget * jobWidget = new KrQueueListWidget( QueueManager::queue( name ), this );
+ connect( jobWidget, SIGNAL( stateChanged() ), this, SIGNAL( currentChanged() ) );
addTab( jobWidget, name );
+ _queueWidgets[ name ] = jobWidget;
}
+
+ connect( QueueManager::instance(), SIGNAL( queueInserted( Queue * ) ), this, SLOT( slotQueueAdded( Queue * ) ) );
+ connect( QueueManager::instance(), SIGNAL( queueDeleted( Queue * ) ), this, SLOT( slotQueueDeleted( Queue * ) ) );
+ connect( QueueManager::instance(), SIGNAL( currentChanged( Queue * ) ), this, SLOT( slotCurrentChanged( Queue * ) ) );
+
+ Queue * current = QueueManager::currentQueue();
+ if( current )
+ {
+ QString name = current->name();
+ setCurrentWidget( _queueWidgets[ name ] );
+ }
+
+ connect( this, SIGNAL( currentChanged ( int ) ), this, SLOT( slotCurrentChanged ( int ) ) );
}
@@ -15,11 +30,44 @@
{
}
+void QueueWidget::slotQueueAdded( Queue * queue )
+{
+ KrQueueListWidget * jobWidget = new KrQueueListWidget( queue, this );
+ connect( jobWidget, SIGNAL( stateChanged() ), this, SIGNAL( currentChanged() ) );
+ addTab( jobWidget, queue->name() );
+ _queueWidgets[ queue->name() ] = jobWidget;
+ setCurrentWidget( jobWidget );
+}
+void QueueWidget::slotQueueDeleted( Queue * queue )
+{
+ KrQueueListWidget * queueWidget = _queueWidgets[ queue->name() ];
+ _queueWidgets.remove( queue->name() );
+ int index = indexOf( queueWidget );
+ removeTab( index );
+ delete queueWidget;
+}
+
+void QueueWidget::slotCurrentChanged( int index )
+{
+ KrQueueListWidget * queueWidget = dynamic_cast<KrQueueListWidget *>( widget( index ) );
+ if( queueWidget->queue() )
+ QueueManager::setCurrentQueue( queueWidget->queue() );
+
+ emit currentChanged();
+}
+
+void QueueWidget::slotCurrentChanged( Queue * queue )
+{
+ KrQueueListWidget * queueWidget = _queueWidgets[ queue->name() ];
+ setCurrentWidget( queueWidget );
+}
+
KrQueueListWidget::KrQueueListWidget( Queue * queue, QWidget * parent ) : QListWidget( parent ),
_queue( queue )
{
connect( queue, SIGNAL( changed() ), this, SLOT( slotChanged() ) );
+ connect( queue, SIGNAL( stateChanged() ), this, SIGNAL( stateChanged() ) );
slotChanged();
}
Modified: trunk/krusader_kde4/krusader/Queue/queuewidget.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuewidget.h 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/Queue/queuewidget.h 2008-09-29 19:21:26 UTC (rev 6097)
@@ -6,12 +6,26 @@
#include <qlistwidget.h>
#include <qpointer.h>
+class KrQueueListWidget;
+
class QueueWidget: public KTabWidget
{
Q_OBJECT
public:
QueueWidget( QWidget * parent = 0 );
~QueueWidget();
+
+protected slots:
+ void slotQueueAdded( Queue * );
+ void slotQueueDeleted( Queue * );
+ void slotCurrentChanged( Queue * );
+ void slotCurrentChanged( int );
+
+signals:
+ void currentChanged();
+
+private:
+ QMap<QString, KrQueueListWidget*> _queueWidgets;
};
class KrQueueListWidget : public QListWidget
@@ -19,10 +33,14 @@
Q_OBJECT
public:
KrQueueListWidget( Queue * queue, QWidget * parent );
+ Queue * queue() { return _queue; }
public slots:
void slotChanged();
+signals:
+ void stateChanged();
+
private:
QPointer<Queue> _queue;
};
Modified: trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp 2008-09-29 19:21:26 UTC (rev 6097)
@@ -207,3 +207,7 @@
m_job->resume();
}
+void KIOJobWrapper::abort() {
+ if( m_job )
+ m_job->kill();
+}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h 2008-09-29 16:01:15 UTC (rev 6096)
+++ trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h 2008-09-29 19:21:26 UTC (rev 6097)
@@ -82,6 +82,7 @@
void suspend();
void resume();
+ void abort();
void connectTo( const char * signal, const QObject * receiver, const char * method );
void setAutoErrorHandlingEnabled( bool err ) { m_autoErrorHandling = err; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-09-29 16:01:26
|
Revision: 6096
http://krusader.svn.sourceforge.net/krusader/?rev=6096&view=rev
Author: vaclavjuza
Date: 2008-09-29 16:01:15 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
FIXED: wrong number of entries in check box group in Konfigurator; caused crash under windows
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp
Modified: trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp 2008-09-28 23:24:32 UTC (rev 6095)
+++ trunk/krusader_kde4/krusader/Konfigurator/kglookfeel.cpp 2008-09-29 16:01:15 UTC (rev 6096)
@@ -265,7 +265,8 @@
};
- pnlcbs = createCheckBoxGroup(1, 0, panelToolbarCheckboxes, 7,
+ pnlcbs = createCheckBoxGroup(1, 0, panelToolbarCheckboxes,
+ sizeof(panelToolbarCheckboxes)/sizeof(*panelToolbarCheckboxes),
panelToolbarGrp, PAGE_PANELTOOLBAR);
panelToolbarVLayout->addWidget( panelToolbarActive, 0, 0 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-09-28 23:24:42
|
Revision: 6095
http://krusader.svn.sourceforge.net/krusader/?rev=6095&view=rev
Author: vaclavjuza
Date: 2008-09-28 23:24:32 +0000 (Sun, 28 Sep 2008)
Log Message:
-----------
Windows fix: avoid infinite loop on Win32 with kde 3.1.2
Modified Paths:
--------------
trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp
Modified: trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp 2008-09-27 12:25:43 UTC (rev 6094)
+++ trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp 2008-09-28 23:24:32 UTC (rev 6095)
@@ -171,7 +171,8 @@
currentGroups = new QHash<int, char>();
uidCache = new QHash<int, QString>();
gidCache = new QHash<int, QString>();
-
+// In kdewin32 implementation as of 4.1.2, getpwent always returns the same struct
+#ifndef Q_WS_WIN
// fill the UID cache
struct passwd *pass;
while ( ( pass = getpwent() ) != 0L ) {
@@ -189,7 +190,7 @@
}
delete gr;
endgrent();
-
+#endif
// fill the groups for the current user
for ( int i = 0; i < groupNo; ++i ) {
(*currentGroups)[ groupList[ i ] ] = char( 1 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vac...@us...> - 2008-09-27 12:25:47
|
Revision: 6094
http://krusader.svn.sourceforge.net/krusader/?rev=6094&view=rev
Author: vaclavjuza
Date: 2008-09-27 12:25:43 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
FIXED: Linking failed under Windows, becauase libkdewin32.dll.a was linked before objects
using its functions (usleep)
Modified Paths:
--------------
trunk/krusader_kde4/krusader/CMakeLists.txt
Modified: trunk/krusader_kde4/krusader/CMakeLists.txt
===================================================================
--- trunk/krusader_kde4/krusader/CMakeLists.txt 2008-09-27 08:09:10 UTC (rev 6093)
+++ trunk/krusader_kde4/krusader/CMakeLists.txt 2008-09-27 12:25:43 UTC (rev 6094)
@@ -40,7 +40,7 @@
kde4_add_executable(krusader ${krusader_SRCS})
-target_link_libraries(krusader ${KDE4_KDECORE_LIBS} BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} )
+target_link_libraries(krusader BookMan Dialogs DiskUsage GUI Konfigurator KViewer MountMan Panel Queue VFS Search Splitter Synchronizer UserMenu Locate UserAction ActionMan KViewer Filter Dialogs GUI ${KDE4_KPARTS_LIBS} ${KDE4_KHTML_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDECORE_LIBS} )
install(TARGETS krusader DESTINATION ${BIN_INSTALL_DIR})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-09-27 08:09:28
|
Revision: 6093
http://krusader.svn.sourceforge.net/krusader/?rev=6093&view=rev
Author: ckarai
Date: 2008-09-27 08:09:10 +0000 (Sat, 27 Sep 2008)
Log Message:
-----------
Added: pause/resume to the queue dialog
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Queue/queue.cpp
trunk/krusader_kde4/krusader/Queue/queue.h
trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
trunk/krusader_kde4/krusader/Queue/queuedialog.h
trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp
trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h
Modified: trunk/krusader_kde4/krusader/Queue/queue.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-09-25 19:09:59 UTC (rev 6092)
+++ trunk/krusader_kde4/krusader/Queue/queue.cpp 2008-09-27 08:09:10 UTC (rev 6093)
@@ -4,7 +4,7 @@
#include <klocale.h>
#include <kmessagebox.h>
-Queue::Queue(const QString& name): _name(name)
+Queue::Queue(const QString& name): _name(name), _suspended( false )
{
}
@@ -20,7 +20,7 @@
connect( job, SIGNAL( destroyed( QObject * ) ), this, SLOT( slotJobDestroyed( QObject * ) ) );
job->connectTo( SIGNAL( result( KJob* ) ), this, SLOT( slotResult( KJob* ) ) );
- if( !isRunning )
+ if( !_suspended && !isRunning )
job->start();
emit changed();
@@ -40,7 +40,7 @@
if( _jobs.count() > 0 && _jobs[ 0 ] == jw )
current = true;
_jobs.removeAll( jw );
- if( current && _jobs.count() > 0 )
+ if( !_suspended && current && _jobs.count() > 0 )
_jobs[ 0 ]->start();
emit changed();
}
@@ -71,16 +71,19 @@
emit emptied();
return;
default: // suspend
- /* TODO */
+ emit changed();
+ suspend();
return;
}
}
emit changed();
- if( _jobs.count() > 0 )
- _jobs[ 0 ]->start();
- else
- emit emptied();
+ if( !_suspended ) {
+ if( _jobs.count() > 0 )
+ _jobs[ 0 ]->start();
+ else
+ emit emptied();
+ }
}
}
}
@@ -98,4 +101,22 @@
ret.append( job->typeStr() + " : " + job->url().prettyUrl() );
}
return ret;
-}
\ No newline at end of file
+}
+
+void Queue::suspend()
+{
+ _suspended = true;
+ if(( _jobs.count() > 0 ) && _jobs[ 0 ]->isStarted() )
+ _jobs[ 0 ]->suspend();
+}
+
+void Queue::resume()
+{
+ _suspended = false;
+ if( _jobs.count() > 0 ) {
+ if( _jobs[ 0 ]->isSuspended() )
+ _jobs[ 0 ]->resume();
+ else if( !_jobs[ 0 ]->isStarted() )
+ _jobs[ 0 ]->start();
+ }
+}
Modified: trunk/krusader_kde4/krusader/Queue/queue.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue.h 2008-09-25 19:09:59 UTC (rev 6092)
+++ trunk/krusader_kde4/krusader/Queue/queue.h 2008-09-27 08:09:10 UTC (rev 6093)
@@ -24,9 +24,14 @@
inline const QString& name() const { return _name; }
void enqueue(KIOJobWrapper *job);
int count() { return _jobs.size(); }
+ bool isSuspended() { return _suspended; }
QList<QString> itemDescriptions();
QList<KIOJobWrapper *> items();
+
+public slots:
+ void suspend();
+ void resume();
protected slots:
void slotJobDestroyed( QObject * );
@@ -37,6 +42,7 @@
QString _name;
QList<KIOJobWrapper *> _jobs;
+ bool _suspended;
signals:
void showQueueDialog();
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-25 19:09:59 UTC (rev 6092)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-27 08:09:10 UTC (rev 6093)
@@ -30,6 +30,7 @@
#include "queuedialog.h"
#include "queuewidget.h"
+#include "queue_mgr.h"
#include "../krusader.h"
#include <qlayout.h>
#include <qframe.h>
@@ -129,13 +130,26 @@
KrImageButton * closeBtn = new KrImageButton( titleWg );
closeBtn->setIcon( KIcon( "window-close" ) );
+ closeBtn->setToolTip( i18n( "Close" ) );
connect( closeBtn, SIGNAL( clicked() ), this, SLOT( reject() ) );
hbox->addWidget( closeBtn );
grid_main->addWidget( titleWg, 0, 0 );
+ QWidget *toolWg = new QWidget( this );
+ QHBoxLayout * hbox2 = new QHBoxLayout( toolWg );
+
+ _pauseButton = new QToolButton( this );
+ _pauseButton->setIcon( KIcon( "media-playback-pause" ) );
+ connect( _pauseButton, SIGNAL( clicked() ), this, SLOT( slotPauseClicked() ) );
+ hbox2->addWidget( _pauseButton );
+
+ hbox2->addItem( new QSpacerItem(10, 10, QSizePolicy::Expanding, QSizePolicy::Minimum) );
+
+ grid_main->addWidget( toolWg, 1, 0 );
+
QueueWidget *wdg = new QueueWidget( this );
- grid_main->addWidget( wdg, 1, 0 );
+ grid_main->addWidget( wdg, 2, 0 );
setLayout( grid_main );
@@ -155,6 +169,7 @@
else
move( 20, 20 );
+ slotUpdateToolbar();
show();
_queueDialog = this;
@@ -241,4 +256,33 @@
{
if( _queueDialog )
delete _queueDialog;
-}
\ No newline at end of file
+}
+
+void QueueDialog::slotUpdateToolbar()
+{
+ Queue * currentQueue = QueueManager::currentQueue();
+ if( currentQueue )
+ {
+ if( currentQueue->isSuspended() ) {
+ _pauseButton->setIcon( KIcon( "media-playback-start" ) );
+ _pauseButton->setToolTip( i18n( "Start processing the queue" ) );
+ } else {
+ _pauseButton->setIcon( KIcon( "media-playback-pause" ) );
+ _pauseButton->setToolTip( i18n( "Pause processing the queue" ) );
+ }
+ }
+}
+
+void QueueDialog::slotPauseClicked()
+{
+ Queue * currentQueue = QueueManager::currentQueue();
+ if( currentQueue )
+ {
+ if( currentQueue->isSuspended() )
+ currentQueue->resume();
+ else
+ currentQueue->suspend();
+
+ slotUpdateToolbar();
+ }
+}
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-25 19:09:59 UTC (rev 6092)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-27 08:09:10 UTC (rev 6093)
@@ -34,6 +34,7 @@
#include <qdialog.h>
class QPaintEvent;
+class QToolButton;
class QueueDialog : public QDialog
{
@@ -53,6 +54,8 @@
virtual void accept();
virtual void reject();
+ void slotUpdateToolbar();
+ void slotPauseClicked();
protected:
virtual void paintEvent ( QPaintEvent * event );
@@ -63,6 +66,9 @@
private:
static QueueDialog * _queueDialog;
+
+ QToolButton * _pauseButton;
+
QPoint _clickPos;
QPoint _startPos;
bool _autoHide;
Modified: trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp 2008-09-25 19:09:59 UTC (rev 6092)
+++ trunk/krusader_kde4/krusader/VFS/kiojobwrapper.cpp 2008-09-27 08:09:10 UTC (rev 6093)
@@ -64,14 +64,16 @@
}
KIOJobWrapper::KIOJobWrapper( KIOJobWrapperType type, KUrl &url ) : QObject( 0 ),
- m_autoErrorHandling( false ), m_delete( true ), m_started( false ) {
+ m_autoErrorHandling( false ), m_delete( true ), m_started( false ),
+ m_suspended( false ) {
moveToThread(QApplication::instance()->thread());
m_type = type;
m_url = url;
}
KIOJobWrapper::KIOJobWrapper( KIOJobWrapperType type, KUrl &url, void * userData ) : QObject( 0 ),
- m_autoErrorHandling( false ), m_delete( true ), m_started( false ) {
+ m_autoErrorHandling( false ), m_delete( true ), m_started( false ),
+ m_suspended( false ) {
moveToThread(QApplication::instance()->thread());
m_type = type;
m_url = url;
@@ -80,7 +82,8 @@
KIOJobWrapper::KIOJobWrapper( KIOJobWrapperType type, KUrl &url, KUrl::List &list,
int pmode, bool showp ) : QObject( 0 ),
- m_autoErrorHandling( false ), m_delete( true ), m_started( false ) {
+ m_autoErrorHandling( false ), m_delete( true ), m_started( false ),
+ m_suspended( false ) {
moveToThread(QApplication::instance()->thread());
m_type = type;
m_url = url;
@@ -129,6 +132,8 @@
if( m_autoErrorHandling && job->ui() )
job->ui()->setAutoErrorHandlingEnabled( true );
+ if( m_suspended )
+ job->suspend();
}
}
@@ -189,3 +194,16 @@
return i18n( "Unknown" );
}
}
+
+void KIOJobWrapper::suspend() {
+ m_suspended = true;
+ if( m_job )
+ m_job->suspend();
+}
+
+void KIOJobWrapper::resume() {
+ m_suspended = false;
+ if( m_job )
+ m_job->resume();
+}
+
Modified: trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h 2008-09-25 19:09:59 UTC (rev 6092)
+++ trunk/krusader_kde4/krusader/VFS/kiojobwrapper.h 2008-09-27 08:09:10 UTC (rev 6093)
@@ -68,6 +68,7 @@
bool m_delete;
bool m_started;
+ bool m_suspended;
KIOJobWrapper( KIOJobWrapperType type, KUrl &url );
KIOJobWrapper( KIOJobWrapperType type, KUrl &url, void * userData );
@@ -78,9 +79,14 @@
virtual ~KIOJobWrapper();
void start();
+
+ void suspend();
+ void resume();
+
void connectTo( const char * signal, const QObject * receiver, const char * method );
void setAutoErrorHandlingEnabled( bool err ) { m_autoErrorHandling = err; }
bool isStarted() { return m_started; }
+ bool isSuspended() { return m_suspended; }
KIO::Job * job() { return m_job; }
KIOJobWrapperType type() { return m_type; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-09-25 19:10:10
|
Revision: 6092
http://krusader.svn.sourceforge.net/krusader/?rev=6092&view=rev
Author: codeknight
Date: 2008-09-25 19:09:59 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
Updated release notes for a Krusader-2.0.0-beta2 "Space Odyssey" release
Modified Paths:
--------------
trunk/krusader_kde4/README
Modified: trunk/krusader_kde4/README
===================================================================
--- trunk/krusader_kde4/README 2008-09-25 19:05:19 UTC (rev 6091)
+++ trunk/krusader_kde4/README 2008-09-25 19:09:59 UTC (rev 6092)
@@ -1,8 +1,8 @@
-Krusader-2.0.0-beta1 "Phoenix Egg"
+Krusader-2.0.0-beta2 "Space Odyssey"
==================================
-The Krew is proud to present the first KDE4 release of your favourite file
+The Krew is proud to present the second KDE4 release of your favourite file
manager! This beta is all about porting, all dependencies to the Qt3 support
-libs have been removed. This is also the first release that comes with
+libs have been removed. This is also the second release that comes with
experimental support for the Windows platform. Who thought that day will ever
come?
@@ -13,7 +13,17 @@
everyone who supported us in the porting process!
The highlights of this release are:
+- many many bugfixes
+- enqueue operation for copy / move (alpha without gui)
+- Konfigurator mouse selection mode: Possibility to select a predefined
+ mode and change a detail.
+- highlight quick search match
+- Useractions: added checkbox "enabled"
+ and run mode option "Run in embedded terminal emulator"
+- the description of a dir contains its size if it is known
+Changes since 2.0.0-beta1 (but not limited to):
+
- Ported to KDE4 not using any of the Qt3 support libs
- Experimental support for the Windows platform
- Send emails with Thunderbird
@@ -281,7 +291,7 @@
[h.eichmann * gmx de]
- Jonas Baehr, developer
[jonas baehr * users web de]
-- Vaclav Juza
+- Vaclav Juza, developer
[vaclavjuza * seznam.cz]
- Frank Schoolmeesters, documentation and marketing coordinator
[frank_schoolmeesters * yahoo com]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-09-25 19:05:36
|
Revision: 6091
http://krusader.svn.sourceforge.net/krusader/?rev=6091&view=rev
Author: codeknight
Date: 2008-09-25 19:05:19 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
Dutch I18N update
Modified Paths:
--------------
trunk/krusader_kde4/ChangeLog
trunk/krusader_kde4/po/nl.po
Modified: trunk/krusader_kde4/ChangeLog
===================================================================
--- trunk/krusader_kde4/ChangeLog 2008-09-25 18:56:02 UTC (rev 6090)
+++ trunk/krusader_kde4/ChangeLog 2008-09-25 19:05:19 UTC (rev 6091)
@@ -41,6 +41,7 @@
FIXED: Do not duplicate menu entries in UserAction menu while still not crashing when
configuring toolbars.
+ I18N: Updated Dutch translation
I18N: Updated Czech translation
I18N: Updated Ukrainian translation (thanks Yuri Chornoivan)
I18N: Updated Slovenian translation (thanks Matej Urbancic)
Modified: trunk/krusader_kde4/po/nl.po
===================================================================
--- trunk/krusader_kde4/po/nl.po 2008-09-25 18:56:02 UTC (rev 6090)
+++ trunk/krusader_kde4/po/nl.po 2008-09-25 19:05:19 UTC (rev 6091)
@@ -4,15 +4,15 @@
# Copyright (C) 2004-2008, Krusader Krew
# This file is distributed under the same license as the Krusader package.
#
-# Frank Schoolmeesters [frank_schoolmeesters {*} yahoo {.} com] 2003-2007.
# Proofread and fixes by Monkey 9 <mo...@ia...>, 2005.
+# Frank Schoolmeesters <fra...@ya...>, 2003, 2004, 2005, 2006, 2007, 2008.
#
msgid ""
msgstr ""
"Project-Id-Version: krusader-2.0.0-beta1\n"
"Report-Msgid-Bugs-To: kru...@go...\n"
"POT-Creation-Date: 2008-09-22 20:47+0200\n"
-"PO-Revision-Date: 2007-04-10 23:11+0200\n"
+"PO-Revision-Date: 2008-09-25 20:06+0200\n"
"Last-Translator: Frank Schoolmeesters <fra...@ya...>\n"
"Language-Team: Dutch <kru...@go...>\n"
"MIME-Version: 1.0\n"
@@ -93,24 +93,24 @@
msgstr "Diskette"
#: GUI/mediabutton.cpp:179
-#, fuzzy, kde-format
+#, kde-format
msgid "CD/DVD-ROM"
-msgstr "CD-ROM"
+msgstr "CD/DVD-ROM"
#: GUI/mediabutton.cpp:181
#, kde-format
msgid "USB pen drive"
-msgstr ""
+msgstr "USB stick"
#: GUI/mediabutton.cpp:183
#, kde-format
msgid "USB device"
-msgstr ""
+msgstr "USB toestel"
#: GUI/mediabutton.cpp:185
#, kde-format
msgid "Removable media"
-msgstr ""
+msgstr "Verwijderbare media"
#: GUI/mediabutton.cpp:187
#, kde-format
@@ -118,24 +118,24 @@
msgstr "Harde schijf"
#: GUI/mediabutton.cpp:189
-#, fuzzy, kde-format
+#, kde-format
msgid "Camera"
-msgstr "Naam"
+msgstr "Camera"
#: GUI/mediabutton.cpp:191
#, kde-format
msgid "Video CD/DVD-ROM"
-msgstr ""
+msgstr "Video CD/DVD-ROM"
#: GUI/mediabutton.cpp:193
#, kde-format
msgid "Audio CD/DVD-ROM"
-msgstr ""
+msgstr "Audio CD/DVD-ROM"
#: GUI/mediabutton.cpp:195
#, kde-format
msgid "Recordable CD/DVD-ROM"
-msgstr ""
+msgstr "Herschrijfbare CD/DVD-ROM"
#: GUI/mediabutton.cpp:325 Panel/krpopupmenu.cpp:69
#: BookMan/krbookmarkhandler.cpp:557
@@ -169,12 +169,12 @@
#: GUI/mediabutton.cpp:423
#, kde-format
msgid "An error occurred while accessing '%1', the system responded: %2"
-msgstr ""
+msgstr "Er is een fout opgetreden bij het aanspreken van '%1', het systeem geeft de volgende foutmeling weer: %2"
#: GUI/mediabutton.cpp:426
#, kde-format
msgid "An error occurred while accessing '%1'"
-msgstr ""
+msgstr "Er is een fout opgetreden bij het aanspreken van '%1'"
#: GUI/syncbrowsebutton.cpp:45 GUI/syncbrowsebutton.cpp:48
#, kde-format
@@ -392,37 +392,37 @@
"%1"
#: VFS/preserveattrcopyjob.cpp:334 VFS/virtualcopyjob.cpp:389
-#, fuzzy, kde-format
+#, kde-format
msgctxt "@title job"
msgid "Moving"
-msgstr "Bestanden verplaatsen"
+msgstr "Verplaatsen"
#: VFS/preserveattrcopyjob.cpp:335 VFS/preserveattrcopyjob.cpp:342
#: VFS/preserveattrcopyjob.cpp:349 VFS/preserveattrcopyjob.cpp:373
#: VFS/virtualcopyjob.cpp:384 VFS/virtualcopyjob.cpp:390
-#, fuzzy, kde-format
+#, kde-format
msgid "Source"
-msgstr "Bron:"
+msgstr "Bron"
#: VFS/preserveattrcopyjob.cpp:336 VFS/preserveattrcopyjob.cpp:343
#: VFS/preserveattrcopyjob.cpp:350 VFS/preserveattrcopyjob.cpp:374
#: VFS/virtualcopyjob.cpp:385 VFS/virtualcopyjob.cpp:391
-#, fuzzy, kde-format
+#, kde-format
msgid "Destination"
-msgstr "Bestemming:"
+msgstr "Bestemming"
#: VFS/preserveattrcopyjob.cpp:341 VFS/preserveattrcopyjob.cpp:348
#: VFS/preserveattrcopyjob.cpp:372 VFS/virtualcopyjob.cpp:383
-#, fuzzy, kde-format
+#, kde-format
msgctxt "@title job"
msgid "Copying"
-msgstr "Bestanden kopiëren"
+msgstr "Kopiëren"
#: VFS/preserveattrcopyjob.cpp:361
-#, fuzzy, kde-format
+#, kde-format
msgctxt "@title job"
msgid "Creating directory"
-msgstr "Hoofdmap"
+msgstr "Map aanmaken"
#: VFS/preserveattrcopyjob.cpp:362 Panel/krinterview.cpp:205
#: Panel/krbriefview.cpp:226 Panel/krdetailedview.cpp:317
@@ -432,7 +432,7 @@
msgstr "Map"
#: VFS/preserveattrcopyjob.cpp:793
-#, fuzzy, kde-format
+#, kde-format
msgid "Folder Already Exists"
msgstr "Bestand bestaat reeds"
@@ -443,9 +443,9 @@
msgstr "Bestand bestaat reeds"
#: VFS/preserveattrcopyjob.cpp:1074 VFS/preserveattrcopyjob.cpp:1594
-#, fuzzy, kde-format
+#, kde-format
msgid "Already Exists as Folder"
-msgstr "Bestand bestaat reeds"
+msgstr "Bestaat reeds als map"
#: VFS/normal_vfs.cpp:91
#, kde-format
@@ -499,19 +499,19 @@
msgstr "Status"
#: VFS/kiojobwrapper.cpp:181
-#, fuzzy, kde-format
+#, kde-format
msgid "Directory Size"
-msgstr "Mappen"
+msgstr "Mapgrootte"
#: VFS/kiojobwrapper.cpp:184
-#, fuzzy, kde-format
+#, kde-format
msgid "Copy"
-msgstr " Kopiëren"
+msgstr "Kopiëren"
#: VFS/kiojobwrapper.cpp:187
-#, fuzzy, kde-format
+#, kde-format
msgid "Move"
-msgstr " Verplaatsen"
+msgstr "Verplaatsen"
#: VFS/krquery.cpp:159 Filter/generalfilter.cpp:142
#: Konfigurator/konfigurator.cpp:159
@@ -665,60 +665,55 @@
#: Filter/generalfilter.cpp:56
msgid "Any Character"
-msgstr ""
+msgstr "Willekeurig karakter"
#: Filter/generalfilter.cpp:57
-#, fuzzy
msgid "Start of Line"
-msgstr "Startop profiel:"
+msgstr "Start van de lijn"
#: Filter/generalfilter.cpp:58
msgid "End of Line"
-msgstr ""
+msgstr "Einde van de lijn"
#: Filter/generalfilter.cpp:59
msgid "Set of Characters"
-msgstr ""
+msgstr "Karakterset"
#: Filter/generalfilter.cpp:60
msgid "Repeats, Zero or More Times"
-msgstr ""
+msgstr "Herhalingen, nul of meerdere keren"
#: Filter/generalfilter.cpp:61
msgid "Repeats, One or More Times"
-msgstr ""
+msgstr "Herhalingen, één of meerdere keren"
#: Filter/generalfilter.cpp:62
-#, fuzzy
msgid "Optional"
-msgstr "&Opties"
+msgstr "Optioneel"
#: Filter/generalfilter.cpp:63
msgid "Escape"
-msgstr ""
+msgstr "Escape"
#: Filter/generalfilter.cpp:64
msgid "TAB"
-msgstr ""
+msgstr "TAB"
#: Filter/generalfilter.cpp:65
-#, fuzzy
msgid "Newline"
-msgstr "Nieuwe koppeling"
+msgstr "Nieuwe lijn"
#: Filter/generalfilter.cpp:66
msgid "Carriage Return"
-msgstr ""
+msgstr "Carriage Return"
#: Filter/generalfilter.cpp:67
-#, fuzzy
msgid "White Space"
-msgstr "Wit"
+msgstr "Witte ruimte"
#: Filter/generalfilter.cpp:68
-#, fuzzy
msgid "Digit"
-msgstr "Rechts"
+msgstr "Digit"
#: Filter/generalfilter.cpp:101
#, kde-format
@@ -833,12 +828,12 @@
#: Filter/generalfilter.cpp:265
#, kde-format
msgid "RegExp"
-msgstr ""
+msgstr "RegExp"
#: Filter/generalfilter.cpp:286
-#, fuzzy, kde-format
+#, kde-format
msgid "Encoding:"
-msgstr "Bewerken"
+msgstr "Encode:"
#: Filter/generalfilter.cpp:301
#, kde-format
@@ -1096,8 +1091,7 @@
#: UserAction/expander.cpp:58
#, kde-format
msgid "Needed panel specification missing in expander %1"
-msgstr ""
-"Noodzakelijke venster specificatie ontbreekt in het uitbereidingsmenu %1"
+msgstr "Noodzakelijke venster specificatie ontbreekt in het uitbereidingsmenu %1"
#: UserAction/expander.cpp:73
#, kde-format
@@ -1129,7 +1123,7 @@
#: UserAction/expander.cpp:401
#, kde-format
msgid "Expander: Bad argument to Count: %1 is not valid item specifier"
-msgstr "Uitberedingsmenu: Slecht argument in tellen: %1 is geen geldig item"
+msgstr "Uitbereidingsmenu: Slecht argument in tellen: %1 is geen geldig item"
#: UserAction/expander.cpp:410
#, kde-format
@@ -1217,7 +1211,7 @@
#: UserAction/expander.cpp:572
#, kde-format
msgid "Expander: at least 1 parameter is required for Goto!"
-msgstr ""
+msgstr "Uitbereidingsmenu: tenminste één parameter is noodzakelijk voor \"Goto\"!"
#: UserAction/expander.cpp:603
#, kde-format
@@ -1242,7 +1236,7 @@
#: UserAction/expander.cpp:614
#, kde-format
msgid "Expander: at least 1 parameter is required for Ask!"
-msgstr ""
+msgstr "Uitbereidingsmenu: tenminste één parameter is noodzakelijk voor \"Ask\"!"
#: UserAction/expander.cpp:619
#, kde-format
@@ -1269,13 +1263,12 @@
#: UserAction/expander.cpp:653
#, kde-format
msgid "Expander: at least 1 parameter is required for Clipboard!"
-msgstr ""
+msgstr "Uitbereidingsmenu: tenminste één parameter is noodzakelijk voor het klemmenbord!"
#: UserAction/expander.cpp:659
#, kde-format
msgid "Expander: %Each% may not be in the second argument of %Clipboard%"
-msgstr ""
-"Uitberedingsmenu: %Each% mag niet in het tweede argument van %Clipboard% zijn"
+msgstr "Uitberedingsmenu: %Each% mag niet in het tweede argument van %Clipboard% zijn"
#: UserAction/expander.cpp:672
#, kde-format
@@ -1290,7 +1283,7 @@
#: UserAction/expander.cpp:680
#, kde-format
msgid "Expander: at least 2 parameter is required for Copy!"
-msgstr ""
+msgstr "Uitbereidingsmenu: tenminste één parameter is noodzakelijk voor \"Kopiëren\"!"
#: UserAction/expander.cpp:687
#, kde-format
@@ -1320,7 +1313,7 @@
#: UserAction/expander.cpp:716
#, kde-format
msgid "Expander: at least 2 parameter is required for Move!"
-msgstr ""
+msgstr "Uitbereidingsmenu: tenminste één parameter is noodzakelijk voor \"Verplaatsen\"!"
#: UserAction/expander.cpp:723
#, kde-format
@@ -1356,8 +1349,7 @@
#: UserAction/expander.cpp:769
#, kde-format
msgid "Expander: no profile specified for %_NewSearch(profile)%"
-msgstr ""
-"Uitberedingsmenu: geen profiel gespecifieerd voor %_NewSearch(profile)%"
+msgstr "Uitberedingsmenu: geen profiel gespecifieerd voor %_NewSearch(profile)%"
#: UserAction/expander.cpp:780
#, kde-format
@@ -1608,8 +1600,7 @@
#: UserAction/kraction.cpp:224
#, kde-format
-msgid ""
-"Embedded terminal emulator does not work, using output collection instead."
+msgid "Embedded terminal emulator does not work, using output collection instead."
msgstr ""
"Terminal emulator werkt niet, maakt in de plaats gebruik van de uitvoer "
"collector."
@@ -1628,7 +1619,7 @@
#: UserAction/useraction.cpp:169
#, kde-format
msgid "The actionfile's root-element isn't called "
-msgstr ""
+msgstr "Het actiebestand root element is niet aangeroepen"
#: UserAction/useraction.cpp:181
#, kde-format
@@ -1650,9 +1641,9 @@
msgstr "Gebruikeracties - ongeldige handeling"
#: Panel/krinterview.cpp:58
-#, fuzzy, kde-format
+#, kde-format
msgid "&Experimental View"
-msgstr "&Detail weergave"
+msgstr "&Experimentele weergave"
#: Panel/krdetailedviewitem.cpp:79 Panel/krdetailedviewitem.cpp:113
#: Synchronizer/synchronizergui.cpp:2064 Synchronizer/synchronizergui.cpp:2071
@@ -1950,8 +1941,7 @@
#: Panel/panelpopup.cpp:270
#, kde-format
msgid "Tree Panel: a tree view of the local file system"
-msgstr ""
-"Boomstruktuur venster: boomstruktuurweergave van het lokale bestandsysteem"
+msgstr "Boomstruktuur venster: boomstruktuurweergave van het lokale bestandsysteem"
#: Panel/panelpopup.cpp:278
#, kde-format
@@ -2319,10 +2309,8 @@
#, kde-format
msgid "Do you really want to move this item to the trash?"
msgid_plural "Do you really want to move these %1 items to the trash?"
-msgstr[0] ""
-"_n: Bent u er zeker van dat u dit item naar de prullenbak wilt verplaatsen?"
-msgstr[1] ""
-"Bent u er zeker van dat u %1 items naar de prullenbak wilt verplaatsen?"
+msgstr[0] "_n: Bent u er zeker van dat u dit item naar de prullenbak wilt verplaatsen?"
+msgstr[1] "Bent u er zeker van dat u %1 items naar de prullenbak wilt verplaatsen?"
#: Panel/panelfunc.cpp:688 DiskUsage/diskusage.cpp:610
#, kde-format
@@ -2330,7 +2318,7 @@
msgstr "&Prullenbak"
#: Panel/panelfunc.cpp:690
-#, fuzzy, kde-format
+#, kde-format
msgid ""
"Do you really want to delete this virtual item (physical files stay "
"untouched)?"
@@ -2338,7 +2326,7 @@
"Do you really want to delete these %1 virtual items (physical files stay "
"untouched)?"
msgstr[0] ""
-"_n: Bent u er zeker van dat u dit viruele item wil verwijderen (de fysieke "
+"Bent u er zeker van dat u dit viruele item wil verwijderen (de fysieke "
"bestanden blijven overanderd)?"
msgstr[1] ""
"Bent u er zeker van dat u deze %1 viruele items wil verwijderen (de fysieke "
@@ -2481,29 +2469,29 @@
#: Queue/queue.cpp:55
#, kde-format
msgid "An error occurred during processing the queue.\n"
-msgstr ""
+msgstr "Er is een fout ontstaan tijdens de verwerking van de wachtrij.\n"
#: Queue/queue.cpp:57
#, kde-format
msgid "The last processed element in the queue was aborted.\n"
-msgstr ""
+msgstr "Het laatste verwerkte element in de wachtrij is afgebroken.\n"
#: Queue/queue.cpp:58
#, kde-format
msgid ""
"Do you wish to continue with the next element, delete the queue or suspend "
"the queue?"
-msgstr ""
+msgstr "Wilt u verder gaan met het volgende element in de wachtrij, de wachtrij wissen of de wachtrij opschorten?"
#: Queue/queue.cpp:60
-#, fuzzy, kde-format
+#, kde-format
msgid "Krusader::Queue"
-msgstr "Krusader::Locate"
+msgstr "Krusader::Wachtrij"
#: Queue/queue.cpp:61
-#, fuzzy, kde-format
+#, kde-format
msgid "Suspend"
-msgstr "Samenvoegen"
+msgstr "Opschorten"
#: Locate/locate.cpp:119 Locate/locate.cpp:123 Locate/locate.cpp:390
#, kde-format
@@ -3408,9 +3396,9 @@
msgstr "Aanmaken in:"
#: BookMan/kraddbookmarkdlg.cpp:74
-#, fuzzy, kde-format
+#, kde-format
msgid "Folders"
-msgstr "Map..."
+msgstr "Mappen"
#: BookMan/kraddbookmarkdlg.cpp:118
#, kde-format
@@ -3418,14 +3406,13 @@
msgstr "Mapnaam:"
#: MountMan/kmountman.cpp:203
-#, fuzzy, kde-format
+#, kde-format
msgid ""
"<qt>Error ejecting device!\n"
" You have to configure the path to the 'eject' tool. Please check the "
"<b>Dependencies</b> page in Krusader's settings.</qt>"
msgstr ""
-"<qt>Krusader kan geen controlesom applicatie vinden op uw computer dat %1 "
-"kan behandelen. Controleer a.u.b. de <b>Afhankelijkheden</b> pagina in de "
+"<qt>Fout bij het uitwerpen van het toestel. Je moet het path configureren van de \"eject\" tool. Controleer a.u.b. de <b>Afhankelijkheden</b> pagina in de "
"Krusader instellingen.</qt>"
#: MountMan/kmountman.cpp:233
@@ -3459,9 +3446,9 @@
msgstr "MountMan is niet operationeel. Sorry"
#: MountMan/kmountmangui.cpp:65
-#, fuzzy, kde-format
+#, kde-format
msgid "Mount.Man"
-msgstr "MountMan"
+msgstr "Mount.Man"
#: MountMan/kmountmangui.cpp:72 Synchronizer/synchronizedialog.cpp:126
#, kde-format
@@ -3494,9 +3481,9 @@
msgstr "Vrij %"
#: MountMan/kmountmangui.cpp:164
-#, fuzzy, kde-format
+#, kde-format
msgid "MountMan.Info"
-msgstr "MountMan"
+msgstr "MountMan.Info"
#: MountMan/kmountmangui.cpp:214 MountMan/kmountmangui.cpp:332
#, kde-format
@@ -3523,8 +3510,7 @@
#: MountMan/kmountmangui.cpp:364
#, kde-format
-msgid ""
-"MountMan has an internal error. Please notify the developers. Thank you."
+msgid "MountMan has an internal error. Please notify the developers. Thank you."
msgstr ""
"MountMan heeft een interne fout. Verwittig gelieve de Krusader "
"ontwikkelaars. Dank U."
@@ -3552,9 +3538,10 @@
"(c) 2000-2003, Shie Erlich, Rafi Yanai\n"
"(c) 2004-2008, Krusader Krew"
msgstr ""
+"(c) 2000-2003, Shie Erlich, Rafi Yanai\n"
+"(c) 2004-2008, Krusader Krew"
#: main.cpp:112
-#, fuzzy
msgid ""
"Feedback:\n"
"http://www.krusader.org/phpBB/\n"
@@ -3562,7 +3549,7 @@
"IRC\n"
"server: irc.freenode.net, channel: #krusader"
msgstr ""
-"Feedback\n"
+"Feedback:\n"
"http://www.krusader.org/phpBB/\n"
"\n"
"IRC\n"
@@ -3570,462 +3557,455 @@
#: main.cpp:115
msgid "Rafi Yanai"
-msgstr ""
+msgstr "Rafi Yanai"
#: main.cpp:115 main.cpp:116
-#, fuzzy
msgid "Author"
-msgstr "uur"
+msgstr "Auteur"
#: main.cpp:116
msgid "Shie Erlich"
-msgstr ""
+msgstr "Shie Erlich"
#: main.cpp:117
msgid "Karai Csaba"
-msgstr ""
+msgstr "Karai Csaba"
#: main.cpp:117 main.cpp:118 main.cpp:119 main.cpp:120
msgid "Developer"
-msgstr ""
+msgstr "Ontwikkelaar"
#: main.cpp:118
msgid "Heiner Eichmann"
-msgstr ""
+msgstr "Heiner Eichmann"
#: main.cpp:119
msgid "Jonas Baehr"
-msgstr ""
+msgstr "Jonas Baehr"
#: main.cpp:120 main.cpp:125
msgid "Václav Juza"
-msgstr ""
+msgstr "Václav Juza"
#: main.cpp:121 main.cpp:154
msgid "Dirk Eschler"
-msgstr ""
+msgstr "Dirk Eschler"
#: main.cpp:121
msgid "Webmaster and i18n coordinator"
-msgstr ""
+msgstr "Webmaster and i18n coordinator"
#: main.cpp:122 main.cpp:150
msgid "Frank Schoolmeesters"
-msgstr ""
+msgstr "Frank Schoolmeesters"
#: main.cpp:122
msgid "Documentation and marketing coordinator"
-msgstr ""
+msgstr "Documentatie en marketing coördinator"
#: main.cpp:123
msgid "Richard Holt"
-msgstr ""
+msgstr "Richard Holt"
#: main.cpp:123
msgid "Documentation & Proofing"
-msgstr ""
+msgstr "Documentatie & spellingscontrole"
#: main.cpp:124 main.cpp:170
msgid "Matej Urbancic"
-msgstr ""
+msgstr "Matej Urbancic"
#: main.cpp:124
msgid " Marketing & Product Research"
-msgstr ""
+msgstr " Marketing & product onderzoek"
#: main.cpp:125 main.cpp:126 main.cpp:137
msgid "QA, bug-hunting, patches and general help"
-msgstr ""
+msgstr "QA, bug-hunting, patches and general help"
#: main.cpp:126
msgid "Jiri Palecek"
-msgstr ""
+msgstr "Jiri Palecek"
#: main.cpp:127
msgid "Jiri Klement"
-msgstr ""
+msgstr "Jiri Klement"
#: main.cpp:127
msgid "Important help in KDE 4 porting"
-msgstr ""
+msgstr "Important help in KDE 4 porting"
#: main.cpp:128
msgid "Andrew Neupokoev"
-msgstr ""
+msgstr "Andrew Neupokoev"
#: main.cpp:128
msgid "Killer Logo and Icons for Krusader (contest winner)"
-msgstr ""
+msgstr "Killer Logo and Icons for Krusader (contest winner)"
#: main.cpp:129
msgid "The UsefulArts Organization"
-msgstr ""
+msgstr "The UsefulArts Organization"
#: main.cpp:129
-#, fuzzy
msgid "Icon for krusader"
-msgstr "&Krusader configureren..."
+msgstr "Icoon voor Krusader"
#: main.cpp:130
msgid "Gábor Lehel"
-msgstr ""
+msgstr "Gábor Lehel"
#: main.cpp:130
msgid "Viewer module for 3rd Hand"
-msgstr ""
+msgstr "Viewer module for 3rd Hand"
#: main.cpp:131
msgid "Mark Eatough"
-msgstr ""
+msgstr "Mark Eatough"
#: main.cpp:131
msgid "Handbook Proof-Reader"
-msgstr ""
+msgstr "Handbook Proof-Reader"
#: main.cpp:132
msgid "Jan Halasa"
-msgstr ""
+msgstr "Jan Halasa"
#: main.cpp:132
msgid "The old Bookmark Module"
-msgstr ""
+msgstr "The old Bookmark Module"
#: main.cpp:133
msgid "Hans Loeffler"
-msgstr ""
+msgstr "Hans Loeffler"
#: main.cpp:133
msgid "Dir history button"
-msgstr ""
+msgstr "Dir history button"
#: main.cpp:134
msgid "Szombathelyi György"
-msgstr ""
+msgstr "Szombathelyi György"
#: main.cpp:134
msgid "ISO KIO slave"
-msgstr ""
+msgstr "ISO KIO slave"
#: main.cpp:135
msgid "Jan Willem van de Meent (Adios)"
-msgstr ""
+msgstr "Jan Willem van de Meent (Adios)"
#: main.cpp:135
-#, fuzzy
msgid "Icons for Krusader"
-msgstr "&Krusader configureren..."
+msgstr "Icons for Krusader"
#: main.cpp:136
msgid "Mikolaj Machowski"
-msgstr ""
+msgstr "Mikolaj Machowski"
#: main.cpp:136
msgid "Usability and QA"
-msgstr ""
+msgstr "Usability and QA"
#: main.cpp:137
msgid "Cristi Dumitrescu"
-msgstr ""
+msgstr "Cristi Dumitrescu"
#: main.cpp:138
msgid "Aurelien Gateau"
-msgstr ""
+msgstr "Aurelien Gateau"
#: main.cpp:138
-#, fuzzy
msgid "patch for KViewer"
-msgstr "Naar bestanden zoeken"
+msgstr "patch for KViewer"
#: main.cpp:139
msgid "Milan Brabec"
-msgstr ""
+msgstr "Milan Brabec"
#: main.cpp:139
msgid "the first patch ever !"
-msgstr ""
+msgstr "the first patch ever !"
#: main.cpp:140
msgid "Asim Husanovic"
-msgstr ""
+msgstr "Asim Husanovic"
#: main.cpp:140
msgid "Bosnian translation"
-msgstr ""
+msgstr "Bosnian translation"
#: main.cpp:141
msgid "Doutor Zero"
-msgstr ""
+msgstr "Doutor Zero"
#: main.cpp:141
msgid "Brazilian Portuguese"
-msgstr ""
+msgstr "Brazilian Portuguese"
#: main.cpp:142
msgid "Milen Ivanov"
-msgstr ""
+msgstr "Milen Ivanov"
#: main.cpp:142
msgid "Bulgarian translation"
-msgstr ""
+msgstr "Bulgarian translation"
#: main.cpp:143
msgid "Quim Perez"
-msgstr ""
+msgstr "Quim Perez"
#: main.cpp:143
msgid "Catalan translation"
-msgstr ""
+msgstr "Catalan translation"
#: main.cpp:144
msgid "Jinghua Luo"
-msgstr ""
+msgstr "Jinghua Luo"
#: main.cpp:144
msgid "Chinese Simplified translation"
-msgstr ""
+msgstr "Chinese Simplified translation"
#: main.cpp:145
-#, fuzzy
msgid "Mitek"
-msgstr "Titel"
+msgstr "Mitek"
#: main.cpp:145 main.cpp:146
msgid "Old Czech translation"
-msgstr ""
+msgstr "Old Czech translation"
#: main.cpp:146
msgid "Martin Sixta"
-msgstr ""
+msgstr "Martin Sixta"
#: main.cpp:147
msgid "Vaclav Juza"
-msgstr ""
+msgstr "Vaclav Juza"
#: main.cpp:147
msgid "Czech translation"
-msgstr ""
+msgstr "Czech translation"
#: main.cpp:148
msgid "Anders Bruun Olsen"
-msgstr ""
+msgstr "Anders Bruun Olsen"
#: main.cpp:148
msgid "Old Danish translation"
-msgstr ""
+msgstr "Old Danish translation"
#: main.cpp:149
msgid "Peter H. Sorensen"
-msgstr ""
+msgstr "Peter H. Sorensen"
#: main.cpp:149
-#, fuzzy
msgid "Danish translation"
-msgstr "Bestemming:"
+msgstr "Danish translation"
#: main.cpp:150
msgid "Dutch translation"
-msgstr ""
+msgstr "Nederlandstalige vertaling"
#: main.cpp:151
msgid "Rene-Pierre Lehmann"
-msgstr ""
+msgstr "Rene-Pierre Lehmann"
#: main.cpp:151
msgid "Old French translation"
-msgstr ""
+msgstr "Oude Franstalige vertaling"
#: main.cpp:152
msgid "David Guillerm"
-msgstr ""
+msgstr "David Guillerm"
#: main.cpp:152
msgid "French translation"
-msgstr ""
+msgstr "Franstalige vertaling"
#: main.cpp:153
msgid "Christoph Thielecke"
-msgstr ""
+msgstr "Christoph Thielecke"
#: main.cpp:153
msgid "Old German translation"
-msgstr ""
+msgstr "Oude Duitstalige vertaling"
#: main.cpp:154
msgid "German translation"
-msgstr ""
+msgstr "Duitstalige vertaling"
#: main.cpp:155
msgid "Spiros Georgaras"
-msgstr ""
+msgstr "Spiros Georgaras"
#: main.cpp:155
msgid "Greek translation"
-msgstr ""
+msgstr "Griekse vertaling"
#: main.cpp:156
msgid "Kukk Zoltan"
-msgstr ""
+msgstr "Kukk Zoltan"
#: main.cpp:156
msgid "Old Hungarian translation"
-msgstr ""
+msgstr "Oude Hongaarse vertaling"
#: main.cpp:157
msgid "Arpad Biro"
-msgstr ""
+msgstr "Arpad Biro"
#: main.cpp:157
msgid "Hungarian translation"
-msgstr ""
+msgstr "Hongaarse vertaling"
#: main.cpp:158
msgid "Giuseppe Bordoni"
-msgstr ""
+msgstr "Giuseppe Bordoni"
#: main.cpp:158
msgid "Italian translation"
-msgstr ""
+msgstr "Italiaanse vertaling"
#: main.cpp:159
msgid "Hideki Kimura"
-msgstr ""
+msgstr "Hideki Kimura"
#: main.cpp:159
msgid "Japanese translation"
-msgstr ""
+msgstr "Japanse vertaling"
#: main.cpp:160
msgid "UTUMI Hirosi"
-msgstr ""
+msgstr "UTUMI Hirosi"
#: main.cpp:160
msgid "Old Japanese translation"
-msgstr ""
+msgstr "Oude Japanse vertaling"
#: main.cpp:161
msgid "Dovydas Sankauskas"
-msgstr ""
+msgstr "Dovydas Sankauskas"
#: main.cpp:161
msgid "Lithuanian translation"
-msgstr ""
+msgstr "Lithuanian translation"
#: main.cpp:162
msgid "Bruno Queiros"
-msgstr ""
+msgstr "Bruno Queiros"
#: main.cpp:162
-#, fuzzy
msgid "Portuguese translation"
-msgstr "Acties importeren"
+msgstr "Portugese vertaling"
#: main.cpp:163
msgid "Lukasz Janyst"
-msgstr ""
+msgstr "Lukasz Janyst"
#: main.cpp:163
msgid "Old Polish translation"
-msgstr ""
+msgstr "Oude Poolse vertaling"
#: main.cpp:164
msgid "Pawel Salawa"
-msgstr ""
+msgstr "Pawel Salawa"
#: main.cpp:164 main.cpp:165
msgid "Polish translation"
-msgstr ""
+msgstr "Poolse vertaling"
#: main.cpp:165
msgid "Tomek Grzejszczyk"
-msgstr ""
+msgstr "Tomek Grzejszczyk"
#: main.cpp:166
msgid "Dmitry A. Bugay"
-msgstr ""
+msgstr "Dmitry A. Bugay"
#: main.cpp:166
msgid "Russian translation"
-msgstr ""
+msgstr "Russische vertaling"
#: main.cpp:167
msgid "Dmitry Chernyak"
-msgstr ""
+msgstr "Dmitry Chernyak"
#: main.cpp:167
msgid "Old Russian translation"
-msgstr ""
+msgstr "Oude Russische vertaling"
#: main.cpp:168
msgid "Sasa Tomic"
-msgstr ""
+msgstr "Sasa Tomic"
#: main.cpp:168
msgid "Serbian translation"
-msgstr ""
+msgstr "Servische vertaling"
#: main.cpp:169
msgid "Zdenko Podobna"
-msgstr ""
+msgstr "Zdenko Podobna"
#: main.cpp:169
msgid "Slovak translation"
-msgstr ""
+msgstr "Slovaakse vertaling"
#: main.cpp:170
msgid "Slovenian translation"
-msgstr ""
+msgstr "Sloveense vertaling"
#: main.cpp:171
msgid "Rafael Munoz"
-msgstr ""
+msgstr "Rafael Munoz"
#: main.cpp:171
msgid "Old Spanish translation"
-msgstr ""
+msgstr "Oude Spaanse vertaling"
#: main.cpp:172
msgid "Alejandro Araiza Alvarado"
-msgstr ""
+msgstr "Alejandro Araiza Alvarado"
#: main.cpp:172
msgid "Spanish translation"
-msgstr ""
+msgstr "Spaanse vertaling"
#: main.cpp:173
msgid "Erik Johanssen"
-msgstr ""
+msgstr "Erik Johanssen"
#: main.cpp:173 main.cpp:174
msgid "Old Swedish translation"
-msgstr ""
+msgstr "Oude Zweedse vertaling"
#: main.cpp:174
msgid "Anders Linden"
-msgstr ""
+msgstr "Anders Linden"
#: main.cpp:175
msgid "Peter Landgren"
-msgstr ""
+msgstr "Peter Landgren"
#: main.cpp:175
msgid "Swedish translation"
-msgstr ""
+msgstr "Zweedse vertaling"
#: main.cpp:176
msgid "Bekir Sonat"
-msgstr ""
+msgstr "Bekir Sonat"
#: main.cpp:176
msgid "Turkish translation"
-msgstr ""
+msgstr "Turkse vertaling"
#: main.cpp:177
msgid "Ivan Petrouchtchak"
-msgstr ""
+msgstr "Ivan Petrouchtchak"
#: main.cpp:177
msgid "Ukrainian translation"
-msgstr ""
+msgstr "Oekraïense vertaling"
#: main.cpp:183
msgid "Start left panel at <path>"
@@ -4050,14 +4030,14 @@
msgstr "Functie toetsen laten snelle bestandsbewerkingen toe."
#: krusaderview.cpp:307
-#, fuzzy, kde-format
+#, kde-format
msgid "Horizontal Mode"
-msgstr "Verticale modus"
+msgstr "Horizontale modus"
#: Dialogs/krdialogs.cpp:142
#, kde-format
msgid "F2 Queue"
-msgstr ""
+msgstr "F2 Wachtrij"
#: Dialogs/krdialogs.cpp:158
#, kde-format
@@ -4385,8 +4365,7 @@
#: Dialogs/krkeydialog.cpp:123
#, kde-format
msgid "Please restart this dialog in order to see the changes"
-msgstr ""
-"Gelieve deze dialoog te herstarten om de wijzigingen zichtbaar te maken"
+msgstr "Gelieve deze dialoog te herstarten om de wijzigingen zichtbaar te maken"
#: Dialogs/krkeydialog.cpp:124
#, kde-format
@@ -4395,8 +4374,7 @@
#: Dialogs/krkeydialog.cpp:135
#, kde-format
-msgid ""
-"<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
+msgid "<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
msgstr ""
"<qt>Bestand <b>%1</b> bestaat reeds. Bent u er zeker van dat u het wilt "
"overschrijven?</qt>"
@@ -4597,8 +4575,7 @@
#: Dialogs/checksumdlg.cpp:294 Dialogs/checksumdlg.cpp:428
#, kde-format
msgid "<qt>There was an error while running <b>%1</b>.</qt>"
-msgstr ""
-"<qt>De volgende fout is opgetreden tijdens het uitvoeren <b>%1</b>.</qt>"
+msgstr "<qt>De volgende fout is opgetreden tijdens het uitvoeren <b>%1</b>.</qt>"
#: Dialogs/checksumdlg.cpp:306 Dialogs/checksumdlg.cpp:437
#, kde-format
@@ -4657,8 +4634,7 @@
#: Dialogs/checksumdlg.cpp:480
#, kde-format
msgid "Errors were detected while verifying the checksums"
-msgstr ""
-"Fouten werden gedetecteerd tijdens het verifieren van de controlesommen."
+msgstr "Fouten werden gedetecteerd tijdens het verifieren van de controlesommen."
#: Dialogs/checksumdlg.cpp:481
#, kde-format
@@ -4949,8 +4925,7 @@
msgid ""
"The <i>Workdir</i> defines in which directory the <i>Command</i> will be "
"executed."
-msgstr ""
-"<i>Werkmap</i> is de map waar het <i>Commando</i> zal worden uitgevoerd."
+msgstr "<i>Werkmap</i> is de map waar het <i>Commando</i> zal worden uitgevoerd."
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 250
@@ -5018,12 +4993,12 @@
#: ActionMan/ui_actionproperty.h:722 rc.cpp:116
#, kde-format
msgid "If not checked, the action is not shown in the menus."
-msgstr ""
+msgstr "Indien aangevinkt, wordt deze actie getoont in de menus."
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 401
#: ActionMan/ui_actionproperty.h:725 rc.cpp:119
-#, fuzzy, kde-format
+#, kde-format
msgid "Enabled"
msgstr "Ingeschakeld"
@@ -5079,16 +5054,16 @@
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 463
#: ActionMan/ui_actionproperty.h:748 rc.cpp:146
-#, fuzzy, kde-format
+#, kde-format
msgid "Run the command in the embedded terminal emulator."
-msgstr "Commando uitvoeren in een terminalvenster."
+msgstr "Commando uitvoeren in het terminalvenster."
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 466
#: ActionMan/ui_actionproperty.h:751 rc.cpp:149
-#, fuzzy, kde-format
+#, kde-format
msgid "Run in the embedded terminal emulator"
-msgstr "Naar &Terminal Emulator zenden"
+msgstr "Uitvoeren in het terminalvenster."
#. i18n: tag string
#. i18n: file ./ActionMan/actionproperty.ui line 39
@@ -5286,8 +5261,7 @@
#: ActionMan/useractionpage.cpp:134
#, kde-format
-msgid ""
-"The current action has been modified. Do you want to apply these changes?"
+msgid "The current action has been modified. Do you want to apply these changes?"
msgstr "De huidige actie is gewijzigd. Wilt u deze wijzigingen toepassen?"
#: ActionMan/useractionpage.cpp:211
@@ -5473,7 +5447,7 @@
#: ActionMan/addplaceholderpopup.cpp:288 ActionMan/addplaceholderpopup.cpp:487
#, kde-format
msgid "list-add"
-msgstr ""
+msgstr "lijst-toevoegen"
#: UserMenu/usermenu.cpp:58
#, kde-format
@@ -5503,8 +5477,7 @@
#: Synchronizer/synchronizergui.cpp:1193
#, kde-format
msgid "The right base directory used during the synchronisation process."
-msgstr ""
-"De rechter basismap wordt gebruikt gedurende het synchronisatieprocess."
+msgstr "De rechter basismap wordt gebruikt gedurende het synchronisatieprocess."
#: Synchronizer/synchronizergui.cpp:1207
#, kde-format
@@ -5613,7 +5586,7 @@
"+R)."
#: Synchronizer/synchronizergui.cpp:1297
-#, fuzzy, kde-format
+#, kde-format
msgid "Show files marked to delete (CTRL+T)."
msgstr "Toon bestanden gemarkeerd om te verwijderen (CTRL+T)."
@@ -5914,10 +5887,10 @@
#: Synchronizer/synchronizedialog.cpp:64 Synchronizer/synchronizedialog.cpp:77
#: Synchronizer/synchronizedialog.cpp:90
-#, fuzzy, kde-format
+#, kde-format
msgid "Ready: %2/1 file, %3/%4"
msgid_plural "Ready: %2/%1 files, %3/%4"
-msgstr[0] "_n: Klaar: %2/1 bestand, %4/%5"
+msgstr[0] "Klaar: %2/1 bestand, %4/%5"
msgstr[1] "Klaar: %2/%1 bestanden, %4/%5"
#: Synchronizer/synchronizedialog.cpp:70
@@ -5928,10 +5901,10 @@
msgstr[1] "Links naar rechts: %1 bestanden kopiëren"
#: Synchronizer/synchronizedialog.cpp:83
-#, fuzzy, kde-format
+#, kde-format
msgid "Left: Delete 1 file"
msgid_plural "Left: Delete %1 files"
-msgstr[0] "_n: Links: Wis %2 bestandLinks: Wis %2 bestanden"
+msgstr[0] "Links: Wis 1 bestand"
#: Synchronizer/synchronizedialog.cpp:108
#, kde-format
@@ -5998,9 +5971,9 @@
#: Synchronizer/synchronizer.cpp:1457 krslots.cpp:138 krslots.cpp:215
#: krslots.cpp:500 krslots.cpp:542 krslots.cpp:560
-#, fuzzy, kde-format
+#, kde-format
msgid "Error executing %1!"
-msgstr "Fout bij het uitvoeren "
+msgstr "Fout bij het uitvoeren van %1! "
#: Synchronizer/feedtolistboxdialog.cpp:56
#, kde-format
@@ -6568,8 +6541,7 @@
#: Konfigurator/kggeneral.cpp:112
#, kde-format
msgid "Internal editor and viewer opens each file in a separate window"
-msgstr ""
-"De interne viewer en editor zulllen elk bestand in een apart venster openen"
+msgstr "De interne viewer en editor zulllen elk bestand in een apart venster openen"
#: Konfigurator/kggeneral.cpp:113
#, kde-format
@@ -6621,8 +6593,7 @@
#: Konfigurator/kggeneral.cpp:213
#, kde-format
-msgid ""
-"Make sure to install new tools in your <code>$PATH</code> (e.g. /usr/bin)"
+msgid "Make sure to install new tools in your <code>$PATH</code> (e.g. /usr/bin)"
msgstr ""
"Vergewis u er van dat u nieuw gereedschap installeert in uw <code>$PATH</"
"code> (bv. /usr/bin)"
@@ -6656,8 +6627,7 @@
#: Konfigurator/krresulttable.cpp:137
#, kde-format
msgid "rpm found, but cpio not found which is required for unpacking"
-msgstr ""
-"rpm gevonden, maar cpio niet gevonden wat noodzakelijk is om uit te pakken."
+msgstr "rpm gevonden, maar cpio niet gevonden wat noodzakelijk is om uit te pakken."
#: Konfigurator/krresulttable.cpp:140 Konfigurator/krresulttable.cpp:304
#, kde-format
@@ -6717,9 +6687,9 @@
msgstr "Gereedschap"
#: Konfigurator/konfigurator.cpp:67
-#, fuzzy, kde-format
+#, kde-format
msgid "Konfigurator"
-msgstr "Bevestigingen"
+msgstr "Konfigurator"
#: Konfigurator/konfigurator.cpp:68
#, kde-format
@@ -6969,12 +6939,12 @@
#: Konfigurator/kglookfeel.cpp:183
#, kde-format
msgid "Load the user defined folder icons"
-msgstr ""
+msgstr "De gebruikersgedefinieerde map iconen laden"
#: Konfigurator/kglookfeel.cpp:183
#, kde-format
msgid "Load the user defined folder icons (can cause decrease in performance)."
-msgstr ""
+msgstr "De gebruikersgedefinieerde map iconen laden (kan tot prestatieverlies leiden)"
#: Konfigurator/kglookfeel.cpp:184
#, kde-format
@@ -7107,8 +7077,7 @@
#: Konfigurator/kglookfeel.cpp:264
#, kde-format
-msgid ""
-"Each directory change in the panel is also performed in the other panel."
+msgid "Each directory change in the panel is also performed in the other panel."
msgstr ""
"Elke map verandering in het venster wordt ook uitgevoerd in het andere "
"venster."
@@ -7858,24 +7827,24 @@
msgstr "Wissen achtergrond:"
#: Konfigurator/kgcolors.cpp:211
-#, fuzzy, kde-format
+#, kde-format
msgid "Other"
-msgstr "Andere..."
+msgstr "Andere"
#: Konfigurator/kgcolors.cpp:219
-#, fuzzy, kde-format
+#, kde-format
msgid "Quicksearch, match foreground:"
-msgstr "Map voorgrond:"
+msgstr "Snelzoeken, voorgrond resultaat:"
#: Konfigurator/kgcolors.cpp:220 Konfigurator/kgcolors.cpp:222
-#, fuzzy, kde-format
+#, kde-format
msgid "Quicksearch, non-match background:"
-msgstr "Beurtelings afwisselende achtergrond:"
+msgstr "Snelzoeken, achtergrond niet-resultaat:"
#: Konfigurator/kgcolors.cpp:221
-#, fuzzy, kde-format
+#, kde-format
msgid "Quicksearch, non-match foreground:"
-msgstr "Huidige voorgrond:"
+msgstr "Snelzoeken, voorgrond niet-resultaat:"
#: Konfigurator/kgcolors.cpp:255
#, kde-format
@@ -7943,14 +7912,14 @@
msgstr "Gelijk aan"
#: Konfigurator/kgcolors.cpp:526
-#, fuzzy, kde-format
+#, kde-format
msgid "Quicksearch non-match"
-msgstr "Snelzoeken"
+msgstr "Snelzoeken, niet-resultaat"
#: Konfigurator/kgcolors.cpp:527
-#, fuzzy, kde-format
+#, kde-format
msgid "Quicksearch match"
-msgstr "Snelzoeken"
+msgstr "Snelzoeken resultaten"
#: Konfigurator/kgcolors.cpp:546
#, kde-format
@@ -7968,11 +7937,9 @@
msgstr "Kleurschema selecteren"
#: Konfigurator/kgcolors.cpp:564
-#, fuzzy, kde-format
+#, kde-format
msgid "File %1 already exists. Are you sure you want to overwrite it?"
-msgstr ""
-"Bestand %1 bestaat reeds.\n"
-"Bent u er zeker van dat u het wilt overschrijven ?"
+msgstr "Bestand %1 bestaat reeds. Bent u er zeker van dat u het wil overschrijven ?"
#: Konfigurator/kgcolors.cpp:567
#, kde-format
@@ -8222,8 +8189,7 @@
#: Konfigurator/kgarchives.cpp:107
#, kde-format
-msgid ""
-"Some corrupted archives might cause a crash; therefore, testing is suggested."
+msgid "Some corrupted archives might cause a crash; therefore, testing is suggested."
msgstr ""
"Sommige corrupte archieven kunnen mogelijk een crash veroorzaken, daarom is "
"testen aangeraden."
@@ -8235,8 +8201,7 @@
#: Konfigurator/kgarchives.cpp:125
#, kde-format
-msgid ""
-"Make sure to install new packers in your <code>$PATH</code> (e.g. /usr/bin)"
+msgid "Make sure to install new packers in your <code>$PATH</code> (e.g. /usr/bin)"
msgstr ""
"Vergewis u er van dat u nieuw inpak gereedschap installeert in uw <code>"
"$PATH</code> (bv. /usr/bin)"
@@ -8291,9 +8256,9 @@
msgstr "Gebruik Lettertype met vaste breedte als standaard"
#: krslots.cpp:100
-#, fuzzy, kde-format
+#, kde-format
msgid "No selected files to send!"
-msgstr "Enkel geselecteerde bestanden"
+msgstr "Geen geselecteerde bestanden om te zenden!"
#: krslots.cpp:108
#, kde-format
@@ -8305,10 +8270,10 @@
"in uw zoekpad. hint: Krusader ondersteunt Kmail."
#: krslots.cpp:117
-#, fuzzy, kde-format
+#, kde-format
msgid "Sending file: %2"
msgid_plural "Sending files: %2"
-msgstr[0] "Bestand verzenden: "
+msgstr[0] "Bestand verzenden: %2"
msgstr[1] "Bestand verzenden: "
#: krslots.cpp:167
@@ -8341,9 +8306,9 @@
"en Xxdiff."
#: krslots.cpp:196 krslots.cpp:202
-#, fuzzy, kde-format
+#, kde-format
msgid "Krusader is unable to download %1"
-msgstr "Krusader is niet in staat om te downloaden: "
+msgstr "Krusader is niet in staat om %1 te downloaden."
#: krslots.cpp:451
#, kde-format
@@ -8556,8 +8521,7 @@
#: Splitter/combiner.cpp:154
#, kde-format
-msgid ""
-"Validity checking is impossible without a good CRC file. Continue combining?"
+msgid "Validity checking is impossible without a good CRC file. Continue combining?"
msgstr ""
"Geldigheids controle is onmogelijk zonder een goed CRC bestand. Doorgaan met "
"combineren?"
@@ -8610,52 +8574,52 @@
#: krarc.cpp:182
#, kde-format
msgid "Creating directories is not supported with %1 archives"
-msgstr ""
+msgstr "Het aanmaken van mappen is niet ondersteund in %1 archieven."
#: krarc.cpp:215
-#, fuzzy, kde-format
+#, kde-format
msgid "Creating %1 ..."
-msgstr "%1 wissen ..."
+msgstr "Aanmaken van %1..."
#: krarc.cpp:254
-#, fuzzy, kde-format
+#, kde-format
msgid "Writing to %1 archives is not supported"
-msgstr "Verplaatsen naar een archief is uitgeschakeld"
+msgstr "Schrijven naar %1 archieven is niet ondersteund."
#: krarc.cpp:307
-#, fuzzy, kde-format
+#, kde-format
msgid "Packing %1 ..."
-msgstr "Herinpakken..."
+msgstr "Inpakken van %1 ..."
#: krarc.cpp:347
#, kde-format
msgid "Retrieving data from %1 archives is not supported"
-msgstr ""
+msgstr "Uitpakken van gegevens uit %1 archieven is niet ondersteund."
#: krarc.cpp:414 krarc.cpp:667
-#, fuzzy, kde-format
+#, kde-format
msgid "Unpacking %1 ..."
-msgstr "Uitpakken"
+msgstr "Uitpakken van %1 ..."
#: krarc.cpp:542
#, kde-format
msgid "Deleting files from %1 archives is not supported"
-msgstr ""
+msgstr "Bestanden wissen uit %1 archieven is niet ondersteund."
#: krarc.cpp:558
-#, fuzzy, kde-format
+#, kde-format
msgid "Deleting %1 ..."
-msgstr "%1 wissen ..."
+msgstr "Wissen van %1 ..."
#: krarc.cpp:587
#, kde-format
msgid "Accessing files is not supported with the %1 archives"
-msgstr ""
+msgstr "Bestandstoegang in %1 archieven is niet ondersteund."
#: krarc.cpp:696
#, kde-format
msgid "Listing directories is not supported for %1 archives"
-msgstr ""
+msgstr "Het tonen van mappen in %1 archieven is niet ondersteund."
#: krarc.cpp:1480
#, kde-format
@@ -8663,192 +8627,26 @@
"\n"
"Make sure that the %1 binary are installed properly on your system."
msgstr ""
+"\n"
+"Vergewis U ervan dat het binair bestand %1 goed geïnstalleerd is op uw systeem."
#: krarc.cpp:1690 krarc.cpp:1714
#, kde-format
msgid "Krarc Password Dialog"
-msgstr ""
+msgstr "Krarc Paswoord Dialoog"
#: krarc.cpp:1731
#, kde-format
msgid "Accessing the file requires password."
-msgstr ""
+msgstr "Voor toegang tot dit bestand is een paswoord noodzakelijk."
#: tar.cc:56
#, kde-format
msgid "This protocol does not support resuming"
-msgstr ""
+msgstr "Dit protocol is niet ondersteund"
#: tar.cc:78
#, kde-format
msgid "Writing to %1 is not supported"
-msgstr ""
+msgstr "Schrijven naar %1 is niet ondersteund."
-#~ msgid ""
-#~ "Don't use KDE's media protocol for media button (if it's buggy or missing)"
-#~ msgstr ""
-#~ "Het KDE media protocol niet gebruiken voor de media knop (als het fouten "
-#~ "bevat of als het niet aanwezig is)"
-
-#~ msgid ""
-#~ "Select if your media protocol is buggy (in some older KDE versions), or "
-#~ "not present (no kdebase package installed)."
-#~ msgstr ""
-#~ "Dit selecteren als uw media protocol fouten vertoond (in sommige oudere "
-#~ "KDE versies, of als het niet aanwezig is (als geen kdebase pakket "
-#~ "geïnstalleerd is)."
-
-#~ msgid "Brief"
-#~ msgstr "Kort"
-
-#~ msgid "Clear location bar button"
-#~ msgstr "Locatiebalk wissen knop"
-
-#~ msgid "Clears the location bar"
-#~ msgstr "De locatiebalk wissen"
-
-#~ msgid "CD Recorder"
-#~ msgstr "CD Recorder"
-
-#~ msgid "DVD Recorder"
-#~ msgstr "DVD Recorder"
-
-#~ msgid "DVD"
-#~ msgstr "DVD"
-
-#~ msgid "Zip Disk"
-#~ msgstr "Zip-diskette"
-
-#~ msgid "add"
-#~ msgstr "toevoegen"
-
-#~ msgid "<qt>Can't open <b>%1</b></qt>"
-#~ msgstr "<qt>Kan <b>%1</b> niet openen</qt>"
-
-#~ msgid "Can't open \"%1\""
-#~ msgstr "Kan \"%1\" niet openen "
-
-#~ msgid "Clear the location bar"
-#~ msgstr "Locatiebalk wissen"
-
-#~ msgid "<qt>Can't read <b>%1</b>. Archive might be corrupted!</qt>"
-#~ msgstr ""
-#~ "<qt>Kan niet lezen <b>%1</b>. Het archief is mogelijk beschadigd!</qt>"
-
-#~ msgid "Deleting Files..."
-#~ msgstr "Bestanden wissen..."
-
-#~ msgid "Unpacking Files"
-#~ msgstr "Bestanden uitpakken"
-
-#~ msgid ""
-#~ "In %1:\n"
-#~ "There is an error in the JavaScript"
-#~ msgstr ""
-#~ "In %1:\n"
-#~ "Er is een fout in het JavaScript"
-
-#~ msgid "Shred"
-#~ msgstr "Vernietigen (Shred)"
-
-#~ msgid ""
-#~ "<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone "
-#~ "forever!</qt>"
-#~ msgstr ""
-#~ "<qt>Wilt u werkelijk vernietigen (shred) <b>%1</b>? Eenmaal vernietigd, "
-#~ "is het bestand voor altijd verloren!</qt>"
-
-#~ msgid "Tab: switch panel"
-#~ msgstr "Tab: venster verwisselen"
-
-#~ msgid "Error ejecting device! You need to have 'eject' in your path."
-#~ msgstr "Fout bij het uitwerpen ! U moet 'uitwerpen' in uw pad hebben."
-
-#~ msgid "Filesystems"
-#~ msgstr "Bestandssystemen"
-
-#~ msgid ""
-#~ "Krusader\n"
-#~ "Twin-Panel File Manager for KDE"
-#~ msgstr ""
-#~ "Krusader\n"
-#~ "Twee-venster Bestandsbeheerder voor KDE"
-
-#~ msgid "%1% of %2 "
-#~ msgstr "%1% van %2 "
-
-#~ msgid "compare mode"
-#~ msgstr "vergelijk modus"
-
-#~ msgid "Remove"
-#~ msgstr "Verwijderen"
-
-#~ msgid "New group"
-#~ msgstr "Nieuwe groep"
-
-#~ msgid "New session"
-#~ msgstr "Nieuwe sessie"
-
-#~ msgid "Sessions"
-#~ msgstr "Sessies"
-
-#~ msgid "RemoteMan"
-#~ msgstr "RemoteMan"
-
-#~ msgid "Are you sure you want to delete this item ???"
-#~ msgstr "Bent U er zeker van dat u dit item wilt verwijderen ???"
-
-#~ msgid "RemoteMan: Connection Manager"
-#~ msgstr "RemoteMan: Verbindings Manager"
-
-#~ msgid "Session name:"
-#~ msgstr "Sessie naam:"
-
-#~ msgid "&More"
-#~ msgstr "&Meer"
-
-#~ msgid "User name:"
-#~ msgstr "Gebruikersnaam:"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anoniem"
-
-#~ msgid "Remote directory:"
-#~ msgstr "Op afstand map:"
-
-#~ msgid "Co&nnect"
-#~ msgstr "&Verbinden"
-
-#~ msgid "New &Group"
-#~ msgstr "Nieuwe &Groep"
-
-#~ msgid "New Connec&tion"
-#~ msgstr "Nieuwe ver&binding"
-
-#~ msgid "Port: "
-#~ msgstr "Poort: "
-
-#~ msgid "* Warning: Storing your password is not secure !!!"
-#~ msgstr "* Waarschuwing: uw wachtwoord opslaan is niet veilig !!!"
-
-#~ msgid "File "
-#~ msgstr "Bestand "
-
-#~ msgid " already exists. Are you sure you want to overwrite it?"
-#~ msgstr " bestaat reeds. Bent u zeker dat u het wilt overschrijven ?"
-
-#~ msgid ""
-#~ "Important: RemoteMan has been replaced by our new bookmark manager. The "
-#~ "new manager handles local files and remote URLs the same way. RemoteMan "
-#~ "is being left around to allow an easier transition and give you a chance "
-#~ "to move your bookmarks. IT WILL BE REMOVED SOON!\n"
-#~ "Try the new bookmark-manager: open a new remote connection, once done, "
-#~ "press the bookmark button, select 'Add bookmark' and that's it!"
-#~ msgstr ""
-#~ "Belangrijk: RemoteMan is vervangen door onze nieuwe bladwijzer manager. "
-#~ "De nieuwe manager behandeld locale bestanden en url's op dezelfde wijze. "
-#~ "RemoteMan is nog aanwezig om voor een gemakkelijkere overgang te zorgen "
-#~ "en geeft u nu de kans om al uw bladwijzers te verplaatsen. RemoteMan ZAL "
-#~ "BINNENKORT VERWIJDERD WORDEN!\n"
-#~ "Probeer de nieuwe bladwijzer manager: open een nieuwe verbinding. druk op "
-#~ "de bladwijzer knop, selecteer 'Bladwijzer toevoegen', en dit is alles!"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-09-25 18:56:12
|
Revision: 6090
http://krusader.svn.sourceforge.net/krusader/?rev=6090&view=rev
Author: codeknight
Date: 2008-09-25 18:56:02 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
Version 2.0.0-beta2 "Space Odyssey" (removed SVN TRUNK in the name)
Modified Paths:
--------------
trunk/krusader_kde4/CMakeLists.txt
Modified: trunk/krusader_kde4/CMakeLists.txt
===================================================================
--- trunk/krusader_kde4/CMakeLists.txt 2008-09-25 18:52:42 UTC (rev 6089)
+++ trunk/krusader_kde4/CMakeLists.txt 2008-09-25 18:56:02 UTC (rev 6090)
@@ -8,7 +8,7 @@
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions( -DVERSION='"2.0.0-beta2"' )
-add_definitions( -DRELEASE_NAME='"SVN TRUNK Space Odyssey"' )
+add_definitions( -DRELEASE_NAME='"Space Odyssey"' )
link_directories(${KDE4_LIB_DIR})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cod...@us...> - 2008-09-25 18:52:52
|
Revision: 6089
http://krusader.svn.sourceforge.net/krusader/?rev=6089&view=rev
Author: codeknight
Date: 2008-09-25 18:52:42 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
removed "not ... , not ..." for better readability
Modified Paths:
--------------
trunk/krusader_kde4/krusader/ActionMan/actionproperty.ui
Modified: trunk/krusader_kde4/krusader/ActionMan/actionproperty.ui
===================================================================
--- trunk/krusader_kde4/krusader/ActionMan/actionproperty.ui 2008-09-24 21:00:52 UTC (rev 6088)
+++ trunk/krusader_kde4/krusader/ActionMan/actionproperty.ui 2008-09-25 18:52:42 UTC (rev 6089)
@@ -395,7 +395,7 @@
<bool>true</bool>
</property>
<property name="whatsThis" >
- <string>If not checked, the action is not shown in the menus.</string>
+ <string>If checked, the action is shown in the Useractions menus.</string>
</property>
<property name="text" >
<string>Enabled</string>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-09-24 21:01:10
|
Revision: 6088
http://krusader.svn.sourceforge.net/krusader/?rev=6088&view=rev
Author: ckarai
Date: 2008-09-24 21:00:52 +0000 (Wed, 24 Sep 2008)
Log Message:
-----------
QueueDialog: save window size/position
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
trunk/krusader_kde4/krusader/Queue/queuedialog.h
Modified: trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-09-23 20:57:41 UTC (rev 6087)
+++ trunk/krusader_kde4/krusader/Queue/queue_mgr.cpp 2008-09-24 21:00:52 UTC (rev 6088)
@@ -24,6 +24,7 @@
for (it = _queues.begin(); it != _queues.end(); ++it )
delete it.value();
_queues.clear();
+ QueueDialog::deleteDialog();
}
Queue* QueueManager::queue(const QString& queueName)
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-23 20:57:41 UTC (rev 6087)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-24 21:00:52 UTC (rev 6088)
@@ -140,32 +140,30 @@
setLayout( grid_main );
KConfigGroup group( krConfig, "QueueManager");
- _sizeX = group.readEntry( "Window Width", -1 );
- _sizeY = group.readEntry( "Window Height", -1 );
- _x = group.readEntry( "Window X", -1 );
- _y = group.readEntry( "Window Y", -1 );
+ int sizeX = group.readEntry( "Window Width", -1 );
+ int sizeY = group.readEntry( "Window Height", -1 );
+ int x = group.readEntry( "Window X", -1 );
+ int y = group.readEntry( "Window Y", -1 );
- if( _sizeX != -1 && _sizeY != -1 )
- resize( _sizeX, _sizeY );
+ if( sizeX != -1 && sizeY != -1 )
+ resize( sizeX, sizeY );
else
resize( 300, 400 );
- if( group.readEntry( "Window Maximized", false ) )
- showMaximized();
- else {
- if( _x != -1 && _y != -1 )
- move( _x, _y );
- else
- move( 20, 20 );
+ if( x != -1 && y != -1 )
+ move( x, y );
+ else
+ move( 20, 20 );
- show();
- }
+ show();
_queueDialog = this;
}
QueueDialog::~QueueDialog()
{
+ if( _queueDialog )
+ saveSettings();
_queueDialog = 0;
}
@@ -219,11 +217,28 @@
void QueueDialog::accept()
{
_autoHide = true;
+ saveSettings();
QDialog::accept();
}
void QueueDialog::reject()
{
_autoHide = true;
+ saveSettings();
QDialog::reject();
+}
+
+void QueueDialog::saveSettings()
+{
+ KConfigGroup group( krConfig, "QueueManager");
+ group.writeEntry( "Window Width", width() );
+ group.writeEntry( "Window Height", height() );
+ group.writeEntry( "Window X", x() );
+ group.writeEntry( "Window Y", y() );
+}
+
+void QueueDialog::deleteDialog()
+{
+ if( _queueDialog )
+ delete _queueDialog;
}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-23 20:57:41 UTC (rev 6087)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-24 21:00:52 UTC (rev 6088)
@@ -46,6 +46,7 @@
virtual ~QueueDialog();
static void showDialog( bool autoHide = true );
+ static void deleteDialog();
static void everyQueueIsEmpty();
public slots:
@@ -58,12 +59,10 @@
virtual void mousePressEvent(QMouseEvent *me);
virtual void mouseMoveEvent(QMouseEvent *me);
+ void saveSettings();
+
private:
static QueueDialog * _queueDialog;
- int _sizeX;
- int _sizeY;
- int _x;
- int _y;
QPoint _clickPos;
QPoint _startPos;
bool _autoHide;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ck...@us...> - 2008-09-23 20:57:57
|
Revision: 6087
http://krusader.svn.sourceforge.net/krusader/?rev=6087&view=rev
Author: ckarai
Date: 2008-09-23 20:57:41 +0000 (Tue, 23 Sep 2008)
Log Message:
-----------
QueueManager in the menu
Modified Paths:
--------------
trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
trunk/krusader_kde4/krusader/Queue/queuedialog.h
trunk/krusader_kde4/krusader/krslots.cpp
trunk/krusader_kde4/krusader/krslots.h
trunk/krusader_kde4/krusader/krusader.cpp
trunk/krusader_kde4/krusader/krusader.h
trunk/krusader_kde4/krusader/krusaderui.rc
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.cpp 2008-09-23 20:57:41 UTC (rev 6087)
@@ -179,7 +179,7 @@
_queueDialog->activateWindow();
}
if( !autoHide )
- autoHide = false;
+ _queueDialog->_autoHide = false;
}
void QueueDialog::paintEvent ( QPaintEvent * event )
@@ -216,7 +216,14 @@
move(_startPos + me->globalPos() - _clickPos);
}
-void QueueDialog::closeEvent ( QCloseEvent * event )
+void QueueDialog::accept()
{
_autoHide = true;
+ QDialog::accept();
+}
+
+void QueueDialog::reject()
+{
+ _autoHide = true;
+ QDialog::reject();
}
\ No newline at end of file
Modified: trunk/krusader_kde4/krusader/Queue/queuedialog.h
===================================================================
--- trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/Queue/queuedialog.h 2008-09-23 20:57:41 UTC (rev 6087)
@@ -34,7 +34,6 @@
#include <qdialog.h>
class QPaintEvent;
-class QCloseEvent;
class QueueDialog : public QDialog
{
@@ -49,9 +48,13 @@
static void showDialog( bool autoHide = true );
static void everyQueueIsEmpty();
+public slots:
+ virtual void accept();
+ virtual void reject();
+
+
protected:
virtual void paintEvent ( QPaintEvent * event );
- virtual void closeEvent ( QCloseEvent * event );
virtual void mousePressEvent(QMouseEvent *me);
virtual void mouseMoveEvent(QMouseEvent *me);
Modified: trunk/krusader_kde4/krusader/krslots.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krslots.cpp 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/krslots.cpp 2008-09-23 20:57:41 UTC (rev 6087)
@@ -87,6 +87,7 @@
#include "DiskUsage/diskusagegui.h"
#include "krservices.h"
#include "Panel/krviewitem.h"
+#include "Queue/queuedialog.h"
#define REFRESH_BOTH_PANELS { ListPanel *p=ACTIVE_PANEL; \
MAIN_VIEW->left->func->refresh(); \
@@ -913,6 +914,11 @@
DiskUsageGUI du( ACTIVE_FUNC->files()->vfs_getOrigin(), MAIN_VIEW );
}
+void KRslots::slotQueueManager()
+{
+ QueueDialog::showDialog( false );
+}
+
// when window becomes focused, enable the refresh in the visible panels
void KRslots::windowActive() {
if( MAIN_VIEW != 0 ) { /* CRASH FIX: it's possible that the method is called after destroying the main view */
Modified: trunk/krusader_kde4/krusader/krslots.h
===================================================================
--- trunk/krusader_kde4/krusader/krslots.h 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/krslots.h 2008-09-23 20:57:41 UTC (rev 6087)
@@ -179,6 +179,7 @@
void slotSynchronizeDirs( QStringList selected = QStringList() );
void slotSyncBrowse();
void slotDiskUsage();
+ void slotQueueManager();
void slotLocationBar();
void slotJumpBack();
void slotSetJumpBack();
Modified: trunk/krusader_kde4/krusader/krusader.cpp
===================================================================
--- trunk/krusader_kde4/krusader/krusader.cpp 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/krusader.cpp 2008-09-23 20:57:41 UTC (rev 6087)
@@ -128,6 +128,7 @@
KAction *Krusader::actCompDirs = 0;
KAction *Krusader::actSync = 0;
KAction *Krusader::actDiskUsage = 0;
+KAction *Krusader::actQueueManager = 0;
KAction *Krusader::actHomeTerminal = 0;
KAction *Krusader::actFTPConnect = 0;
KAction *Krusader::actFTPNewConnect = 0;
@@ -729,6 +730,7 @@
NEW_KACTION(actSyncDirs, i18n( "Synchronize &Directories..." ), "kr_syncdirs", Qt::CTRL + Qt::Key_Y, SLOTS, SLOT( slotSynchronizeDirs() ), "sync dirs" );
NEW_KACTION(actSyncBrowse, i18n( "S&ynchron Directory Changes" ), "kr_syncbrowse_off", Qt::ALT + Qt::Key_Y, SLOTS, SLOT( slotSyncBrowse() ), "sync browse" );
NEW_KACTION(actDiskUsage, i18n( "D&isk Usage..." ), "kr_diskusage", Qt::ALT + Qt::Key_D, SLOTS, SLOT( slotDiskUsage() ), "disk usage" );
+ NEW_KACTION(actQueueManager, i18n( "&Queue Manager..." ), "document-multiple", Qt::ALT + Qt::Key_Q, SLOTS, SLOT( slotQueueManager() ), "queue manager" );
NEW_KACTION(actKonfigurator, i18n( "Configure &Krusader..." ), "configure", 0, SLOTS, SLOT( startKonfigurator() ), "konfigurator" );
NEW_KACTION(actBack, i18n( "Back" ), "go-previous", 0, SLOTS, SLOT( back() ), "back" );
NEW_KACTION(actRoot, i18n( "Root" ), "go-top", Qt::CTRL + Qt::Key_Backspace, SLOTS, SLOT( root() ), "root" );
Modified: trunk/krusader_kde4/krusader/krusader.h
===================================================================
--- trunk/krusader_kde4/krusader/krusader.h 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/krusader.h 2008-09-23 20:57:41 UTC (rev 6087)
@@ -135,7 +135,7 @@
static KAction *actExecFilter, *actCustomFilter, *actMountMan, *actNewTool, *actSwapPanels, *actSwapSides;
static KAction *actKonfigurator, *actToolsSetup, *actBack, *actRoot, *actFind, *actDirUp, *actRemoteEncoding;
static KAction *actSelectColorMask, *actMultiRename, *actAllFilter, *actOpenLeftBm, *actOpenRightBm;
- static KAction *actNewTab, *actDupTab, *actCloseTab, *actPreviousTab, *actNextTab, *actSplit;
+ static KAction *actNewTab, *actDupTab, *actCloseTab, *actPreviousTab, *actNextTab, *actSplit, *actQueueManager;
static KAction *actCombine, *actUserMenu, *actManageUseractions, *actSyncDirs, *actSyncBrowse;
static KAction *actF2, *actF3, *actF4, *actF5, *actF6, *actF7, *actF8, *actF9, *actF10, *actVerticalMode;
static KAction *actPopularUrls, *actLocationBar, *actJumpBack, *actSetJumpBack, *actCreateChecksum, *actMatchChecksum;
Modified: trunk/krusader_kde4/krusader/krusaderui.rc
===================================================================
--- trunk/krusader_kde4/krusader/krusaderui.rc 2008-09-23 19:20:22 UTC (rev 6086)
+++ trunk/krusader_kde4/krusader/krusaderui.rc 2008-09-23 20:57:41 UTC (rev 6087)
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui ><kpartgui version="18" name="krusader" >
+<!DOCTYPE kpartgui ><kpartgui version="19" name="krusader" >
<MenuBar>
<Menu name="file" >
<text>&File</text>
@@ -101,6 +101,7 @@
<Action name="sync dirs" />
<Action name="mountman" />
<Action name="disk usage" />
+ <Action name="queue manager" />
<Separator/>
<Action name="ftp new connection" />
<Action name="ftp disconnect" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
7 messages has been excluded from this view by a project administrator.
