krusader-commits

[Krusader-commits] krusader_kde3 ChangeLog,1.273,1.274

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2212/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: krarc problems at copying subdirectories from the archive


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -C2 -d -r1.273 -r1.274
*** ChangeLog	11 Aug 2004 22:08:38 -0000	1.273
--- ChangeLog	12 Aug 2004 20:52:52 -0000	1.274
***************
*** 23,26 ****
--- 23,27 ----
      REACTIVATED: usermenu (now using the new useraction-system)
  
+     FIXED: krarc problems at copying subdirectories from the archive
      FIXED: [ 1005533 ] stepping onto a subfs device crashes krusader
      FIXED: [ 988835 ] window size of synchronize dirs is not stored

[Krusader-commits] krusader_kde3 CVSNEWS,1.5,1.6 ChangeLog,1.272,1.273

[Jonas B. <jb...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31385

Modified Files:
	CVSNEWS ChangeLog 
Log Message:
new Placeholder %_Copy("from", "to")%

Index: CVSNEWS
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CVSNEWS	29 Jul 2004 20:49:33 -0000	1.5
--- CVSNEWS	11 Aug 2004 22:08:38 -0000	1.6
***************
*** 38,40 ****
--- 38,41 ----
      Ask        asks the user for a some text and is replaced by the answer
      Clipboard  manipulates the clipboard
+     Copy     copies a file, useful for quick, local, backups
    A GUI-based helper for placeholder-adding is provided.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** ChangeLog	10 Aug 2004 22:46:22 -0000	1.272
--- ChangeLog	11 Aug 2004 22:08:38 -0000	1.273
***************
*** 1,3 ****
--- 1,4 ----
  ======================
+     ADDED: useraction: new Placeholder %_Copy("from", "to")%
      ADDED: 3rd hand: new panel that does quick selection
      ADDED: 3rd hand: look n feel changed to fit krusader

[Krusader-commits] krusader_kde3/krusader/UserAction expander.cpp,1.2,1.3 expander.h,1.1,1.2

[Jonas B. <jb...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/UserAction
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31385/krusader/UserAction

Modified Files:
	expander.cpp expander.h 
Log Message:
new Placeholder %_Copy("from", "to")%

Index: expander.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** expander.h	23 Jul 2004 00:03:19 -0000	1.1
--- expander.h	11 Aug 2004 22:08:38 -0000	1.2
***************
*** 107,111 ****
    static QStringList expand( const QString& stringToExpand, bool useUrl, bool callEach );
    
!   static const int numOfPlaceholder = 11; ///< How many Placeholder are realy defined
    /**
     * A List of all Placeholder and thier Parameter. This is used to generate the AddPlaceholderPopup as well as by the expand function
--- 107,111 ----
    static QStringList expand( const QString& stringToExpand, bool useUrl, bool callEach );
    
!   static const int numOfPlaceholder = 12; ///< How many Placeholder are realy defined
    /**
     * A List of all Placeholder and thier Parameter. This is used to generate the AddPlaceholderPopup as well as by the expand function
***************
*** 150,154 ****
     */
    static QString exp_Bookmark( const ListPanel* panel, const QStringList& parameter, const bool& useUrl, const int& currentItem );
!   
    /**
     * This expands a whole commandline by calling for each Placeholder the correspondend expander
--- 150,159 ----
     */
    static QString exp_Bookmark( const ListPanel* panel, const QStringList& parameter, const bool& useUrl, const int& currentItem );
!   /**
!    * This is equal to 'cp <first Parameter> <second Parameter>'.
!    */
!   static QString exp_Copy( const ListPanel* panel, const QStringList& parameter, const bool& useUrl, const int& currentItem );
! 
!     
    /**
     * This expands a whole commandline by calling for each Placeholder the correspondend expander

Index: expander.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** expander.cpp	27 Jul 2004 22:34:09 -0000	1.2
--- expander.cpp	11 Aug 2004 22:08:37 -0000	1.3
***************
*** 25,30 ****
  
  #define ACTIVE    krApp->mainView->activePanel
! #define OTHER     krApp->mainView->activePanel->otherPanel
! // #define GETPANEL  (str.lower()[1]=='a' ? ACTIVE : OTHER)
  ListPanel* Expander::getPanel( const char& panelIndicator ) {
     switch ( panelIndicator ) {
--- 25,29 ----
  
  #define ACTIVE    krApp->mainView->activePanel
! 
  ListPanel* Expander::getPanel( const char& panelIndicator ) {
     switch ( panelIndicator ) {
***************
*** 90,93 ****
--- 89,96 ----
                          {i18n("Append to the current clipboard-content with this seperator (optional)"), "", false}
                      }, 2, false},
+          {"Copy", i18n("Copy a file/folder"), exp_Copy, {
+                         {i18n("What should be copied"), "__placeholder", true},
+                         {i18n("Where it should be copied"), "__placeholder", true},
+                     }, 2, false},
           {"Run", i18n("Execute a script"), 0, {
                          {i18n("Script"), "__file", true},
***************
*** 304,307 ****
--- 307,320 ----
  }
  
+ QString Expander::exp_Copy( const ListPanel*, const QStringList& parameter, const bool&, const int& ) {
+ 
+    KURL src = parameter[0];
+    KURL dest = parameter[1];
+ 
+    new KIO::CopyJob( src, dest, KIO::CopyJob::Copy, false, true );
+ 
+    return QString::null;  // this doesn't return everything, that's normal!
+ }
+ 
  /////////////////////////////////////////////////////////////////////////////////////////////////
  ////////////////////////////// end of expander functions //////////////////////////////

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.34,1.35

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17557/krusader_kde3/krusader/VFS

Modified Files:
	normal_vfs.cpp 
Log Message:

safety checks


Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** normal_vfs.cpp	11 Aug 2004 01:30:12 -0000	1.34
--- normal_vfs.cpp	11 Aug 2004 06:08:45 -0000	1.35
***************
*** 132,136 ****
  // copy a file to the vfs (physical)	
  void normal_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
!   watcher->stopScan(); // we will refresh manually this time...	
  
  	KURL dest;
--- 132,136 ----
  // copy a file to the vfs (physical)	
  void normal_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
!   if( watcher ) watcher->stopScan(); // we will refresh manually this time...	
  
  	KURL dest;
***************
*** 150,154 ****
    vfile* vf;
  
!   watcher->stopScan(); // we will refresh manually this time...	
  
  	// names -> urls
--- 150,154 ----
    vfile* vf;
  
!   if( watcher ) watcher->stopScan(); // we will refresh manually this time...	
  
  	// names -> urls
***************
*** 200,204 ****
    KURL url , dest;
  
!   watcher->stopScan(); // we will refresh manually this time...	
  
    url.setPath( vfs_workingDir()+"/"+fileName );
--- 200,204 ----
    KURL url , dest;
  
!   if( watcher ) watcher->stopScan(); // we will refresh manually this time...	
  
    url.setPath( vfs_workingDir()+"/"+fileName );

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.33,1.34 normal_vfs.h,1.16,1.17

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13782/krusader_kde3/krusader/VFS

Modified Files:
	normal_vfs.cpp normal_vfs.h 
Log Message:

Safety fixes.


Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** normal_vfs.cpp	11 Aug 2004 01:05:25 -0000	1.33
--- normal_vfs.cpp	11 Aug 2004 01:30:12 -0000	1.34
***************
*** 277,281 ****
  	if( path == vfs_getOrigin().path(-1) ){
  		// the directory itself is dirty - full refresh is needed
! 		vfs_refresh( vfs_getOrigin() );
  		return;
  	}
--- 277,281 ----
  	if( path == vfs_getOrigin().path(-1) ){
  		// the directory itself is dirty - full refresh is needed
! 		QTimer::singleShot(0, this, SLOT( vfs_refresh() ) ); // safety: dirty signal comes from KDirWatch!
  		return;
  	}

Index: normal_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** normal_vfs.h	11 Aug 2004 01:03:50 -0000	1.16
--- normal_vfs.h	11 Aug 2004 01:30:12 -0000	1.17
***************
*** 50,54 ****
  	// the constructor simply uses the inherited constructor
  	normal_vfs(QObject* panel);
!  ~normal_vfs(){delete watcher;}
  
  	/// Copy a file to the vfs (physical).
--- 50,54 ----
  	// the constructor simply uses the inherited constructor
  	normal_vfs(QObject* panel);
!  ~normal_vfs(){if( watcher ) delete watcher;}
  
  	/// Copy a file to the vfs (physical).
***************
*** 81,85 ****
  protected:
  	QDict<vfile>  vfs_files;    //< List of pointers to vfile	
! 	KDirWatch *watcher;          //< The internal dir watcher - use to detect changes in directories
  	bool dirty;                 //< true if a watcher signal arrived while in quiet mode.
  	vfile* vfileFromName(const QString& name,bool mimeTypeMagic);
--- 81,85 ----
  protected:
  	QDict<vfile>  vfs_files;    //< List of pointers to vfile	
! 	KDirWatch *watcher;         //< The internal dir watcher - use to detect changes in directories
  	bool dirty;                 //< true if a watcher signal arrived while in quiet mode.
  	vfile* vfileFromName(const QString& name,bool mimeTypeMagic);

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.32,1.33

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9924/krusader_kde3/krusader/VFS

Modified Files:
	normal_vfs.cpp 
Log Message:

if before delete


Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** normal_vfs.cpp	11 Aug 2004 01:03:50 -0000	1.32
--- normal_vfs.cpp	11 Aug 2004 01:05:25 -0000	1.33
***************
*** 72,76 ****
  	if (krConfig->readBoolEntry("AutoMount",_AutoMount)) krMtMan.autoMount(path);
     	
! 	delete watcher; //stop watching the old dir
  	watcher = 0;
  
--- 72,76 ----
  	if (krConfig->readBoolEntry("AutoMount",_AutoMount)) krMtMan.autoMount(path);
     	
! 	if( watcher ) delete watcher; //stop watching the old dir
  	watcher = 0;
  

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.31,1.32 normal_vfs.h,1.15,1.16

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9356/krusader_kde3/krusader/VFS

Modified Files:
	normal_vfs.cpp normal_vfs.h 
Log Message:

FIXED: watcher inserts the parent dir's name into the files
       watcher updates only once
       watcher doesn't handle properly URL-s ending with '\'
       watcher addDir, removeDir paths can be different (because of cleanPath)


Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** normal_vfs.cpp	10 Aug 2004 22:46:22 -0000	1.31
--- normal_vfs.cpp	11 Aug 2004 01:03:50 -0000	1.32
***************
*** 56,69 ****
  #include "../resources.h"
  
! normal_vfs::normal_vfs(QObject* panel):vfs(panel){
    setVfsFilesP(&vfs_files);
    vfs_files.setAutoDelete(true);
    
    vfs_type=NORMAL;
- 
- 	// connect the watcher
-   connect(&watcher,SIGNAL(dirty(const QString&)),this,SLOT(vfs_slotDirty(const QString&)));
- 	connect(&watcher,SIGNAL(created(const QString&)),this, SLOT(vfs_slotCreated(const QString&)));
-   connect(&watcher,SIGNAL(deleted(const QString&)),this, SLOT(vfs_slotDeleted(const QString&)));	
  }
  
--- 56,64 ----
  #include "../resources.h"
  
! normal_vfs::normal_vfs(QObject* panel):vfs(panel), watcher(0) {
    setVfsFilesP(&vfs_files);
    vfs_files.setAutoDelete(true);
    
    vfs_type=NORMAL;
  }
  
***************
*** 77,83 ****
  	if (krConfig->readBoolEntry("AutoMount",_AutoMount)) krMtMan.autoMount(path);
     	
! 	watcher.stopScan(); //stop watching the old dir
! 	// and remove it from the list
! 	if( !vfs_getOrigin().isEmpty() ) watcher.removeDir(vfs_getOrigin().path(-1)); 
  
  	// set the writable attribute to true, if that's not the case - the KIO job
--- 72,77 ----
  	if (krConfig->readBoolEntry("AutoMount",_AutoMount)) krMtMan.autoMount(path);
     	
! 	delete watcher; //stop watching the old dir
! 	watcher = 0;
  
  	// set the writable attribute to true, if that's not the case - the KIO job
***************
*** 124,129 ****
  	
  	if (!quietMode) emit startUpdate();
! 	watcher.addDir(vfs_getOrigin().path(-1),true); //start watching the new dir
!   watcher.startScan(true);
  
    return true;
--- 118,129 ----
  	
  	if (!quietMode) emit startUpdate();
! 
! 	watcher = new KDirWatch();
! 	// connect the watcher
!   connect(watcher,SIGNAL(dirty(const QString&)),this,SLOT(vfs_slotDirty(const QString&)));
!   connect(watcher,SIGNAL(created(const QString&)),this, SLOT(vfs_slotCreated(const QString&)));
!   connect(watcher,SIGNAL(deleted(const QString&)),this, SLOT(vfs_slotDeleted(const QString&)));	
!   watcher->addDir(vfs_getOrigin().path(-1),true); //start watching the new dir
!   watcher->startScan(true);
  
    return true;
***************
*** 132,136 ****
  // copy a file to the vfs (physical)	
  void normal_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
!   watcher.stopScan(); // we will refresh manually this time...	
  
  	KURL dest;
--- 132,136 ----
  // copy a file to the vfs (physical)	
  void normal_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
!   watcher->stopScan(); // we will refresh manually this time...	
  
  	KURL dest;
***************
*** 150,154 ****
    vfile* vf;
  
!   watcher.stopScan(); // we will refresh manually this time...	
  
  	// names -> urls
--- 150,154 ----
    vfile* vf;
  
!   watcher->stopScan(); // we will refresh manually this time...	
  
  	// names -> urls
***************
*** 200,204 ****
    KURL url , dest;
  
!   watcher.stopScan(); // we will refresh manually this time...	
  
    url.setPath( vfs_workingDir()+"/"+fileName );
--- 200,204 ----
    KURL url , dest;
  
!   watcher->stopScan(); // we will refresh manually this time...	
  
    url.setPath( vfs_workingDir()+"/"+fileName );
***************
*** 275,285 ****
  	}
  	
! 	KURL url = fromPathOrURL(path);
! 	if( url.equals(vfs_getOrigin()) ){
  		// the directory itself is dirty - full refresh is needed
! 		vfs_refresh(vfs_getOrigin());
  		return;
  	}
  	
  	QString name = url.fileName();
  	
--- 275,285 ----
  	}
  	
! 	if( path == vfs_getOrigin().path(-1) ){
  		// the directory itself is dirty - full refresh is needed
! 		vfs_refresh( vfs_getOrigin() );
  		return;
  	}
  	
+ 	KURL url = fromPathOrURL(path);
  	QString name = url.fileName();
  	

Index: normal_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** normal_vfs.h	30 Jul 2004 14:16:17 -0000	1.15
--- normal_vfs.h	11 Aug 2004 01:03:50 -0000	1.16
***************
*** 50,54 ****
  	// the constructor simply uses the inherited constructor
  	normal_vfs(QObject* panel);
!  ~normal_vfs(){}
  
  	/// Copy a file to the vfs (physical).
--- 50,54 ----
  	// the constructor simply uses the inherited constructor
  	normal_vfs(QObject* panel);
!  ~normal_vfs(){delete watcher;}
  
  	/// Copy a file to the vfs (physical).
***************
*** 81,85 ****
  protected:
  	QDict<vfile>  vfs_files;    //< List of pointers to vfile	
! 	KDirWatch watcher;          //< The internal dir watcher - use to detect changes in directories
  	bool dirty;                 //< true if a watcher signal arrived while in quiet mode.
  	vfile* vfileFromName(const QString& name,bool mimeTypeMagic);
--- 81,85 ----
  protected:
  	QDict<vfile>  vfs_files;    //< List of pointers to vfile	
! 	KDirWatch *watcher;          //< The internal dir watcher - use to detect changes in directories
  	bool dirty;                 //< true if a watcher signal arrived while in quiet mode.
  	vfile* vfileFromName(const QString& name,bool mimeTypeMagic);

[Krusader-commits] krusader_kde3/krusader/VFS normal_vfs.cpp,1.30,1.31

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18734/krusader_kde3/krusader/VFS

Modified Files:
	normal_vfs.cpp 
Log Message:

FIXED: [ 1005533 ] stepping onto a subfs device crashes krusader


Index: normal_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/normal_vfs.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** normal_vfs.cpp	30 Jul 2004 14:16:17 -0000	1.30
--- normal_vfs.cpp	10 Aug 2004 22:46:22 -0000	1.31
***************
*** 80,84 ****
  	// and remove it from the list
  	if( !vfs_getOrigin().isEmpty() ) watcher.removeDir(vfs_getOrigin().path(-1)); 
- 	watcher.addDir(origin.path(-1),true); //start watching the new dir
  
  	// set the writable attribute to true, if that's not the case - the KIO job
--- 80,83 ----
***************
*** 125,128 ****
--- 124,128 ----
  	
  	if (!quietMode) emit startUpdate();
+ 	watcher.addDir(vfs_getOrigin().path(-1),true); //start watching the new dir
    watcher.startScan(true);
  

[Krusader-commits] krusader_kde3 ChangeLog,1.271,1.272

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18734/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: [ 1005533 ] stepping onto a subfs device crashes krusader


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -C2 -d -r1.271 -r1.272
*** ChangeLog	31 Jul 2004 22:53:03 -0000	1.271
--- ChangeLog	10 Aug 2004 22:46:22 -0000	1.272
***************
*** 21,25 ****
      
      REACTIVATED: usermenu (now using the new useraction-system)
!     
      FIXED: [ 988835 ] window size of synchronize dirs is not stored
      FIXED: [ 946567 ] krusader minimizes to tray on desktop change
--- 21,26 ----
      
      REACTIVATED: usermenu (now using the new useraction-system)
! 
!     FIXED: [ 1005533 ] stepping onto a subfs device crashes krusader
      FIXED: [ 988835 ] window size of synchronize dirs is not stored
      FIXED: [ 946567 ] krusader minimizes to tray on desktop change

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.84,1.85

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2561/krusader_kde3/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:

FIXED: problems with saving / restoring the TabBars


Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** listpanel.cpp	7 Aug 2004 11:13:51 -0000	1.84
--- listpanel.cpp	10 Aug 2004 21:21:06 -0000	1.85
***************
*** 422,427 ****
              virtualPath = krConfig->readEntry( "Left Panel Homepage", _LeftHomepage );
           else if ( krConfig->readEntry( "Left Panel Origin" ) == i18n( "the last place it was" ) )
! 				// read the first of the tabbar. lastHomeLeft is obsolete!
! 				virtualPath = (krConfig->readPathListEntry( "LeftTabBar" ))[0];
           else
              virtualPath = getcwd( 0, 0 ); //get_current_dir_name();
--- 422,427 ----
              virtualPath = krConfig->readEntry( "Left Panel Homepage", _LeftHomepage );
           else if ( krConfig->readEntry( "Left Panel Origin" ) == i18n( "the last place it was" ) )
!             // read the first of the tabbar. lastHomeLeft is obsolete!
!             virtualPath = (krConfig->readPathListEntry( "Left Tab Bar" ))[0];
           else
              virtualPath = getcwd( 0, 0 ); //get_current_dir_name();
***************
*** 430,435 ****
              virtualPath = krConfig->readEntry( "Right Panel Homepage", _RightHomepage );
           else if ( krConfig->readEntry( "Right Panel Origin" ) == i18n( "the last place it was" ) )
! 				// read the first of the tabbar. lastHomeLeft is obsolete!
! 				virtualPath = (krConfig->readPathListEntry( "RightTabBar" ))[0];
           else
              virtualPath = getcwd( 0, 0 );
--- 430,435 ----
              virtualPath = krConfig->readEntry( "Right Panel Homepage", _RightHomepage );
           else if ( krConfig->readEntry( "Right Panel Origin" ) == i18n( "the last place it was" ) )
!             // read the first of the tabbar. lastHomeLeft is obsolete!
!             virtualPath = (krConfig->readPathListEntry( "Right Tab Bar" ))[0];
           else
              virtualPath = getcwd( 0, 0 );

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.78,1.79

[Karai C. <ck...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2561/krusader_kde3/krusader

Modified Files:
	krusader.cpp 
Log Message:

FIXED: problems with saving / restoring the TabBars


Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** krusader.cpp	7 Aug 2004 11:16:27 -0000	1.78
--- krusader.cpp	10 Aug 2004 21:21:06 -0000	1.79
***************
*** 243,253 ****
     {
        KConfigGroupSaver grp( krConfig, "Startup" );
!       QStringList l1( krConfig->readPathListEntry( "LeftTabBar" ) );
! 		QStringList l2( krConfig->readPathListEntry( "RightTabBar" ) );
        QStringList::const_iterator it;
!       for ( it = ++(l1.begin()); it != l1.end(); ++it )
!          mainView->leftMng->slotNewTab( *it );
!       for ( it = ++(l2.begin()); it != l2.end(); ++it )
!          mainView->rightMng->slotNewTab( *it );
     }
  }
--- 243,258 ----
     {
        KConfigGroupSaver grp( krConfig, "Startup" );
!       QStringList l1( krConfig->readPathListEntry( "Left Tab Bar" ) );
!       QStringList l2( krConfig->readPathListEntry( "Right Tab Bar" ) );
        QStringList::const_iterator it;
!       
!       if ( krConfig->readEntry( "Left Panel Origin" ) == i18n( "the last place it was" ) )
!          for ( it = ++(l1.begin()); it != l1.end(); ++it )
!            mainView->leftMng->slotNewTab( *it );
! 
!       krConfig->setGroup( "Startup" );             
!       if ( krConfig->readEntry( "Right Panel Origin" ) == i18n( "the last place it was" ) )
!          for ( it = ++(l2.begin()); it != l2.end(); ++it )
!            mainView->rightMng->slotNewTab( *it );
     }
  }
***************
*** 535,540 ****
     toolBar() ->saveSettings( krConfig, "Private" );
     config->setGroup( "Startup" );
! 	mainView->leftMng->saveSettings( krConfig, "Left Tab Bar" );
! 	mainView->rightMng->saveSettings( krConfig, "Right Tab Bar" );
     bool panelsavesettings = config->readBoolEntry( "Panels Save Settings", _PanelsSave );
     bool rememberpos = config->readBoolEntry( "Remember Position", _RememberPos );
--- 540,545 ----
     toolBar() ->saveSettings( krConfig, "Private" );
     config->setGroup( "Startup" );
!    mainView->leftMng->saveSettings( krConfig, "Left Tab Bar" );
!    mainView->rightMng->saveSettings( krConfig, "Right Tab Bar" );
     bool panelsavesettings = config->readBoolEntry( "Panels Save Settings", _PanelsSave );
     bool rememberpos = config->readBoolEntry( "Remember Position", _RememberPos );

[Krusader-commits] krusader_kde3/po bg.po,1.6,1.7 bs.po,1.1,1.2 ca.po,1.2,1.3 cs.po,1.7,1.8 de.po,1.17,1.18 dk.po,1.6,1.7 es.po,1.6,1.7 fr.po,1.4,1.5 hu.po,1.8,1.9 it.po,1.8,1.9 ja.po,1.4,1.5 jp.po,1.5,1.6 krusader.pot,1.16,1.17 nl.po,1.13,1.14 pl.po,1.8,1.9 ru.po,1.4,1.5 sk.po,1.7,1.8 sv.po,1.5,1.6 zh_CN.po,1.4,1.5

[Dirk E. <des...@us...>]

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22201/po

Modified Files:
	bg.po bs.po ca.po cs.po de.po dk.po es.po fr.po hu.po it.po 
	ja.po jp.po krusader.pot nl.po pl.po ru.po sk.po sv.po 
	zh_CN.po 
Log Message:
krusader-1.50-cvs

Index: sv.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/sv.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sv.po	25 Jul 2004 15:36:14 -0000	1.5
--- sv.po	7 Aug 2004 13:48:33 -0000	1.6
***************
*** 1,7 ****
  # Translation of krusader.pot to Swedish
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Erik Johansson <er...@te...>, 2001.
  # Anders Lindén <con...@gm...>, 2004.
--- 1,7 ----
  # Translation of krusader.pot to Swedish
  #
[...2910 lines suppressed...]
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr ""
***************
*** 4255,4258 ****
--- 4340,4350 ----
  msgstr ""
  
+ #, fuzzy
+ #~ msgid "Close this window"
+ #~ msgstr "Stäng Mount.Man fönstret."
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Stäng Mount.Man fönstret."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Ingen utrymmesinformation i arkivfiler"

Index: sk.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/sk.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sk.po	25 Jul 2004 15:36:14 -0000	1.7
--- sk.po	7 Aug 2004 13:48:33 -0000	1.8
***************
*** 1,7 ****
  # Translation of krusader.pot to Slovak
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Zdenko Podobný <zd...@ma...>, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Slovak
  #
[...2821 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "Vyberte iba jeden rozdelený súbor!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "Spájanie %1.* do priečinka:"
***************
*** 4143,4146 ****
--- 4229,4238 ----
  msgstr "Chyba pri čítaní súboru %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Zavrie toto okno"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Zatvoriť okno Správcu pripojení."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Žiadne informácie o priestore vo vnútri archívov"

Index: bs.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/bs.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bs.po	29 Jul 2004 14:25:59 -0000	1.1
--- bs.po	7 Aug 2004 13:48:31 -0000	1.2
***************
*** 1,7 ****
! # Translation of krusader.po to Bosnian
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Asim Husanovic <as...@me...>, 2004.
  #
--- 1,7 ----
! # Translation of krusader.pot to Bosnian
  #
[...2898 lines suppressed...]
  #: Splitter/combiner.cpp:239
--- 4141,4148 ----
  
  #: Splitter/combiner.cpp:138
! msgid ""
! "Validity checking is impossible without a good CRC file. Continue combining?"
! msgstr ""
! "Validnost je nemoguća bez dobre CRC datoteke. Želite li nastaviti spajanje?"
  
  #: Splitter/combiner.cpp:239
***************
*** 4084,4085 ****
--- 4183,4189 ----
  msgstr "Greška pri čitanju datoteke %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Zatvori ovaj prozor"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Zatvori prozor MenMon."

Index: fr.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/fr.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** fr.po	25 Jul 2004 15:36:11 -0000	1.4
--- fr.po	7 Aug 2004 13:48:31 -0000	1.5
***************
*** 1,5 ****
--- 1,7 ----
  # Translation of krusader.pot to French
+ # 
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
+ # This file is distributed under the same license as the Krusader package
  # FIRST AUTHOR René-Pierre Lehmann <ri...@le...>, 2002.
  # Partial translation for Kusader 1.40 by:
***************
*** 11,4527 ****
[...9107 lines suppressed...]
! #~ msgid "&Full Panel"
! #~ msgstr "Volet d'&exploration"
! 
! #~ msgid "&Tree Panel"
! #~ msgstr "Volet d'&arborescence"
! 
! #~ msgid "&BookMan"
! #~ msgstr "&BookMan"
! 
! #~ msgid "&Device Manager"
! #~ msgstr "&Gestionnaire de périphériques"
! 
! #~ msgid "&Quickview Panel"
! #~ msgstr "Volet d'&aperçu"
! 
! #~ msgid "Mount.Man: Krusader's mount-manager. Try it!"
! #~ msgstr "Mount.Man: Le Gestionnaire de mount de Krusader. Essayez-le!"
! 
! #~ msgid "Add the current path to your bookmarks"
! #~ msgstr "Ajoute le chemin courant à vos signets"

Index: ru.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/ru.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ru.po	25 Jul 2004 15:36:14 -0000	1.4
--- ru.po	7 Aug 2004 13:48:33 -0000	1.5
***************
*** 1,7 ****
  # Translation of krusader.pot to Russian
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Dmitry V. Chernyak <dv...@ma...>, 2003.
  #
--- 1,7 ----
  # Translation of krusader.pot to Russian
  #
[...2876 lines suppressed...]
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr ""
***************
*** 4228,4231 ****
--- 4313,4323 ----
  msgstr ""
  
+ #, fuzzy
+ #~ msgid "Close this window"
+ #~ msgstr "Закройте окно Mount.Man."
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Закройте окно Mount.Man."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Нет пространственной информации внутри архивов"

Index: nl.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/nl.po,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** nl.po	25 Jul 2004 15:36:12 -0000	1.13
--- nl.po	7 Aug 2004 13:48:33 -0000	1.14
***************
*** 1,7 ****
  # Translation of krusader.pot to Dutch
  #
- # This file is distributed under the same license as the Krusader package.
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # FIRST AUTHOR Frank Schoolmeesters <fra...@fa...> 2003, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Dutch
  #
[...2823 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "Je mag slechts één gesplitst bestand selecteren!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "%1.* combineren naar directory:"
***************
*** 4163,4166 ****
--- 4249,4258 ----
  msgstr "Fout bij het lezen van bestand %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Dit venster sluiten"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Sluit het Mount Manager venster."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Geen ruimte informatie in archieven"

Index: it.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/it.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** it.po	25 Jul 2004 15:36:12 -0000	1.8
--- it.po	7 Aug 2004 13:48:32 -0000	1.9
***************
*** 1,7 ****
  # Translation of krusader.pot to Italian
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Giuseppe Bordoni <ge...@ge...>, 2003, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Italian
  #
[...2832 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "Selezionare solo un file diviso!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "Unione di %1.* nella directory:"
***************
*** 4169,4172 ****
--- 4255,4264 ----
  msgstr "Errore durante la lettura del file %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Chiude questa finestra"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Chiude la finestra di MountMan."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Nessuna informazione circa lo spazio negli archivi"

Index: dk.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/dk.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dk.po	25 Jul 2004 15:36:11 -0000	1.6
--- dk.po	7 Aug 2004 13:48:31 -0000	1.7
***************
*** 1,7 ****
  # Translation of krusader.pot to Danish
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Proofread by Christian Sonne <fre...@ge...>, 2004.
  # Anders Bruun Olsen <an...@br...>, 2001, 2004.
--- 1,7 ----
  # Translation of krusader.pot to Danish
  #
[...2827 lines suppressed...]
  msgstr "Fejl ved læsning af filen %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Luk dette vindue"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Luk Mount.Man vinduet."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Ingen plads information inden i pakkede filer"
***************
*** 4783,4789 ****
  #~ msgstr "KRPleaseWait"
  
- #~ msgid "KRPleaseWait"
- #~ msgstr "KRPleaseWait"
- 
  #~ msgid "PackGUI"
  #~ msgstr "PackGUI"
--- 4876,4879 ----

Index: hu.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/hu.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** hu.po	25 Jul 2004 15:36:11 -0000	1.8
--- hu.po	7 Aug 2004 13:48:31 -0000	1.9
***************
*** 1,7 ****
! # Translation of hu.po to Hungarian
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Marcel Hilzinger <hi...@su...>, 2003.
  # Vámosi Tamás <Vam...@su...>, 2003.
--- 1,7 ----
! # Translation of krusader.pot to Hungarian
  #
[...2835 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "Csak egy darabolt fájlt jelöljön ki!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "%1.* egyesítése ebba a könyvtárba:"
***************
*** 4172,4175 ****
--- 4258,4267 ----
  msgstr "Hiba a(z) %1 fájl olvasásakor!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Aktuális ablak bezárása"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Csatoláskezelő ablakának bezárása"
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Nincs méret információ az archívumban"

Index: ca.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/ca.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ca.po	25 Jul 2004 15:36:10 -0000	1.2
--- ca.po	7 Aug 2004 13:48:31 -0000	1.3
***************
*** 1,7 ****
  # Translation of krusader.pot to Catalan
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Rafael Munoz Rodriguez <raf...@ne...>, 2003.
  # Quim Perez <no...@os...>, 2004.
--- 1,7 ----
  # Translation of krusader.pot to Catalan
  #
[...2879 lines suppressed...]
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr ""
***************
*** 4212,4215 ****
--- 4297,4307 ----
  msgstr ""
  
+ #, fuzzy
+ #~ msgid "Close this window"
+ #~ msgstr "Tanqueu la finestra del Mount Man"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Tanqueu la finestra del Mount Man"
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Dins els fitxers comprimits no es pot calcular la mida dels fitxers"

Index: bg.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/bg.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** bg.po	25 Jul 2004 15:36:09 -0000	1.6
--- bg.po	7 Aug 2004 13:48:31 -0000	1.7
***************
*** 1,7 ****
! # Translation of krusader.po to Bulgarian
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Milen Ivanov <ke...@ma...>, 2004.
  #
--- 1,7 ----
! # Translation of krusader.pot to Bulgarian
  #
[...2821 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "Изберете само един разделен файл!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "Обединяване на %1.* в директория:"
***************
*** 4143,4146 ****
--- 4229,4238 ----
  msgstr "Грешка при четене на файла %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Затваряне на прозореца"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Затваряне прозореца на мениджъра"
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Няма информация за размера в архива"

Index: pl.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/pl.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pl.po	25 Jul 2004 15:36:14 -0000	1.8
--- pl.po	7 Aug 2004 13:48:33 -0000	1.9
***************
*** 1,7 ****
  # Translation of krusader.pot to Polish
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Marcin Szafran <jm...@po...>, 2002, 2003.
  # Lukasz Janyst <lj...@wp...>, 2002, 2003.
--- 1,7 ----
  # Translation of krusader.pot to Polish
  #
[...2873 lines suppressed...]
  msgid "Select only one splitted file!"
  msgstr "Wybierz tylko jeden podzielony plik!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "Łączenie %1.* do katalogu:"
***************
*** 4194,4197 ****
--- 4279,4289 ----
  msgstr "Błąd podczas odczytu pliku %1!"
  
+ #, fuzzy
+ #~ msgid "Close this window"
+ #~ msgstr "Zamknij okno MountMana."
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Zamknij okno Mount.Mana."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Brak informacji o zajmowanym miejscu wewnątrz archiwum"

Index: ja.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/ja.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ja.po	25 Jul 2004 15:36:12 -0000	1.4
--- ja.po	7 Aug 2004 13:48:32 -0000	1.5
***************
*** 1,7 ****
  # Translation of krusader.pot to Japanese
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # UTUMI Hirosi <utu...@ya...>, 2003, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Japanese
  #
[...2877 lines suppressed...]
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr ""
***************
*** 4209,4212 ****
--- 4294,4304 ----
  msgstr ""
  
+ #, fuzzy
+ #~ msgid "Close this window"
+ #~ msgstr "Close the Mount.Man window."
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Close the Mount.Man window."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "書庫なので空き情報はありません"

Index: es.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/es.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** es.po	2 Aug 2004 19:28:24 -0000	1.6
--- es.po	7 Aug 2004 13:48:31 -0000	1.7
***************
*** 1,7 ****
  # Translation of krusader.pot to Spanish
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Rafael Munoz Rodriguez <raf...@ne...>, 2003, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Spanish
  #
[...2049 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "¡Seleccione sólo un archivo dividido!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "Combinando %1.* al directorio:"
***************
*** 4184,4187 ****
--- 4230,4239 ----
  msgstr "¡Error leyendo el archivo %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Cerrar ésta ventana"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Cierra la ventana de Mount Man."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "No hay información sobre el espacio dentro de los archivos"

Index: krusader.pot
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/krusader.pot,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** krusader.pot	7 Aug 2004 12:46:45 -0000	1.16
--- krusader.pot	7 Aug 2004 13:48:33 -0000	1.17
***************
*** 1,5 ****
  # SOME DESCRIPTIVE TITLE.
! # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
! # This file is distributed under the same license as the PACKAGE package.
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
--- 1,7 ----
  # SOME DESCRIPTIVE TITLE.
! #
! # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
! # Copyright (C) 2004, Krusader Krew
! # This file is distributed under the same license as the Krusader package
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
***************
*** 7,16 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Krusader 1.40\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-07 14:06+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
- "Language-Team: LANGUAGE <LL...@li...>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=CHARSET\n"
--- 9,17 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-07 15:42+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=CHARSET\n"

Index: de.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/de.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** de.po	7 Aug 2004 12:17:41 -0000	1.17
--- de.po	7 Aug 2004 13:48:31 -0000	1.18
***************
*** 1,7 ****
  # Translation of krusader.pot to German
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Christoph Thielecke <cri...@gm...>, 2003.
  # Dirk Eschler <des...@us...>, 2003, 2004.
--- 1,7 ----
  # Translation of krusader.pot to German
  #
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, 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.
***************
*** 11,15 ****
  "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-07 14:06+0200\n"
  "PO-Revision-Date: 2004-08-07 14:09+0200\n"
  "Last-Translator: Dirk Eschler <des...@us...>\n"
--- 11,15 ----
  "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-07 15:42+0200\n"
  "PO-Revision-Date: 2004-08-07 14:09+0200\n"
  "Last-Translator: Dirk Eschler <des...@us...>\n"
***************
*** 140,144 ****
  #: GUI/actionpropertybase.cpp:400
  msgid "You may want the command be executed for every selected file"
! msgstr "Möglicherweise wollen Sie das Kommando für jede ausgewählte Datei ausführen"
  
  #: GUI/actionpropertybase.cpp:401
--- 140,145 ----
  #: GUI/actionpropertybase.cpp:400
  msgid "You may want the command be executed for every selected file"
! msgstr ""
! "Möglicherweise wollen Sie das Kommando für jede ausgewählte Datei ausführen"
  
  #: GUI/actionpropertybase.cpp:401
***************
*** 277,281 ****
  #: GUI/actionpropertybase.cpp:435
  msgid "The description is only displayed in the Konfigurator and via Shift-F1"
! msgstr "Die Beschreibung wird nur im Konfigurator und mittels Shift+F1 angezeigt"
  
  #: GUI/actionpropertybase.cpp:436
--- 278,283 ----
  #: GUI/actionpropertybase.cpp:435
  msgid "The description is only displayed in the Konfigurator and via Shift-F1"
! msgstr ""
! "Die Beschreibung wird nur im Konfigurator und mittels Shift+F1 angezeigt"
  
  #: GUI/actionpropertybase.cpp:436
***************
*** 331,335 ****
  #: GUI/actionpropertybase.cpp:454
  msgid "Show the action only for these filenames (you may use '?' and '*')"
! msgstr "Zeige die Aktion nur für diese Dateinamen (Sie können '?' und '*' benutzen)"
  
  #: GUI/actionpropertybase.cpp:458
--- 333,338 ----
  #: GUI/actionpropertybase.cpp:454
  msgid "Show the action only for these filenames (you may use '?' and '*')"
! msgstr ""
! "Zeige die Aktion nur für diese Dateinamen (Sie können '?' und '*' benutzen)"
  
  #: GUI/actionpropertybase.cpp:458
***************
*** 355,359 ****
  #: GUI/actionpropertybase.cpp:463
  msgid "This allows you to tweak the commandline before beeing executed"
! msgstr "Dies erlaubt Ihnen die Kommandozeile anzupassen bevor sie ausgeführt wird"
  
  #: GUI/actionpropertybase.cpp:464
--- 358,363 ----
  #: GUI/actionpropertybase.cpp:463
  msgid "This allows you to tweak the commandline before beeing executed"
! msgstr ""
! "Dies erlaubt Ihnen die Kommandozeile anzupassen bevor sie ausgeführt wird"
  
  #: GUI/actionpropertybase.cpp:464
***************
*** 986,990 ****
  #: Panel/listpanel.cpp:834
  msgid " ? Once shred, the file is gone forever !!!"
! msgstr " ? Einmal in den Reißwolf geschoben, ist diese Datei für immer verloren!"
  
  #: Panel/listpanel.cpp:881 Panel/panelfunc.cpp:296 KViewer/krviewer.cpp:199
--- 990,995 ----
  #: Panel/listpanel.cpp:834
  msgid " ? Once shred, the file is gone forever !!!"
! msgstr ""
! " ? Einmal in den Reißwolf geschoben, ist diese Datei für immer verloren!"
  
  #: Panel/listpanel.cpp:881 Panel/panelfunc.cpp:296 KViewer/krviewer.cpp:199
***************
*** 1380,1384 ****
  
  #: krusader.cpp:208
! msgid "Status bar will show  basic informations about file below mouse pointer."
  msgstr ""
  "Die Statusleiste zeigt grundlegende Informationen über die Datei über dem "
--- 1385,1390 ----
  
  #: krusader.cpp:208
! msgid ""
! "Status bar will show  basic informations about file below mouse pointer."
  msgstr ""
  "Die Statusleiste zeigt grundlegende Informationen über die Datei über dem "
***************
*** 1691,1695 ****
  
  #: KViewer/krviewer.cpp:367
! msgid "The Document has been changed. Do you want to quit loosing the modifications?"
  msgstr "Das Dokument wurde verändert. Möchten Sie die Änderungen verwerfen?"
  
--- 1697,1702 ----
  
  #: KViewer/krviewer.cpp:367
! msgid ""
! "The Document has been changed. Do you want to quit loosing the modifications?"
  msgstr "Das Dokument wurde verändert. Möchten Sie die Änderungen verwerfen?"
  
***************
*** 2215,2219 ****
  
  #: MountMan/kmountmangui.cpp:219
! msgid "MountMan has an internal error. Please notify the developers. Thank you."
  msgstr ""
  "MountMan hat einen internen Fehler. Bitte benachrichtigen Sie die "
--- 2222,2227 ----
  
  #: MountMan/kmountmangui.cpp:219
! msgid ""
! "MountMan has an internal error. Please notify the developers. Thank you."
  msgstr ""
  "MountMan hat einen internen Fehler. Bitte benachrichtigen Sie die "
***************
*** 2270,2274 ****
  #: krusaderview.cpp:79
  msgid "Function keys allow to perform fast operations on files."
! msgstr "Funktionstasten ermöglichen eine schnelle Ausführung von Datei-Operationen"
  
  #: Dialogs/krprogress.cpp:59
--- 2278,2283 ----
  #: krusaderview.cpp:79
  msgid "Function keys allow to perform fast operations on files."
! msgstr ""
! "Funktionstasten ermöglichen eine schnelle Ausführung von Datei-Operationen"
  
  #: Dialogs/krprogress.cpp:59
***************
*** 2716,2720 ****
  #: Synchronizer/synchronizergui.cpp:883
  msgid "Lists the files marked to copy from left to right"
! msgstr "Listet Dateien auf die als 'Kopiere von links nach rechts' markiert wurden"
  
  #: Synchronizer/synchronizergui.cpp:891
--- 2725,2730 ----
  #: Synchronizer/synchronizergui.cpp:883
  msgid "Lists the files marked to copy from left to right"
! msgstr ""
! "Listet Dateien auf die als 'Kopiere von links nach rechts' markiert wurden"
  
  #: Synchronizer/synchronizergui.cpp:891
***************
*** 2728,2732 ****
  #: Synchronizer/synchronizergui.cpp:907
  msgid "Lists the files marked to copy from right to left"
! msgstr "Listet Dateien auf die als 'Kopiere von rechts nach links' markiert wurden"
  
  #: Synchronizer/synchronizergui.cpp:915
--- 2738,2743 ----
  #: Synchronizer/synchronizergui.cpp:907
  msgid "Lists the files marked to copy from right to left"
! msgstr ""
! "Listet Dateien auf die als 'Kopiere von rechts nach links' markiert wurden"
  
  #: Synchronizer/synchronizergui.cpp:915
***************
*** 3142,3146 ****
  #: Konfigurator/konfigurator.cpp:178
  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?"
  
  #: Konfigurator/kglookfeel.cpp:50
--- 3153,3158 ----
  #: Konfigurator/konfigurator.cpp:178
  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?"
  
  #: Konfigurator/kglookfeel.cpp:50
***************
*** 3697,3702 ****
  
  #: Konfigurator/kgarchives.cpp:93
! msgid "If checked, Krusader will test the archive's intergrity after packing it."
! msgstr "Falls ausgewählt, wird Krusader die Archivintegrität nach dem Packen testen."
  
  #: Konfigurator/kgarchives.cpp:94
--- 3709,3716 ----
  
  #: Konfigurator/kgarchives.cpp:93
! msgid ""
! "If checked, Krusader will test the archive's intergrity after packing it."
! msgstr ""
! "Falls ausgewählt, wird Krusader die Archivintegrität nach dem Packen testen."
  
  #: Konfigurator/kgarchives.cpp:94
***************
*** 3705,3709 ****
  
  #: Konfigurator/kgarchives.cpp:94
! msgid "Some corrupted archives might cause a crash, therefore testing is suggested"
  msgstr ""
  "Einige korrupte Archive können einen Absturz verursachen, daher ist das "
--- 3719,3724 ----
  
  #: Konfigurator/kgarchives.cpp:94
! msgid ""
! "Some corrupted archives might cause a crash, therefore testing is suggested"
  msgstr ""
  "Einige korrupte Archive können einen Absturz verursachen, daher ist das "
***************
*** 3964,3968 ****
  "Can't find the 'locate' command. Please install the findutils-locate package "
  "of GNU, or set its dependencies in Konfigurator"
! msgstr "Der 'locate'-Befehl konnte nicht gefunden werden. Bitte installieren Sie das 'findutils-locate'-Paket von GNU oder stellen Sie die Abhängigkeiten im Konfigurator ein"
  
  #: krslots.cpp:362
--- 3979,3986 ----
  "Can't find the 'locate' command. Please install the findutils-locate package "
  "of GNU, or set its dependencies in Konfigurator"
! msgstr ""
! "Der 'locate'-Befehl konnte nicht gefunden werden. Bitte installieren Sie das "
! "'findutils-locate'-Paket von GNU oder stellen Sie die Abhängigkeiten im "
! "Konfigurator ein"
  
  #: krslots.cpp:362
***************
*** 4145,4149 ****
  
  #: Splitter/combiner.cpp:138
! 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 "
--- 4163,4168 ----
  
  #: Splitter/combiner.cpp:138
! 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 "
***************
*** 4186,4188 ****
  msgid "Error at reading file %1!"
  msgstr "Fehler beim Lesen der Datei %1!"
- 
--- 4205,4206 ----

Index: cs.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/cs.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cs.po	25 Jul 2004 15:36:10 -0000	1.7
--- cs.po	7 Aug 2004 13:48:31 -0000	1.8
***************
*** 1,7 ****
  # Translation of krusader.pot to Czech
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Martin Sixta <luk...@se...>, 2003, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Czech
  #
[...2824 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "Vyber pouze jeden rozdělený soubor!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "Slučování %1.* do adresáře:"
***************
*** 4141,4144 ****
--- 4227,4236 ----
  msgstr "Chyba při čtení souboru %1!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "Zavřít toto okno"
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Uzavřít Správce připojení."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "Informace o volném místě uvnitř archívu není k dispozici."

Index: jp.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/jp.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** jp.po	25 Jul 2004 15:36:12 -0000	1.5
--- jp.po	7 Aug 2004 13:48:33 -0000	1.6
***************
*** 1,7 ****
  # Translation of krusader.pot to Japanese
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # UTUMI Hirosi <utu...@ya...>, 2003, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Japanese
  #
[...2877 lines suppressed...]
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr ""
***************
*** 4209,4212 ****
--- 4294,4304 ----
  msgstr ""
  
+ #, fuzzy
+ #~ msgid "Close this window"
+ #~ msgstr "Close the Mount.Man window."
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "Close the Mount.Man window."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "書庫なので空き情報はありません"

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/zh_CN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zh_CN.po	25 Jul 2004 15:36:14 -0000	1.4
--- zh_CN.po	7 Aug 2004 13:48:33 -0000	1.5
***************
*** 1,7 ****
  # Translation of krusader.pot to Chinese Simplified
  #
- # This file is distributed under the same license as the Krusader package
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
  # Jinghua Luo <luo...@ms...>, 2004.
  #
--- 1,7 ----
  # Translation of krusader.pot to Chinese Simplified
  #
[...2836 lines suppressed...]
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr "只选择了一个分解的文件!"
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr "合并文件%1到目录:"
***************
*** 4129,4132 ****
--- 4215,4224 ----
  msgstr "读取文件%1错误!"
  
+ #~ msgid "Close this window"
+ #~ msgstr "关闭这个窗口."
+ 
+ #~ msgid "Close the Mount.Man window."
+ #~ msgstr "关闭挂载器窗口."
+ 
  #~ msgid "No space information inside archives"
  #~ msgstr "包文件中没有空间使用的信息"

[Krusader-commits] krusader_kde3/po krusader.pot,1.15,1.16

[Dirk E. <des...@us...>]

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13544/po

Modified Files:
	krusader.pot 
Log Message:
krusader-1.50-cvs

Index: krusader.pot
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/krusader.pot,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** krusader.pot	27 Jul 2004 21:35:55 -0000	1.15
--- krusader.pot	7 Aug 2004 12:46:45 -0000	1.16
***************
*** 9,13 ****
  "Project-Id-Version: Krusader 1.40\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-07-27 23:04+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 9,13 ----
  "Project-Id-Version: Krusader 1.40\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-08-07 14:06+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
[...1989 lines suppressed...]
  
! #: krslots.cpp:619
  msgid "Don't know which files to combine."
  msgstr ""
  
! #: krslots.cpp:631
  msgid "You can't combine a directory!"
  msgstr ""
  
! #: krslots.cpp:647 krslots.cpp:710
  msgid "Not a splitted file %1!"
  msgstr ""
  
! #: krslots.cpp:663
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:717
  msgid "Combining %1.* to directory:"
  msgstr ""

[Krusader-commits] krusader_kde3/po de.po,1.16,1.17

[Dirk E. <des...@us...>]

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10023/po

Modified Files:
	de.po 
Log Message:
krusader-1.50-cvs

Index: de.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/de.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** de.po	27 Jul 2004 21:35:55 -0000	1.16
--- de.po	7 Aug 2004 12:17:41 -0000	1.17
***************
*** 9,16 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: krusader-1.40\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-07-27 23:04+0200\n"
! "PO-Revision-Date: 2004-07-27 23:20+0200\n"
  "Last-Translator: Dirk Eschler <des...@us...>\n"
  "Language-Team: German\n"
--- 9,16 ----
  msgid ""
[...2447 lines suppressed...]
  
  #: Splitter/splitter.cpp:76
  msgid "Can't split a directory!"
! msgstr "Sie können kein Verzeichnis aufteilen!"
  
  #: Splitter/splitter.cpp:127
--- 4173,4185 ----
  #: Splitter/splitter.cpp:71
  msgid "Krusader::Splitting..."
! msgstr "Krusader::Splittet..."
  
  #: Splitter/splitter.cpp:72
  msgid "Splitting the file %1..."
! msgstr "Splitte die Datei %1..."
  
  #: Splitter/splitter.cpp:76
  msgid "Can't split a directory!"
! msgstr "Sie können kein Verzeichnis splitten!"
  
  #: Splitter/splitter.cpp:127

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.cpp,1.7,1.8

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6293/krusader/Panel

Modified Files:
	panelpopup.cpp 
Log Message:
 

Index: panelpopup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** panelpopup.cpp	7 Aug 2004 11:17:58 -0000	1.7
--- panelpopup.cpp	7 Aug 2004 11:52:12 -0000	1.8
***************
*** 141,148 ****
  	if (left) {
  		id = krConfig->readNumEntry("Left Panel Popup", _LeftPanelPopup);
- 		kdWarning() << "left " << id << endl;
  	} else {
  		id = krConfig->readNumEntry("Right Panel Popup", _RightPanelPopup);	
- 		kdWarning() << "right " << id << endl;
  	}
  	btns->setButton(id);
--- 141,146 ----

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.h,1.4,1.5

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2174/krusader/Panel

Modified Files:
	panelpopup.h 
Log Message:
add: save left and right popup's active tab 

Index: panelpopup.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** panelpopup.h	7 Aug 2004 10:25:04 -0000	1.4
--- panelpopup.h	7 Aug 2004 11:18:40 -0000	1.5
***************
*** 3,6 ****
--- 3,7 ----
  
  #include <qwidget.h>
+ #include <qwidgetstack.h>
  #include <qpixmap.h>
  #include <kfileitem.h>
***************
*** 11,15 ****
  class QButtonGroup;
  class QLabel;
- class QWidgetStack;
  class QListViewItem;
  class KFileTreeView;
--- 12,15 ----
***************
*** 23,28 ****
     enum Parts { Tree, Preview, QuickPanel, Last=0xFF };
  public:
!    PanelPopup( QWidget *parent );
     ~PanelPopup();
  
  public slots:
--- 23,29 ----
     enum Parts { Tree, Preview, QuickPanel, Last=0xFF };
  public:
!    PanelPopup( QWidget *parent, bool left );
     ~PanelPopup();
+ 	inline int currentPage() const { return stack->id(stack->visibleWidget()); }
  
  public slots:

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.cpp,1.6,1.7

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2043/krusader/Panel

Modified Files:
	panelpopup.cpp 
Log Message:
add: save left and right popup's active tab 

Index: panelpopup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** panelpopup.cpp	7 Aug 2004 10:26:26 -0000	1.6
--- panelpopup.cpp	7 Aug 2004 11:17:58 -0000	1.7
***************
*** 1,2 ****
--- 1,3 ----
+ #include "../krusader.h"
  #include "panelpopup.h"
  #include "../kicons.h"
***************
*** 13,23 ****
  #include <krview.h>
  #include <krviewitem.h>
- #include <qwidgetstack.h>
  #include <klineedit.h>
  
  #include <kdebug.h>
  
! 
! PanelPopup::PanelPopup( QWidget *parent ) : QWidget( parent ), stack( 0 ), viewer( 0 ), pjob( 0 ) {
     QGridLayout * layout = new QGridLayout(this, 1, 1);
  	
--- 14,23 ----
  #include <krview.h>
  #include <krviewitem.h>
  #include <klineedit.h>
  
  #include <kdebug.h>
  
! PanelPopup::PanelPopup( QWidget *parent, bool left ) : QWidget( parent ), 
! 	stack( 0 ), viewer( 0 ), pjob( 0 ) {
     QGridLayout * layout = new QGridLayout(this, 1, 1);
  	
***************
*** 135,141 ****
  	layout->addMultiCellWidget(stack,1,1,0,3);
  	
!    // raise the tree part
! 	treeBtn->setOn(true);
! 	tabSelected(Tree);
  }
  
--- 135,151 ----
  	layout->addMultiCellWidget(stack,1,1,0,3);
  	
!    // set the wanted widget
! 	// ugly: are we left or right?
! 	int id;
! 	krConfig->setGroup("Startup");
! 	if (left) {
! 		id = krConfig->readNumEntry("Left Panel Popup", _LeftPanelPopup);
! 		kdWarning() << "left " << id << endl;
! 	} else {
! 		id = krConfig->readNumEntry("Right Panel Popup", _RightPanelPopup);	
! 		kdWarning() << "right " << id << endl;
! 	}
! 	btns->setButton(id);
! 	tabSelected(id);
  }
  

[Krusader-commits] krusader_kde3/krusader defaults.h,1.13,1.14

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1946/krusader

Modified Files:
	defaults.h 
Log Message:
add: save left and right popup's active tab 

Index: defaults.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/defaults.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** defaults.h	27 Jul 2004 17:00:57 -0000	1.13
--- defaults.h	7 Aug 2004 11:17:11 -0000	1.14
***************
*** 59,62 ****
--- 59,69 ----
  // Right Panel Homepage
  #define _RightHomepage     "/"
+ // Left Tab Bar
+ // Right Tab Bar
+ // Left Panel Popup
+ #define _LeftPanelPopup		0
+ // Right Panel Popup
+ #define _RightPanelPopup	0
+ 
  
  ////////////////////////[Look&Feel]

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.77,1.78

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1843/krusader

Modified Files:
	krusader.cpp 
Log Message:
add: save left and right popup's active tab 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** krusader.cpp	29 Jul 2004 20:53:05 -0000	1.77
--- krusader.cpp	7 Aug 2004 11:16:27 -0000	1.78
***************
*** 69,72 ****
--- 69,73 ----
  #include "Konfigurator/konfigurator.h"
  #include "MountMan/kmountman.h"
+ #include "Panel/panelpopup.h"
  #include "defaults.h"
  #include "resources.h"
***************
*** 534,539 ****
     toolBar() ->saveSettings( krConfig, "Private" );
     config->setGroup( "Startup" );
! 	mainView->leftMng->saveSettings( krConfig, "LeftTabBar" );
! 	mainView->rightMng->saveSettings( krConfig, "RightTabBar" );
     bool panelsavesettings = config->readBoolEntry( "Panels Save Settings", _PanelsSave );
     bool rememberpos = config->readBoolEntry( "Remember Position", _RememberPos );
--- 535,540 ----
     toolBar() ->saveSettings( krConfig, "Private" );
     config->setGroup( "Startup" );
! 	mainView->leftMng->saveSettings( krConfig, "Left Tab Bar" );
! 	mainView->rightMng->saveSettings( krConfig, "Right Tab Bar" );
     bool panelsavesettings = config->readBoolEntry( "Panels Save Settings", _PanelsSave );
     bool rememberpos = config->readBoolEntry( "Remember Position", _RememberPos );
***************
*** 547,555 ****
        config->writeEntry( "Right Panel Origin", i18n( "the last place it was" ) );
     }
! 
! 	// lastHome* is obsolete! remove it
!    //config->writeEntry( "lastHomeLeft", mainView->left->realPath );
!    //config->writeEntry( "lastHomeRight", mainView->right->realPath );
! 
     // save size and position
     if ( rememberpos || uisavesettings ) {
--- 548,555 ----
        config->writeEntry( "Right Panel Origin", i18n( "the last place it was" ) );
     }
! 	// save the popup panel's page of the CURRENT tab
! 	config->writeEntry( "Left Panel Popup", mainView->left->popup->currentPage() );
! 	config->writeEntry( "Right Panel Popup", mainView->right->popup->currentPage() );
! 	
     // save size and position
     if ( rememberpos || uisavesettings ) {

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.83,1.84

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1358/krusader/Panel

Modified Files:
	listpanel.cpp 
Log Message:
add: save left and right popup's active tab 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** listpanel.cpp	31 Jul 2004 22:52:00 -0000	1.83
--- listpanel.cpp	7 Aug 2004 11:13:51 -0000	1.84
***************
*** 229,233 ****
  	
  	// add a popup
! 	popup = new PanelPopup(splt);
  	connect(popup, SIGNAL(selection(const KURL&)), SLOTS, SLOT(refresh(const KURL&)));
  	connect(popup, SIGNAL(hideMe()), this, SLOT(togglePanelPopup()));
--- 229,233 ----
  	
  	// add a popup
! 	popup = new PanelPopup(splt, left);
  	connect(popup, SIGNAL(selection(const KURL&)), SLOTS, SLOT(refresh(const KURL&)));
  	connect(popup, SIGNAL(hideMe()), this, SLOT(togglePanelPopup()));

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.cpp,1.5,1.6

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28243/krusader/Panel

Modified Files:
	panelpopup.cpp 
Log Message:
jonas' patch: connect the quick select popup to the main dialog 

Index: panelpopup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** panelpopup.cpp	31 Jul 2004 22:53:34 -0000	1.5
--- panelpopup.cpp	7 Aug 2004 10:26:26 -0000	1.6
***************
*** 94,108 ****
  	// --- quick select
  	QLabel *selectLabel = new QLabel(i18n("Quick Select"), quickPanel);
! 	quickSelectEdit = new KLineEdit(quickPanel);
! 	connect(quickSelectEdit, SIGNAL(returnPressed(const QString& )),
  		this, SLOT(quickSelect(const QString& )));
  	
  	QToolButton *qselectBtn = new QToolButton(quickPanel);
! 	qselectBtn->setText("Go");
  	connect(qselectBtn, SIGNAL(clicked()), this, SLOT(quickSelect()));
  
  	qlayout->addWidget(selectLabel,0,0);
! 	qlayout->addWidget(quickSelectEdit,0,1);
  	qlayout->addWidget(qselectBtn,0,2);
  	stack->addWidget(quickPanel, QuickPanel);
  	
--- 94,133 ----
  	// --- quick select
  	QLabel *selectLabel = new QLabel(i18n("Quick Select"), quickPanel);
!         quickSelectCombo = new KComboBox( quickPanel );
!         quickSelectCombo->setEditable( true );
!         krConfig->setGroup( "Private" );
!         QStrList lst;
!         int i = krConfig->readListEntry( "Predefined Selections", lst );
!         if ( i > 0 )
!            quickSelectCombo->insertStrList( lst );
!         quickSelectCombo->setCurrentText( "*" );
!         quickSelectCombo->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ) );
! 
! 	connect(quickSelectCombo, SIGNAL(returnPressed(const QString& )),
  		this, SLOT(quickSelect(const QString& )));
  	
  	QToolButton *qselectBtn = new QToolButton(quickPanel);
!         qselectBtn->setPixmap(krLoader->loadIcon( "kr_selectall", KIcon::Toolbar, 16 ));
!         qselectBtn->setFixedSize(20, 20);
!         QToolTip::add( qselectBtn, i18n("apply the selection") );
  	connect(qselectBtn, SIGNAL(clicked()), this, SLOT(quickSelect()));
  
+         QToolButton *qstoreBtn = new QToolButton(quickPanel);
+         qstoreBtn->setPixmap(krLoader->loadIcon( "filesave", KIcon::Toolbar, 16 ));
+         qstoreBtn->setFixedSize(20, 20);
+         QToolTip::add( qstoreBtn, i18n("store the current selection") );
+         connect(qstoreBtn, SIGNAL(clicked()), this, SLOT(quickSelectStore()));
+         
+         QToolButton *qsettingsBtn = new QToolButton(quickPanel);
+         qsettingsBtn->setPixmap(krLoader->loadIcon( "configure", KIcon::Toolbar, 16 ));
+         qsettingsBtn->setFixedSize(20, 20);
+         QToolTip::add( qsettingsBtn, i18n("select group dialog") );
+         connect(qsettingsBtn, SIGNAL(clicked()), krSelect, SLOT(activate()));
+ 
  	qlayout->addWidget(selectLabel,0,0);
! 	qlayout->addWidget(quickSelectCombo,0,1);
  	qlayout->addWidget(qselectBtn,0,2);
+ 	qlayout->addWidget(qstoreBtn,0,3);
+ 	qlayout->addWidget(qsettingsBtn,0,4);
  	stack->addWidget(quickPanel, QuickPanel);
  	
***************
*** 188,192 ****
  
  void PanelPopup::quickSelect() {
! 	SLOTS->markGroup(quickSelectEdit->text(), true);
  }
  
--- 213,217 ----
  
  void PanelPopup::quickSelect() {
! 	SLOTS->markGroup(quickSelectCombo->currentText(), true);
  }
  
***************
*** 194,195 ****
--- 219,228 ----
  	SLOTS->markGroup(mask, true);
  }
+ 
+ void PanelPopup::quickSelectStore() {
+         krConfig->setGroup( "Private" );
+         QStringList lst = krConfig->readListEntry( "Predefined Selections" );
+         if ( lst.find(quickSelectCombo->currentText()) == lst.end() )
+            lst.append( quickSelectCombo->currentText() );
+         krConfig->writeEntry( "Predefined Selections", lst );
+ }

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.h,1.3,1.4

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28130/krusader/Panel

Modified Files:
	panelpopup.h 
Log Message:
jonas' patch: connect the quick select popup to the main dialog 

Index: panelpopup.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** panelpopup.h	31 Jul 2004 22:53:59 -0000	1.3
--- panelpopup.h	7 Aug 2004 10:25:04 -0000	1.4
***************
*** 17,20 ****
--- 17,21 ----
  class KrSqueezedTextLabel;
  class KLineEdit;
+ class KComboBox;
  
  class PanelPopup: public QWidget {
***************
*** 40,43 ****
--- 41,45 ----
  	void quickSelect();
  	void quickSelect(const QString &);
+         void quickSelectStore();
  
  protected:
***************
*** 49,53 ****
  	QToolButton *treeBtn, *previewBtn, *quickBtn;
  	QButtonGroup *btns;
! 	KLineEdit *quickSelectEdit, *quickFilter;
  };
  
--- 51,56 ----
  	QToolButton *treeBtn, *previewBtn, *quickBtn;
  	QButtonGroup *btns;
! 	KLineEdit *quickFilter;
!         KComboBox *quickSelectCombo;
  };
  

[Krusader-commits] krusader_kde3/krusader/Panel panelfunc.cpp,1.72,1.73

[Rafi Y. <ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27802/krusader/Panel

Modified Files:
	panelfunc.cpp 
Log Message:
Fixed a crash in the properties function

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** panelfunc.cpp	26 Jul 2004 22:21:24 -0000	1.72
--- panelfunc.cpp	3 Aug 2004 11:07:24 -0000	1.73
***************
*** 776,789 ****
      return ;  // no names...
    KFileItemList fi;
! 	fi.setAutoDelete(true);
  
! 	KURL::List* urls = files() ->vfs_getFiles( &names );
!   for ( unsigned int i = 0 ; i < urls->count() ; ++i ) {
!     KURL url = (*urls->at(i));
!     vfile* vf = files()->vfs_search( url.fileName() );
!     if( !vf ) continue;
      fi.append( new KFileItem(vf->vfile_getEntry(),files()->vfs_getOrigin(),false,true) );
    }
! 
    // Show the properties dialog
    KPropertiesDialog *dlg = new KPropertiesDialog( fi );
--- 776,790 ----
      return ;  // no names...
    KFileItemList fi;
!   fi.setAutoDelete(true);
  
!   for ( unsigned int i = 0 ; i < names.count() ; ++i ) {
!     vfile* vf = files()->vfs_search( names[i] );
!     if( !vf ) continue;    
!     //KURL url = files()->vfs_getFile( names[i] );
      fi.append( new KFileItem(vf->vfile_getEntry(),files()->vfs_getOrigin(),false,true) );
    }
!   
!   if( fi.isEmpty() ) return;
!   
    // Show the properties dialog
    KPropertiesDialog *dlg = new KPropertiesDialog( fi );

[Krusader-commits] krusader_kde3/po es.po,1.5,1.6

[Dirk E. <des...@us...>]

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13573/po

Modified Files:
	es.po 
Log Message:
krusader-1.50-cvs

Index: es.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/es.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** es.po	25 Jul 2004 15:36:11 -0000	1.5
--- es.po	2 Aug 2004 19:28:24 -0000	1.6
***************
*** 4,8 ****
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
! # Rafael Munoz Rodriguez <mu...@ho...>, 2003.
  #
  msgid ""
--- 4,8 ----
  # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
  # Copyright (C) 2004, Krusader Krew
! # Rafael Munoz Rodriguez <raf...@ne...>, 2003, 2004.
  #
[...4422 lines suppressed...]
! #~ msgid "Entry"
! #~ msgstr "Entrada"
  
! #~ msgid "Show this entry"
! #~ msgstr "Mostrar ésta entrada"
  
! #~ msgid "everywhere"
! #~ msgstr "en cualquier lugar"
  
! #~ msgid "only in"
! #~ msgstr "sólo en"
  
! #~ msgid "URLs (local and remote)"
! #~ msgstr "URLs (locales y remotas)"
  
! #~ msgid "No output collection"
! #~ msgstr "No reunir salida"
  
! #~ msgid "Single click executes"
! #~ msgstr "Un sólo clic ejecuta"

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.h,1.2,1.3

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6697/krusader/Panel

Modified Files:
	panelpopup.h 
Log Message:
add: 3rd page to the 3rd hand. quick select 

Index: panelpopup.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** panelpopup.h	31 Jul 2004 21:58:13 -0000	1.2
--- panelpopup.h	31 Jul 2004 22:53:59 -0000	1.3
***************
*** 16,23 ****
  class QToolButton;
  class KrSqueezedTextLabel;
  
  class PanelPopup: public QWidget {
     Q_OBJECT
!    enum Parts { Tree, Preview, Last=0xFF };
  public:
     PanelPopup( QWidget *parent );
--- 16,24 ----
  class QToolButton;
  class KrSqueezedTextLabel;
+ class KLineEdit;
  
  class PanelPopup: public QWidget {
     Q_OBJECT
!    enum Parts { Tree, Preview, QuickPanel, Last=0xFF };
  public:
     PanelPopup( QWidget *parent );
***************
*** 36,39 ****
--- 37,43 ----
  	void tabSelected(int id);
  	void treeSelection(QListViewItem*);
+ 	
+ 	void quickSelect();
+ 	void quickSelect(const QString &);
  
  protected:
***************
*** 43,48 ****
  	QGuardedPtr<KIO::PreviewJob> pjob;
  	KFileTreeView *tree;
! 	QToolButton *treeBtn, *previewBtn;
  	QButtonGroup *btns;
  };
  
--- 47,53 ----
  	QGuardedPtr<KIO::PreviewJob> pjob;
  	KFileTreeView *tree;
! 	QToolButton *treeBtn, *previewBtn, *quickBtn;
  	QButtonGroup *btns;
+ 	KLineEdit *quickSelectEdit, *quickFilter;
  };