krusader-commits

[Krusader-commits] krusader_kde3/krusader/UserAction expander.cpp,1.15,1.16 expander.h,1.7,1.8 kraction.cpp,1.8,1.9 useractionproperties.cpp,1.2,1.3 useractionproperties.h,1.2,1.3 useractionxml.cpp,1.3,1.4

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

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

Modified Files:
	expander.cpp expander.h kraction.cpp useractionproperties.cpp 
	useractionproperties.h useractionxml.cpp 
Log Message:
removed the double-function of %current% (call_each) in order to introcude %each% after 1.50 is out

Index: kraction.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/kraction.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kraction.cpp	10 Oct 2004 23:34:19 -0000	1.8
--- kraction.cpp	12 Oct 2004 14:20:42 -0000	1.9
***************
*** 207,212 ****
     
     // replace %% and prepare string
! //    QStringList commandList = Expander::expand( *_properties->command(), _properties->acceptURLs(), _properties->callEach() );
!    QStringList commandList = krExpander->expand( *_properties->command(), _properties->acceptURLs(), _properties->callEach() );
     
     if ( _properties->confirmExecution() ) {
--- 207,211 ----
     
     // replace %% and prepare string
!    QStringList commandList = krExpander->expand( *_properties->command(), _properties->acceptURLs() );
     
     if ( _properties->confirmExecution() ) {

Index: useractionproperties.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionproperties.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** useractionproperties.cpp	7 Oct 2004 13:53:38 -0000	1.2
--- useractionproperties.cpp	12 Oct 2004 14:20:43 -0000	1.3
***************
*** 20,24 ****
    _separateStderr = false;
    _acceptURLs = false;
-   _callEach = false;
    _confirmExecution = false;
  }
--- 20,23 ----
***************
*** 43,47 ****
    _separateStderr = from->separateStderr();
    _acceptURLs = from->acceptURLs();
-   _callEach = from->callEach();
    _confirmExecution = from->confirmExecution();
    _defaultShortcut = *from->defaultShortcut();
--- 42,45 ----
***************
*** 102,108 ****
  void UserActionProperties::setAcceptURLs(const bool& acceptURLs) { _acceptURLs = acceptURLs;}
  
- bool UserActionProperties::callEach() { return _callEach; }
- void UserActionProperties::setCallEach(const bool& callEach) { _callEach = callEach;}
- 
  bool UserActionProperties::confirmExecution() { return _confirmExecution; }
  void UserActionProperties::setConfirmExecution(const bool& confirmExecution) { _confirmExecution = confirmExecution;}
--- 100,103 ----

Index: useractionxml.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionxml.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** useractionxml.cpp	7 Oct 2004 13:53:38 -0000	1.3
--- useractionxml.cpp	12 Oct 2004 14:20:43 -0000	1.4
***************
*** 161,169 ****
      property.setAttributeNode( attribute );
    }
-   if ( prop->callEach() ) {
-     attribute = _doc->createAttribute( "onmultiplefiles" );
-     attribute.setValue( "call_each" );
-     property.setAttributeNode( attribute );
-   }
    if ( prop->confirmExecution() ) {
      attribute = _doc->createAttribute( "confirmexecution" );
--- 161,164 ----
***************
*** 401,412 ****
          kdWarning() << "unrecognized attribute value in "ACTION_XML" found <action name=\"" << prop->name() << "\"><command accept=\"" << attr << "\""<< endl;
  
-       attr = e.attribute( "onmultiplefiles", "call_once" ); // default: "call_once"
-       if ( attr == "call_once" )
-         prop->setCallEach( false );
-       else if ( attr == "call_each")
-         prop->setCallEach( true );
-       else
-         kdWarning() << "unrecognized attribute value in "ACTION_XML" found <action name=\"" << prop->name() << "\"><command onmultiplefiles=\"" << attr << "\""<< endl;
- 
        attr = e.attribute( "confirmexecution", "false" ); // default: "false"
        if ( attr == "false" )
--- 396,399 ----

Index: expander.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** expander.h	7 Oct 2004 20:57:26 -0000	1.7
--- expander.h	12 Oct 2004 14:20:42 -0000	1.8
***************
*** 267,271 ****
       * @return a list of all commands (one if callEach is false or one for every selectet item if true)
       */
!    QStringList expand( const QString& stringToExpand, bool useUrl, bool callEach );
  
  protected:
--- 267,271 ----
       * @return a list of all commands (one if callEach is false or one for every selectet item if true)
       */
!    QStringList expand( const QString& stringToExpand, bool useUrl );
  
  protected:

Index: useractionproperties.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/useractionproperties.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** useractionproperties.h	7 Oct 2004 13:53:38 -0000	1.2
--- useractionproperties.h	12 Oct 2004 14:20:43 -0000	1.3
***************
*** 137,145 ****
      void setAcceptURLs(const bool& acceptURLs);
      /**
-      * @return true if the command should be executed for each selected file (%_Current% will be used)
-      */
-     bool callEach();
-     void setCallEach(const bool& callEach);
-     /**
       * @return true if true the user has to confirm the execution. Here he also can edit the already expanded command
       */
--- 137,140 ----
***************
*** 147,151 ****
      void setConfirmExecution(const bool& confirmExecution);
      /**
!      *  ///< Default shortcut for the action.
       * @return The shortcut
       */
--- 142,146 ----
      void setConfirmExecution(const bool& confirmExecution);
      /**
!      * Default shortcut for the action.
       * @return The shortcut
       */

Index: expander.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** expander.cpp	10 Oct 2004 19:59:16 -0000	1.15
--- expander.cpp	12 Oct 2004 14:20:42 -0000	1.16
***************
*** 106,125 ****
     addParameter( new exp_parameter( i18n("Automatic escape spaces"), "__yes", false ) );
  }
! QString exp_Current::expFunc( const ListPanel* panel, const QStringList& parameter, const bool& useUrl, const int& currentItem ) {
     NEED_PANEL
     
     QString item;
!    if ( currentItem >= 0) {  // in a callEach-cycle
!       if ( panel == ACTIVE_PANEL ) {  // callEach works only in the active panel
!          QStringList items;
!          panel->view->getSelectedItems( &items );
!          item = items[currentItem];
!       }
!       else
!          item = panel->view->getCurrentItem();
!    }
!    else {
        item = panel->view->getCurrentItem();
!    }
     
     QString result;
--- 106,125 ----
     addParameter( new exp_parameter( i18n("Automatic escape spaces"), "__yes", false ) );
  }
! QString exp_Current::expFunc( const ListPanel* panel, const QStringList& parameter, const bool& useUrl, const int& /*currentItem*/ ) {
     NEED_PANEL
     
     QString item;
! //    if ( currentItem >= 0) {  // in a callEach-cycle
! //       if ( panel == ACTIVE_PANEL ) {  // callEach works only in the active panel
! //          QStringList items;
! //          panel->view->getSelectedItems( &items );
! //          item = items[currentItem];
! //       }
! //       else
! //          item = panel->view->getCurrentItem();
! //    }
! //    else {
        item = panel->view->getCurrentItem();
! //    }
     
     QString result;
***************
*** 447,459 ****
  }
  
! QStringList Expander::expand( const QString& stringToExpand, bool useUrl, bool callEach ) {
     QStringList result;
!    if ( callEach ) {
!       QStringList items;
!       ACTIVE_PANEL->view->getSelectedItems( &items );
!       for ( unsigned int currentItem = 0; currentItem < items.count(); ++currentItem )
!          result.append( expandCurrent( stringToExpand, useUrl, currentItem ) );
!    }
!    else
        result.append( expandCurrent( stringToExpand, useUrl, -1 ) );
  
--- 447,459 ----
  }
  
! QStringList Expander::expand( const QString& stringToExpand, bool useUrl ) {
     QStringList result;
! //    if ( callEach ) {
! //       QStringList items;
! //       ACTIVE_PANEL->view->getSelectedItems( &items );
! //       for ( unsigned int currentItem = 0; currentItem < items.count(); ++currentItem )
! //          result.append( expandCurrent( stringToExpand, useUrl, currentItem ) );
! //    }
! //    else
        result.append( expandCurrent( stringToExpand, useUrl, -1 ) );
  

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.100,1.101

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

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

Modified Files:
	listpanel.cpp 
Log Message:
fixed: missing #include 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** listpanel.cpp	11 Oct 2004 12:01:43 -0000	1.100
--- listpanel.cpp	12 Oct 2004 09:45:40 -0000	1.101
***************
*** 29,32 ****
--- 29,33 ----
  ***************************************************************************/
  
+ #include <unistd.h>
  #include <sys/param.h>
  // QT includes

[Krusader-commits] krusader_kde3/krusader/VFS arc_vfs.cpp,1.16,1.17

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

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

Modified Files:
	arc_vfs.cpp 
Log Message:
fixed: missing #include 

Index: arc_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/arc_vfs.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** arc_vfs.cpp	8 Feb 2004 15:25:57 -0000	1.16
--- arc_vfs.cpp	12 Oct 2004 09:45:19 -0000	1.17
***************
*** 29,32 ****
--- 29,33 ----
   ***************************************************************************/
  
+ #include <unistd.h>
  #include <sys/param.h>
  #include <sys/types.h>

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.98,1.99

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

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

Modified Files:
	krusader.cpp 
Log Message:
fixed: missing #include 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** krusader.cpp	10 Oct 2004 19:59:15 -0000	1.98
--- krusader.cpp	12 Oct 2004 09:44:57 -0000	1.99
***************
*** 31,36 ****
  #include <sys/stat.h> 
  #include <sys/param.h>
- #ifdef BSD
  #include <unistd.h>
  #include <sys/types.h>
  #endif
--- 31,36 ----
  #include <sys/stat.h> 
  #include <sys/param.h>
  #include <unistd.h>
+ #ifdef BSD
  #include <sys/types.h>
  #endif

[Krusader-commits] krusader_kde3/krusader/UserAction useractionpopupmenu.cpp,NONE,1.1 useractionpopupmenu.h,NONE,1.1 Makefile.am,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-serv2072/krusader/UserAction

Modified Files:
	Makefile.am 
Added Files:
	useractionpopupmenu.cpp useractionpopupmenu.h 
Log Message:
ADDED: useraction: available via rightclick-menu

Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	23 Jul 2004 00:03:19 -0000	1.1
--- Makefile.am	11 Oct 2004 12:01:44 -0000	1.2
***************
*** 6,11 ****
  libUserAction_a_METASOURCES = AUTO
  
! libUserAction_a_SOURCES = useraction.cpp kraction.cpp expander.cpp useractionxml.cpp useractionproperties.cpp
  
  ####### kdevelop will overwrite this part!!! (end)############
! noinst_HEADERS =  kraction.h
--- 6,12 ----
  libUserAction_a_METASOURCES = AUTO
  
! libUserAction_a_SOURCES = useraction.cpp kraction.cpp expander.cpp \
! 	useractionxml.cpp useractionproperties.cpp useractionpopupmenu.cpp
  
  ####### kdevelop will overwrite this part!!! (end)############
! noinst_HEADERS = kraction.h useractionpopupmenu.h

--- NEW FILE: useractionpopupmenu.cpp ---
//
// C++ Implementation: UserActionPopupMenu
//
// Description: 
//
//
// Author: Jonas B�r (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//

#include "useractionpopupmenu.h"

#include <kurl.h>

#include "../krusader.h"
#include "useraction.h"
#include "kraction.h"

UserActionPopupMenu::UserActionPopupMenu( KURL currentURL, QWidget *parent ) : KPopupMenu( parent, "useraction popupmenu" ) {
   for ( UserAction::KrActionList::iterator it = krUserAction->actionList()->begin(); it != krUserAction->actionList()->end(); ++it )
      if ( (*it)->isAvailable( currentURL ) )
         (*it)->plug( this );
}
--- NEW FILE: useractionpopupmenu.h ---
//
// C++ Interface: UserActionPopupMenu
//
// Description: 
//
//
// Author: Jonas Bähr, (C) 2004
//
// Copyright: See COPYING file that comes with this distribution
//
//

#ifndef USERACTIONPOPUPMENU_H
#define USERACTIONPOPUPMENU_H

#include <kpopupmenu.h>

class KURL;

class UserActionPopupMenu : public KPopupMenu {
public:
   UserActionPopupMenu( KURL currentURL, QWidget *parent = 0 );
};

#endif // ifndef USERACTIONPOPUPMENU_H

[Krusader-commits] krusader_kde3 ChangeLog,1.323,1.324

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

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

Modified Files:
	ChangeLog 
Log Message:
ADDED: useraction: available via rightclick-menu

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.323
retrieving revision 1.324
diff -C2 -d -r1.323 -r1.324
*** ChangeLog	10 Oct 2004 23:10:51 -0000	1.323
--- ChangeLog	11 Oct 2004 12:01:45 -0000	1.324
***************
*** 1,3 ****
--- 1,4 ----
  ======================
+     ADDED: useraction: available via rightclick-menu
      ADDED: importing the right click menu of konqueror
      ADDED: cut(CTRL+X), copy(CTRL+C), paste(CTRL+V)

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.99,1.100

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

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

Modified Files:
	listpanel.cpp 
Log Message:
ADDED: useraction: available via rightclick-menu

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** listpanel.cpp	10 Oct 2004 23:10:52 -0000	1.99
--- listpanel.cpp	11 Oct 2004 12:01:43 -0000	1.100
***************
*** 91,94 ****
--- 91,95 ----
  #include "../krservices.h"
  #include "panelpopup.h" 
+ #include "../UserAction/useractionpopupmenu.h"
  
  typedef QValueList<KServiceOffer> OfferList;
***************
*** 820,823 ****
--- 821,826 ----
     }
     
+    popup.insertItem( i18n("Useractions"), new UserActionPopupMenu( func->files()->vfs_getFile( item->name() ).url() ) );
+    
     KFileItemList _items;
     _items.setAutoDelete( true );

[Krusader-commits] krusader_kde3/krusader/VFS krvfshandler.cpp,1.4,1.5 virt_vfs.cpp,1.1,1.2 virt_vfs.h,1.1,1.2

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

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

Modified Files:
	krvfshandler.cpp virt_vfs.cpp virt_vfs.h 
Log Message:
Starting to work on virtual folders...

Index: virt_vfs.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/virt_vfs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** virt_vfs.h	10 Dec 2003 20:37:46 -0000	1.1
--- virt_vfs.h	11 Oct 2004 08:01:13 -0000	1.2
***************
*** 29,32 ****
--- 29,57 ----
  	virt_vfs(QObject* panel, bool quiet=false);
  	~virt_vfs();
+ 	
+ 	/// Copy a file to the vfs (physical).
+ 	void vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir = "");	
+ 	/// Remove a file from the vfs (physical)
+ 	void vfs_delFiles(QStringList *fileNames);	
+ 	/// Return a list of URLs for multiple files	
+ 	KURL::List* vfs_getFiles(QStringList* names);
+ 	/// Return a URL to a single file	
+ 	KURL vfs_getFile(const QString& name);
+ 	/// Create a new directory
+ 	void vfs_mkdir(const QString& name);
+ 	/// Rename file
+ 	void vfs_rename(const QString& fileName,const QString& newName);
+ 	/// Calculate the amount of space occupied by a file or directory (recursive).
+ 	void vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop = 0);
+ 	
+ 	/// Return the VFS working dir
+ 	QString vfs_workingDir(){ return QString::null; }
+ 
+ protected:
+ 	/// This function should not be called for this VFS !
+ 	bool populateVfsList(const KURL& origin, bool showHidden);
+ 	
+ 	QDict<vfile>  vfs_files;    //< List of pointers to vfile.
+ 	QDict<vfile>  vfs_files_copy;
  };
  

Index: krvfshandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/krvfshandler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krvfshandler.cpp	2 Jan 2004 17:59:26 -0000	1.4
--- krvfshandler.cpp	11 Oct 2004 08:01:13 -0000	1.5
***************
*** 20,23 ****
--- 20,24 ----
  #include "temp_vfs.h"
  #include "ftp_vfs.h"
+ #include "virt_vfs.h"
  
  #include <qdir.h>
***************
*** 62,65 ****
--- 63,67 ----
  		  case (vfs::FTP   ) : newVfs = new ftp_vfs(parent)   ; break;
  //		  case (vfs::TEMP  ) : newVfs = new temp_vfs(parent)  ; break;
+ 		  case (vfs::VIRT  ) : newVfs = new virt_vfs(parent)  ; break;
        case (vfs::ERROR ) : newVfs = 0                     ; break;
  		}

Index: virt_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/virt_vfs.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** virt_vfs.cpp	10 Dec 2003 20:37:46 -0000	1.1
--- virt_vfs.cpp	11 Oct 2004 08:01:13 -0000	1.2
***************
*** 17,23 ****
--- 17,92 ----
  
  #include "virt_vfs.h"
+ #include <kfileitem.h>
+ #include <kurl.h>
  
  virt_vfs::virt_vfs(QObject* panel, bool quiet): vfs(panel,quiet){
+ 	// set the writable attribute
+ 	isWritable = false;
+ 
+ 	setVfsFilesP(&vfs_files);
+ 	vfs_files.setAutoDelete(true);
+ 	vfs_files_copy.setAutoDelete(true);
+ 
+ 	vfs_type = VIRT;
  }
+ 
  virt_vfs::~virt_vfs(){
  }
+ 
+ bool virt_vfs::populateVfsList(const KURL& origin, bool showHidden){
+ 	vfs_origin = origin;
+ 	
+ 	QDictIterator<vfile> it(vfs_files_copy); // See QDictIterator
+ 	for( ; it.current(); ++it )
+ 		addToList( it.current() );
+ 	
+ 	return true; 
+ }
+ 
+ void virt_vfs::vfs_addFiles(KURL::List *fileUrls,KIO::CopyJob::CopyMode mode,QObject* toNotify,QString dir){
+ 
+ 	for(KURL::List::Iterator url = fileUrls->begin(); url != fileUrls->end(); ++url){
+ 		KFileItem kfi(KFileItem::Unknown,KFileItem::Unknown,*url);
+ 		
+ 		vfile* temp = new vfile((*url).prettyURL(),kfi.size(),kfi.permissionsString(),kfi.time(KIO::UDS_MODIFICATION_TIME),
+           true,kfi.user(),kfi.group(),QString::null,kfi.mimetype(),(*url).prettyURL(),kfi.mode());
+ 		vfs_files_copy.insert((*url).prettyURL(),temp);
+ 	}
+ 	vfs_refresh();
+ }
+ 
+ void virt_vfs::vfs_delFiles(QStringList *fileNames){
+ 
+ }
+ 
+ KURL::List* virt_vfs::vfs_getFiles(QStringList* names){
+ 	KURL url;
+ 	KURL::List* urls = new KURL::List();
+ 	for(QStringList::Iterator name = names->begin(); name != names->end(); ++name){
+ 		url = vfs_getFile(*name);
+ 		urls->append(url);
+ 	}
+ 	return urls;
+ }
+ 
+ KURL virt_vfs::vfs_getFile(const QString& name){
+ 	vfile* vf=vfs_search(name);
+ 	if( !vf ) return KURL(); // empty 
+  
+ 	KURL url = vf->vfile_getUrl();
+ 	if( vf->vfile_isDir() ) url.adjustPath(+1);
+ 	return url;
+ }
+ 
+ void virt_vfs::vfs_mkdir(const QString& name){
+ 
+ }
+ 
+ void virt_vfs::vfs_rename(const QString& fileName,const QString& newName){
+ 
+ }
+ 
+ /// to be implemented
+ void virt_vfs::vfs_calcSpace(QString name ,KIO::filesize_t *totalSize,unsigned long *totalFiles,unsigned long *totalDirs, bool * stop){
+ 
+ }
\ No newline at end of file

[Krusader-commits] krusader_kde3/krusader/UserAction kraction.cpp,1.7,1.8

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

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

Modified Files:
	kraction.cpp 
Log Message:
added availability-check for mime-types (ie "text" or "text/plain") and filenames (ie *.mp3)

Index: kraction.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/kraction.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** kraction.cpp	7 Oct 2004 13:53:38 -0000	1.7
--- kraction.cpp	10 Oct 2004 23:34:19 -0000	1.8
***************
*** 26,29 ****
--- 26,33 ----
  #include "../krusader.h"
  
+ //for the availabilitycheck:
+ #include <kmimetype.h>
+ #include <qregexp.h>
+ 
  
  //////////////////////////////////////////////////////////////////////////////////////////////////////
***************
*** 259,266 ****
     } //check the Path-list: done
     
!    //TODO: check mime-type
     
-    //TODO: check filename
-       
     return available;
  }
--- 263,298 ----
     } //check the Path-list: done
     
!    //check mime-type
!    if ( ! _properties->showonlyMime()->empty() ) {
!       available = false;
!       KMimeType::Ptr mime = KMimeType::findByURL( currentURL );
!       for ( QStringList::Iterator it = _properties->showonlyMime()->begin(); it != _properties->showonlyMime()->end(); ++it ) {
!          if ( (*it).contains("/") ) {
!             if ( mime->is( *it ) ) {  // don't use ==; use 'is()' instead, which is aware of inheritence (ie: text/x-makefile is also text/plain)
!                available = true;
!                break;
!             }
!          }
!          else {
!             if ( mime->name().find( *it ) == 0 ) {  // 0 is the beginning, -1 is not found
!                available = true;
!                break;
!             }
!          }
!       } //for
!    } //check the mime-type: done
!    
!    //check filename
!    if ( ! _properties->showonlyFile()->empty() ) {
!       available = false;
!       for ( QStringList::Iterator it = _properties->showonlyFile()->begin(); it != _properties->showonlyFile()->end(); ++it ) {
!          QRegExp regex = QRegExp( *it, false, true ); // case-sensitive = false; wildcards = true
!          if ( regex.exactMatch( currentURL.fileName() ) ) {
!             available = true;
!             break;
!          }
!       }
!    } //check the filename: done
     
     return available;
  }

[Krusader-commits] krusader_kde3/krusader/GUI actionproperty.cpp,1.3,1.4

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

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

Modified Files:
	actionproperty.cpp 
Log Message:
added availability-check for mime-types (ie "text" or "text/plain") and filenames (ie *.mp3)

Index: actionproperty.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/actionproperty.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** actionproperty.cpp	7 Oct 2004 13:53:38 -0000	1.3
--- actionproperty.cpp	10 Oct 2004 23:34:19 -0000	1.4
***************
*** 275,280 ****
  
  void ActionProperty::addMime() { 
!   //TODO read from an textfile with each mime-type in a seperate line
!   KMessageBox::sorry( this, "sorry, not implemnted yet...\nTODO: Popup-menu with 'text', 'image', 'video', etc...\nand submenus with 'text/*', 'text/plain', 'text/html', etc... " );
  }
  
--- 275,288 ----
  
  void ActionProperty::addMime() { 
!   bool ok;
!   QString text = KInputDialog::getText(
! 		i18n( "New mime-type" ),
! 		i18n( "Set a mime-type:" ),
! 		lbShowonlyMime->currentText(),
! 		&ok, this );
!     if ( ok && !text.isEmpty() ) {
!       lbShowonlyMime->insertStringList( QStringList::split( ";", text ) );
!       changedShowonlyMime();
!     }
  }
  

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.98,1.99 listpanel.h,1.29,1.30

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

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

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

ADDED: importing konqueror's right click menus


Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** listpanel.h	7 Oct 2004 12:40:15 -0000	1.29
--- listpanel.h	10 Oct 2004 23:10:52 -0000	1.30
***************
*** 93,98 ****
     void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status
     void popRightClickMenu( const QPoint& );
     void select(QString mask, bool select);
! 	void select( bool, bool );      // see doc in ListPanel
     void invertSelection();       // see doc in ListPanel
     void compareDirs();
--- 93,99 ----
     void gotStats( const QString &mountPoint, unsigned long kBSize, unsigned long kBUsed, unsigned long kBAvail); // displays filesystem status
     void popRightClickMenu( const QPoint& );
+    void popEmptyRightClickMenu( QListViewItem *, const QPoint &, int );
     void select(QString mask, bool select);
!    void select( bool, bool );      // see doc in ListPanel
     void invertSelection();       // see doc in ListPanel
     void compareDirs();

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** listpanel.cpp	8 Oct 2004 18:23:09 -0000	1.98
--- listpanel.cpp	10 Oct 2004 23:10:52 -0000	1.99
***************
*** 65,68 ****
--- 65,70 ----
  #include <kurl.h> 
  #include <kmountpoint.h>
+ #include <konq_popupmenu.h>
+ #include <konqbookmarkmanager.h>
  // Krusader includes
  #include "../krusader.h"
***************
*** 220,223 ****
--- 222,226 ----
     connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( itemDescription( QString& ) ), krApp, SLOT( statusBarUpdate( QString& ) ) );
     connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( contextMenu( const QPoint & ) ), this, SLOT( popRightClickMenu( const QPoint & ) ) );
+    connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ), this, SLOT( popEmptyRightClickMenu( QListViewItem *, const QPoint &, int ) ) );
     connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( letsDrag( QStringList, QPixmap ) ), this, SLOT( startDragging( QStringList, QPixmap ) ) );
     connect( dynamic_cast<KrDetailedView*>( view ), SIGNAL( gotDrop( QDropEvent * ) ), this, SLOT( handleDropOnView( QDropEvent * ) ) );
***************
*** 729,751 ****
  #define OPEN_KONQ_ID  92
  #define OPEN_TERM_ID  93
! #define CHOOSE_ID     94
! #define DELETE_ID     95
! #define COPY_ID       96
! #define MOVE_ID       97
! #define RENAME_ID     98
! #define PROPERTIES_ID 99
! #define MOUNT_ID      100
! #define UNMOUNT_ID    101
! #define SHRED_ID      102
! #define NEW_LINK      103
! #define NEW_SYMLINK   104
! #define REDIRECT_LINK 105
! #define SEND_BY_EMAIL 106
! #define LINK_HANDLING 107
! #define EJECT_ID      108
! #define PREVIEW_ID    109
! #define COPY_CLIP_ID  110
! #define MOVE_CLIP_ID  111
! #define PASTE_CLIP_ID 112
  
     // those will sometimes appear
--- 732,755 ----
  #define OPEN_KONQ_ID  92
  #define OPEN_TERM_ID  93
! #define KONQ_MENU_ID  94
! #define CHOOSE_ID     95
! #define DELETE_ID     96
! #define COPY_ID       97
! #define MOVE_ID       98
! #define RENAME_ID     99
! #define PROPERTIES_ID 100
! #define MOUNT_ID      101
! #define UNMOUNT_ID    102
! #define SHRED_ID      103
! #define NEW_LINK      104
! #define NEW_SYMLINK   105
! #define REDIRECT_LINK 106
! #define SEND_BY_EMAIL 107
! #define LINK_HANDLING 108
! #define EJECT_ID      109
! #define PREVIEW_ID    110
! #define COPY_CLIP_ID  111
! #define MOVE_CLIP_ID  112
! #define PASTE_CLIP_ID 113
  
     // those will sometimes appear
***************
*** 815,818 ****
--- 819,838 ----
        popup.insertSeparator();
     }
+    
+    KFileItemList _items;
+    _items.setAutoDelete( true );
+    for ( KrViewItemList::Iterator it = items.begin(); it != items.end(); ++it ) 
+    {
+      vfile *file = func->files() ->vfs_search( ( *it )->name() );
+      KURL url = func->files() ->vfs_getFile( ( *it )->name() );
+      _items.append( new KFileItem( url,  file->vfile_getMime(), file->vfile_getMode() ) );
+    }   
+    KActionCollection actions(this);
+    KonqPopupMenu konqMenu( KonqBookmarkManager::self(), _items, func->files()->vfs_getOrigin(), actions, 0, this, 
+                            KonqPopupMenu::ShowProperties, KParts::BrowserExtension::DefaultPopupItems );
+    popup.insertItem( QPixmap(), &konqMenu, KONQ_MENU_ID );
+    popup.changeItem( KONQ_MENU_ID, i18n( "Konqueror menu" ) );
+    popup.insertSeparator();
+    
     // COPY
     popup.insertItem( i18n( "Copy" ), COPY_ID );
***************
*** 972,975 ****
--- 992,1012 ----
  }
  
+ void ListPanel::popEmptyRightClickMenu( QListViewItem *item, const QPoint &loc, int ) {
+    if( item == 0 )
+    {
+       KPopupMenu popup;
+    
+       popup.insertItem( i18n( "Paste from Clipboard" ), PASTE_CLIP_ID );
+    
+       int result = popup.exec( loc );
+       switch ( result ) 
+       {
+          case PASTE_CLIP_ID :
+          func->pasteFromClipboard();
+          break;
+       }
+    }
+ }
+ 
  void ListPanel::setFilter( KrView::FilterSpec f ) {
     switch ( f ) {

[Krusader-commits] krusader_kde3/iso isoservice.desktop,1.1,1.2

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

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

Modified Files:
	isoservice.desktop 
Log Message:

ADDED: importing konqueror's right click menus


Index: isoservice.desktop
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/iso/isoservice.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** isoservice.desktop	23 Aug 2004 22:10:28 -0000	1.1
--- isoservice.desktop	10 Oct 2004 23:10:52 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  [Desktop Entry]
+ Encoding=UTF-8
  Actions=OpenISO
  ServiceTypes=inode/blockdevice,application/x-iso
***************
*** 5,14 ****
  [Desktop Action OpenISO]
  Comment=ISO9660 View
! Comment[hu]=ISO9660 Nézet
  Comment[fr]=Lecteur ISO9660
- Exec=kfmclient exec iso:%f
- 
  Icon=cd
  Name=ISO9660 View
! Name[hu]=ISO9660 Nézet
  Name[fr]=Lecteur ISO9660
--- 6,14 ----
  [Desktop Action OpenISO]
  Comment=ISO9660 View
! Comment[hu]=ISO9660 Nézet
  Comment[fr]=Lecteur ISO9660
  Icon=cd
  Name=ISO9660 View
! Name[hu]=ISO9660 Nézet
  Name[fr]=Lecteur ISO9660
+ Exec=
\ No newline at end of file

[Krusader-commits] krusader_kde3 CVSNEWS,1.23,1.24 ChangeLog,1.322,1.323

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

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

Modified Files:
	CVSNEWS ChangeLog 
Log Message:

ADDED: importing konqueror's right click menus


Index: CVSNEWS
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/CVSNEWS,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** CVSNEWS	8 Oct 2004 18:23:07 -0000	1.23
--- CVSNEWS	10 Oct 2004 23:10:51 -0000	1.24
***************
*** 4,7 ****
--- 4,9 ----
  ------------------------------------------------------
  
+ From now konqueror's right click menu is imported to krusader
+ 
  Cut(CTRL+X), Copy(Ctrl+C), Paste(Ctrl+V)
    is available. Even works with konqueror. Please test it.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.322
retrieving revision 1.323
diff -C2 -d -r1.322 -r1.323
*** ChangeLog	9 Oct 2004 05:12:28 -0000	1.322
--- ChangeLog	10 Oct 2004 23:10:51 -0000	1.323
***************
*** 1,3 ****
--- 1,4 ----
  ======================
+     ADDED: importing the right click menu of konqueror
      ADDED: cut(CTRL+X), copy(CTRL+C), paste(CTRL+V)
      ADDED: useraction: new Placeholder %_Profile("panel-profile")%

[Krusader-commits] krusader_kde3/krusader/Panel Makefile.am,1.9,1.10 panelfunc.cpp,1.93,1.94 krdrag.cpp,1.1,NONE krdrag.h,1.1,NONE

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

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

Modified Files:
	Makefile.am panelfunc.cpp 
Removed Files:
	krdrag.cpp krdrag.h 
Log Message:

ARCHITECTURE: using the konqueror library (important for konqi menu import)


--- krdrag.cpp DELETED ---

--- krdrag.h DELETED ---

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** panelfunc.cpp	9 Oct 2004 19:39:51 -0000	1.93
--- panelfunc.cpp	10 Oct 2004 20:11:02 -0000	1.94
***************
*** 50,53 ****
--- 50,54 ----
  #include <kstandarddirs.h>
  #include <ktempdir.h>
+ #include <konq_drag.h>
  // Krusader Includes
  #include "panelfunc.h"
***************
*** 70,74 ****
  #include "../krservices.h"
  #include "../GUI/syncbrowsebutton.h"
- #include "krdrag.h"
  
  
--- 71,74 ----
***************
*** 966,970 ****
    if (fileUrls)
    {
!     KRDrag *urlData = KRDrag::newDrag( *fileUrls, move, krApp->mainView, "krusader");
      QApplication::clipboard()->setData( urlData );
      delete fileUrls;
--- 966,970 ----
    if (fileUrls)
    {
!     KonqDrag *urlData = KonqDrag::newDrag( *fileUrls, move, krApp->mainView, "krusader");
      QApplication::clipboard()->setData( urlData );
      delete fileUrls;
***************
*** 980,984 ****
     {
        QUriDrag::decodeToUnicodeUris(data, fileNames);
!       bool cutSelection = KRDrag::decodeIsCutSelection(data);
     
        KURL::List* fileUrls = new KURL::List();
--- 980,984 ----
     {
        QUriDrag::decodeToUnicodeUris(data, fileNames);
!       bool cutSelection = KonqDrag::decodeIsCutSelection(data);
     
        KURL::List* fileUrls = new KURL::List();

Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Makefile.am	8 Oct 2004 18:23:09 -0000	1.9
--- Makefile.am	10 Oct 2004 20:11:02 -0000	1.10
***************
*** 6,10 ****
  libPanel_a_METASOURCES = AUTO
  
! libPanel_a_SOURCES = krcolorcache.cpp krcalcspacedialog.cpp krpopupmenu.cpp krpreviewpopup.cpp krview.cpp krdetailedviewitem.cpp krdetailedview.cpp panelfunc.cpp listpanel.cpp panelpopup.cpp krdrag.cpp
  
  
--- 6,10 ----
  libPanel_a_METASOURCES = AUTO
  
! libPanel_a_SOURCES = krcolorcache.cpp krcalcspacedialog.cpp krpopupmenu.cpp krpreviewpopup.cpp krview.cpp krdetailedviewitem.cpp krdetailedview.cpp panelfunc.cpp listpanel.cpp panelpopup.cpp
  
  

[Krusader-commits] krusader_kde3/krusader Makefile.am,1.18,1.19

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

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

Modified Files:
	Makefile.am 
Log Message:

ARCHITECTURE: using the konqueror library (important for konqi menu import)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.am	23 Jul 2004 00:03:17 -0000	1.18
--- Makefile.am	10 Oct 2004 20:11:01 -0000	1.19
***************
*** 5,9 ****
  
  krusader_SOURCES = paneltabbar.cpp panelmanager.cpp krservices.cpp main.cpp krusaderview.cpp krusader.cpp krslots.cpp kicons.cpp 
! krusader_LDADD   = ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a ./UserMenu/libUserMenu.a ./Locate/libLocate.a UserAction/libUserAction.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
  
  SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS \
--- 5,9 ----
  
  krusader_SOURCES = paneltabbar.cpp panelmanager.cpp krservices.cpp main.cpp krusaderview.cpp krusader.cpp krslots.cpp kicons.cpp 
! krusader_LDADD   = ./BookMan/libBookMan.a ./Dialogs/libDialogs.a ./GUI/libGUI.a ./Konfigurator/libKonfigurator.a ./KViewer/libKViewer.a ./MountMan/libMountMan.a ./Panel/libPanel.a ./RemoteMan/libRemoteMan.a ./VFS/libVFS.a ./Search/libSearch.a ./Splitter/libSplitter.a ./Synchronizer/libSynchronizer.a ./UserMenu/libUserMenu.a ./Locate/libLocate.a UserAction/libUserAction.a VFS/libVFS.a KViewer/libKViewer.a Dialogs/libDialogs.a BookMan/libBookMan.a GUI/libGUI.a -lkonq $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KHTML) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
  
  SUBDIRS = BookMan Dialogs GUI Konfigurator KViewer MountMan Panel RemoteMan VFS \

[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.70,1.71 krslots.h,1.34,1.35 krusader.cpp,1.97,1.98 krusaderview.cpp,1.13,1.14 krusaderview.h,1.6,1.7

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

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

Modified Files:
	krslots.cpp krslots.h krusader.cpp krusaderview.cpp 
	krusaderview.h 
Log Message:

ARCHITECTURE: moving profiles to the view


Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** krslots.cpp	8 Oct 2004 18:23:08 -0000	1.70
--- krslots.cpp	10 Oct 2004 19:59:15 -0000	1.71
***************
*** 76,80 ****
  #include "Synchronizer/synchronizergui.h"
  #include "krservices.h"
- #include "GUI/profilemanager.h"
  
  #define REFRESH_BOTH_PANELS { ListPanel *p=ACTIVE_PANEL;        \
--- 76,79 ----
***************
*** 787,829 ****
  }
  
- void KRslots::profiles( QString profileName )
- {
-   ProfileManager profileManager( "Panel" );
-   profileManager.hide();
-   connect( &profileManager, SIGNAL( saveToProfile( QString ) ), this, SLOT( savePanelProfiles( QString ) ) );
-   connect( &profileManager, SIGNAL( loadFromProfile( QString ) ), this, SLOT( loadPanelProfiles( QString ) ) );
-   if( profileName.isEmpty() )
-     profileManager.profilePopup();
-   else
-     profileManager.loadByName( profileName );
- }
- 
- void KRslots::loadPanelProfiles( QString group )
- {
-   krConfig->setGroup( group );
-   MAIN_VIEW->leftMng->loadSettings( krConfig, "Left Tabs" );
-   krConfig->setGroup( group );
-   MAIN_VIEW->leftMng->setCurrentTab( krConfig->readNumEntry( "Left Active Tab", 0 ) );
-   krConfig->setGroup( group );
-   MAIN_VIEW->rightMng->loadSettings( krConfig, "Right Tabs" );
-   krConfig->setGroup( group );
-   MAIN_VIEW->rightMng->setCurrentTab( krConfig->readNumEntry( "Right Active Tab", 0 ) );
-   krConfig->setGroup( group );  
-   if( krConfig->readBoolEntry( "Left Side Is Active", true ) )
-     MAIN_VIEW->left->slotFocusOnMe();
-   else
-     MAIN_VIEW->right->slotFocusOnMe();
- }
- 
- void KRslots::savePanelProfiles( QString group )
- {
-   krConfig->setGroup( group );
-   
-   MAIN_VIEW->leftMng->saveSettings( krConfig, "Left Tabs" );
-   krConfig->writeEntry( "Left Active Tab", MAIN_VIEW->leftMng->activeTab() );
-   MAIN_VIEW->rightMng->saveSettings( krConfig, "Right Tabs" );
-   krConfig->writeEntry( "Right Active Tab", MAIN_VIEW->rightMng->activeTab() );
-   krConfig->writeEntry( "Left Side Is Active", MAIN_VIEW->activePanel->isLeft() );
- }
- 
  #include "krslots.moc"
--- 786,788 ----

Index: krusaderview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderview.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krusaderview.h	20 Sep 2003 11:25:22 -0000	1.6
--- krusaderview.h	10 Oct 2004 19:59:15 -0000	1.7
***************
*** 72,75 ****
--- 72,79 ----
    // Tab - switch focus
    void panelSwitch();
+   
+   void profiles( QString profileName = QString::null );  
+   void loadPanelProfiles( QString group );
+   void savePanelProfiles( QString group );
  
  protected slots:

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** krusader.cpp	8 Oct 2004 18:23:08 -0000	1.97
--- krusader.cpp	10 Oct 2004 19:59:15 -0000	1.98
***************
*** 209,215 ****
     mountMan = new KMountMan();
  
! 	// create bookman
! 	bookman = new KrBookmarkHandler();
  
     // setup all the krusader's actions
     setupActions();
--- 209,218 ----
     mountMan = new KMountMan();
  
!    // create bookman
!    bookman = new KrBookmarkHandler();
  
+    // create the main view
+    mainView = new KrusaderView( this );
+    
     // setup all the krusader's actions
     setupActions();
***************
*** 221,226 ****
     KgProtocols::init();
  
!    // create the main view and set it
!    mainView = new KrusaderView( this );
     mainView->start( leftPath, rightPath );
  
--- 224,228 ----
     KgProtocols::init();
  
!    // starting the panels
     mainView->start( leftPath, rightPath );
  
***************
*** 460,464 ****
                                     SLOTS, SLOT( newFTPconnection() ), actionCollection(), "ftp new connection" );
     actProfiles = new KAction( i18n( "Pro&files" ), "kr_profile", ALT + Key_L,
!                                    SLOTS, SLOT( profiles() ), actionCollection(), "profile" );
     actCalculate = new KAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0,
                                 SLOTS, SLOT( calcSpace() ), actionCollection(), "calculate" );
--- 462,466 ----
                                     SLOTS, SLOT( newFTPconnection() ), actionCollection(), "ftp new connection" );
     actProfiles = new KAction( i18n( "Pro&files" ), "kr_profile", ALT + Key_L,
!                                    MAIN_VIEW, SLOT( profiles() ), actionCollection(), "profile" );
     actCalculate = new KAction( i18n( "Calculate &Occupied Space" ), "kcalc", 0,
                                 SLOTS, SLOT( calcSpace() ), actionCollection(), "calculate" );

Index: krslots.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** krslots.h	8 Oct 2004 18:23:08 -0000	1.34
--- krslots.h	10 Oct 2004 19:59:15 -0000	1.35
***************
*** 106,110 ****
      void runMountMan();
      void runRemoteMan();
-     void profiles( QString profileName = QString::null );
      void toggleFnkeys();
      void toggleCmdline();
--- 106,109 ----
***************
*** 158,164 ****
      void slotCurrentChanged( QString p ) { MAIN_VIEW->slotCurrentChanged( p ); }
      void slotSetActivePanel( ListPanel *p ) { MAIN_VIEW->slotSetActivePanel( p ); }
-     
-     void loadPanelProfiles( QString group );
-     void savePanelProfiles( QString group );
  };
  
--- 157,160 ----

Index: krusaderview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusaderview.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** krusaderview.cpp	12 Jul 2004 13:59:25 -0000	1.13
--- krusaderview.cpp	10 Oct 2004 19:59:15 -0000	1.14
***************
*** 43,46 ****
--- 43,47 ----
  #include "panelmanager.h"
  #include <klibloader.h> //<>
+ #include "GUI/profilemanager.h"
  
  KrusaderView::KrusaderView( QWidget *parent, const char *name ) : QWidget( parent, name ), activePanel(0), 
***************
*** 153,155 ****
--- 154,197 ----
  }
  
+ 
+ void KrusaderView::profiles( QString profileName )
+ {
+   ProfileManager profileManager( "Panel" );
+   profileManager.hide();
+   connect( &profileManager, SIGNAL( saveToProfile( QString ) ), this, SLOT( savePanelProfiles( QString ) ) );
+   connect( &profileManager, SIGNAL( loadFromProfile( QString ) ), this, SLOT( loadPanelProfiles( QString ) ) );
+   if( profileName.isEmpty() )
+     profileManager.profilePopup();
+   else
+     profileManager.loadByName( profileName );
+ }
+ 
+ void KrusaderView::loadPanelProfiles( QString group )
+ {
+   krConfig->setGroup( group );
+   MAIN_VIEW->leftMng->loadSettings( krConfig, "Left Tabs" );
+   krConfig->setGroup( group );
+   MAIN_VIEW->leftMng->setCurrentTab( krConfig->readNumEntry( "Left Active Tab", 0 ) );
+   krConfig->setGroup( group );
+   MAIN_VIEW->rightMng->loadSettings( krConfig, "Right Tabs" );
+   krConfig->setGroup( group );
+   MAIN_VIEW->rightMng->setCurrentTab( krConfig->readNumEntry( "Right Active Tab", 0 ) );
+   krConfig->setGroup( group );  
+   if( krConfig->readBoolEntry( "Left Side Is Active", true ) )
+     MAIN_VIEW->left->slotFocusOnMe();
+   else
+     MAIN_VIEW->right->slotFocusOnMe();
+ }
+ 
+ void KrusaderView::savePanelProfiles( QString group )
+ {
+   krConfig->setGroup( group );
+   
+   MAIN_VIEW->leftMng->saveSettings( krConfig, "Left Tabs" );
+   krConfig->writeEntry( "Left Active Tab", MAIN_VIEW->leftMng->activeTab() );
+   MAIN_VIEW->rightMng->saveSettings( krConfig, "Right Tabs" );
+   krConfig->writeEntry( "Right Active Tab", MAIN_VIEW->rightMng->activeTab() );
+   krConfig->writeEntry( "Left Side Is Active", MAIN_VIEW->activePanel->isLeft() );
+ }
+ 
  #include "krusaderview.moc"

[Krusader-commits] krusader_kde3/krusader/UserAction expander.cpp,1.14,1.15

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

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

Modified Files:
	expander.cpp 
Log Message:

ARCHITECTURE: moving profiles to the view


Index: expander.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserAction/expander.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** expander.cpp	8 Oct 2004 16:06:13 -0000	1.14
--- expander.cpp	10 Oct 2004 19:59:16 -0000	1.15
***************
*** 21,25 ****
  #include "../Search/krsearchdialog.h"
  #include "../GUI/profilemanager.h"
- #include "../krslots.h"
  
  #include <kdebug.h>
--- 21,24 ----
***************
*** 394,398 ****
     }
     
!    SLOTS->profiles( parameter[0] );
  
     return QString::null;  // this doesn't return everything, that's normal!
--- 393,397 ----
     }
     
!    MAIN_VIEW->profiles( parameter[0] );
  
     return QString::null;  // this doesn't return everything, that's normal!

[Krusader-commits] krusader_kde3/krusader/VFS ftp_vfs.cpp,1.36,1.37

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

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

Modified Files:
	ftp_vfs.cpp 
Log Message:
fixed: missing #include


Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ftp_vfs.cpp	19 Sep 2004 11:47:44 -0000	1.36
--- ftp_vfs.cpp	10 Oct 2004 15:50:15 -0000	1.37
***************
*** 32,37 ****
  #include <time.h>
  #include <sys/param.h>
- #ifdef BSD
  #include <unistd.h>
  #include <sys/types.h>
  #endif
--- 32,37 ----
  #include <time.h>
  #include <sys/param.h>
  #include <unistd.h>
+ #ifdef BSD
  #include <sys/types.h>
  #endif

[Krusader-commits] krusader_kde3/krusader/Panel panelpopup.cpp,1.13,1.14

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

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

Modified Files:
	panelpopup.cpp 
Log Message:
added missing i18n()

Index: panelpopup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelpopup.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** panelpopup.cpp	8 Oct 2004 16:20:08 -0000	1.13
--- panelpopup.cpp	10 Oct 2004 13:45:16 -0000	1.14
***************
*** 171,181 ****
  	switch (id) {
  		case Tree:
! 			dataLine->setText("Tree:");
  			break;
  		case Preview:
! 			dataLine->setText("Preview:");
  			break;
  		case QuickPanel:
! 			dataLine->setText("Quick Select:");
  			break;
  	}
--- 171,181 ----
  	switch (id) {
  		case Tree:
! 			dataLine->setText( i18n("Tree:") );
  			break;
  		case Preview:
! 			dataLine->setText( i18n("Preview:") );
  			break;
  		case QuickPanel:
! 			dataLine->setText( i18n("Quick Select:") );
  			break;
  	}

[Krusader-commits] krusader_kde3/po de.po,1.23,1.24 krusader.pot,1.22,1.23

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

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

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

Index: krusader.pot
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/krusader.pot,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** krusader.pot	29 Sep 2004 13:22:33 -0000	1.22
--- krusader.pot	9 Oct 2004 19:58:17 -0000	1.23
***************
*** 11,15 ****
  "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-09-29 15:12+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--- 11,15 ----
  "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-10-09 21:55+0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
[...3832 lines suppressed...]
  
! #: krslots.cpp:624
  msgid "Don't know which files to combine."
  msgstr ""
  
! #: krslots.cpp:636
  msgid "You can't combine a directory!"
  msgstr ""
  
! #: krslots.cpp:652 krslots.cpp:715
  msgid "Not a splitted file %1!"
  msgstr ""
  
! #: krslots.cpp:668
  msgid "Select only one splitted file!"
  msgstr ""
  
! #: krslots.cpp:722
  msgid "Combining %1.* to directory:"
  msgstr ""

Index: de.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/de.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** de.po	29 Sep 2004 13:22:33 -0000	1.23
--- de.po	9 Oct 2004 19:58:16 -0000	1.24
***************
*** 11,16 ****
  "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-09-29 15:12+0200\n"
! "PO-Revision-Date: 2004-09-29 15:17+0200\n"
  "Last-Translator: Dirk Eschler <des...@us...>\n"
  "Language-Team: German\n"
--- 11,16 ----
  "Project-Id-Version: krusader-1.50-cvs\n"
  "Report-Msgid-Bugs-To: \n"
! "POT-Creation-Date: 2004-10-09 21:55+0200\n"
[...4049 lines suppressed...]
***************
*** 4267,4271 ****
  
  #: 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 "
--- 4375,4380 ----
  
  #: 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 "
***************
*** 4308,4310 ****
  msgid "Error at reading file %1!"
  msgstr "Fehler beim Lesen der Datei %1!"
- 
--- 4417,4418 ----

[Krusader-commits] krusader_kde3/krusader/BookMan krbookmark.h,1.5,1.6 krbookmarkhandler.cpp,1.13,1.14 krbookmarkhandler.h,1.10,1.11

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

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

Modified Files:
	krbookmark.h krbookmarkhandler.cpp krbookmarkhandler.h 
Log Message:
middle click button now opens bookmarks in a new tab


Index: krbookmarkhandler.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** krbookmarkhandler.cpp	8 Oct 2004 16:57:04 -0000	1.13
--- krbookmarkhandler.cpp	9 Oct 2004 19:42:22 -0000	1.14
***************
*** 17,25 ****
  // ------------------------ for internal use
  #define BOOKMARKS_FILE	"krusader/krbookmarks.xml"
! #define CONNECT_BM(X)	connect(X, SIGNAL(activated(const KURL&)), SLOTS, SLOT(refresh(const KURL&)));
  											
! KrBookmarkHandler::KrBookmarkHandler(): QObject(0) {
  	// create our own action collection and make the shortcuts apply only to parent
- 	//_collection = new KActionCollection(0, this, "bookmark collection");
  	_collection = krApp->actionCollection();
  
--- 17,24 ----
  // ------------------------ for internal use
  #define BOOKMARKS_FILE	"krusader/krbookmarks.xml"
! #define CONNECT_BM(X)	{ disconnect(X, SIGNAL(activated(const KURL&)), 0, 0); connect(X, SIGNAL(activated(const KURL&)), this, SLOT(slotActivated(const KURL&))); }
  											
! KrBookmarkHandler::KrBookmarkHandler(): QObject(0), _middleClick(false) {
  	// create our own action collection and make the shortcuts apply only to parent
  	_collection = krApp->actionCollection();
  
***************
*** 266,269 ****
--- 265,270 ----
  		connect(menu, SIGNAL(activated(int)), this, SLOT(menuOperation(int)));
  	}
+ 
+ 	menu->installEventFilter(this);
  }
  
***************
*** 284,285 ****
--- 285,315 ----
  	importFromFile();
  }
+ 
+ bool KrBookmarkHandler::eventFilter( QObject *obj, QEvent *ev ) {
+ 	if (ev->type() == QEvent::MouseButtonRelease) {
+ 		switch (static_cast<QMouseEvent*>(ev)->button()) {
+ 			case LeftButton:
+ 			case RightButton:
+ 				_middleClick = false;
+ 				break;
+ 			case MidButton:
+ 				_middleClick = true;
+ 				break;
+ 			default:
+ 				break;
+ 		}
+ 	}
+ 	return QObject::eventFilter(obj, ev);
+ }
+ 
+ // used to monitor middle clicks. if mid is found, then the
+ // bookmark is opened in a new tab. ugly, but easier than overloading
+ // KAction and KActionCollection.
+ void KrBookmarkHandler::slotActivated(const KURL& url) {
+ 	kdWarning() << "onec" << endl;
+ 	if (_middleClick)
+ 		SLOTS->newTab();
+ 	
+ 	SLOTS->refresh(url);
+ }
+ 

Index: krbookmark.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmark.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krbookmark.h	5 Oct 2004 15:07:32 -0000	1.5
--- krbookmark.h	9 Oct 2004 19:42:22 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
  	void activatedProxy();
  	
+ 	
  private:
  	KURL _url;

Index: krbookmarkhandler.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkhandler.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krbookmarkhandler.h	6 Oct 2004 14:42:26 -0000	1.10
--- krbookmarkhandler.h	9 Oct 2004 19:42:22 -0000	1.11
***************
*** 33,40 ****
--- 33,43 ----
  	void clearBookmarks(KrBookmark *root);
  	void buildMenu(KrBookmark *parent, KPopupMenu *menu);
+ 
+ 	bool eventFilter( QObject *obj, QEvent *ev );
  	
  protected slots:
  	void menuOperation(int id);
  	void bookmarksChanged(const QString&, const QString&);
+ 	void slotActivated(const KURL& url);
  
  private:
***************
*** 43,46 ****
--- 46,50 ----
  	// the whole KBookmarkManager is an ugly hack. use it until we have our own
  	KBookmarkManager *manager;
+ 	bool _middleClick; // if true, the user clicked the middle button to open the bookmark
  };
  

[Krusader-commits] krusader_kde3/krusader/Panel panelfunc.cpp,1.92,1.93

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

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

Modified Files:
	panelfunc.cpp 
Log Message:
redundent #define 

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** panelfunc.cpp	8 Oct 2004 18:23:09 -0000	1.92
--- panelfunc.cpp	9 Oct 2004 19:39:51 -0000	1.93
***************
*** 72,77 ****
  #include "krdrag.h"
  
- #define OTHER_FUNC      (panel->otherPanel->func)
- 
  
  //////////////////////////////////////////////////////////
--- 72,75 ----

[Krusader-commits] krusader_kde3/krusader/BookMan krbookmarkbutton.cpp,1.6,1.7

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

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

Modified Files:
	krbookmarkbutton.cpp 
Log Message:
 

Index: krbookmarkbutton.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/krbookmarkbutton.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** krbookmarkbutton.cpp	7 Oct 2004 12:40:14 -0000	1.6
--- krbookmarkbutton.cpp	9 Oct 2004 19:15:48 -0000	1.7
***************
*** 33,38 ****
  	populate();
  	popup()->exec(mapToGlobal(QPoint(0, height())));
-   kdWarning() << "here" << endl;
-   //emit pressed();
-  
  }
--- 33,35 ----

[Krusader-commits] krusader_kde3/krusader/BookMan kraddbookmarkdlg.cpp,1.4,1.5

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

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

Modified Files:
	kraddbookmarkdlg.cpp 
Log Message:
fix: default name for the bookmark is the url itself 

Index: kraddbookmarkdlg.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/BookMan/kraddbookmarkdlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** kraddbookmarkdlg.cpp	6 Oct 2004 14:42:26 -0000	1.4
--- kraddbookmarkdlg.cpp	9 Oct 2004 18:18:21 -0000	1.5
***************
*** 26,29 ****
--- 26,31 ----
  	QLabel *lb1 = new QLabel(i18n("Name:"), page);
  	_name = new KLineEdit(page);
+ 	_name->setText(url.url()); // default name is the url
+ 	_name->selectAll(); // make the text selected
  	layout->addWidget(lb1, 0, 0);	
  	layout->addWidget(_name, 0, 1);

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.cpp,1.32,1.33

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

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

Modified Files:
	krdetailedviewitem.cpp 
Log Message:

FIXED: locale aware ABC sorting


Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** krdetailedviewitem.cpp	7 Oct 2004 13:23:07 -0000	1.32
--- krdetailedviewitem.cpp	9 Oct 2004 05:12:28 -0000	1.33
***************
*** 336,340 ****
  
    if (col == nameColumn ) {
!       return QString::compare(text0,itext0);
    } else if (col == sizeColumn ) {
        return QString::compare(num2qstring(size()),num2qstring(other->size()));
--- 336,340 ----
  
    if (col == nameColumn ) {
!       return QString::localeAwareCompare(text0,itext0);
    } else if (col == sizeColumn ) {
        return QString::compare(num2qstring(size()),num2qstring(other->size()));
***************
*** 344,348 ****
        QString e1 = (caseSensitiveSort ? text(col) : text(col).lower());
        QString e2 = (caseSensitiveSort ? i->text(col) : i->text(col).lower());
!       return QString::compare(e1, e2);
    }
  }
--- 344,348 ----
        QString e1 = (caseSensitiveSort ? text(col) : text(col).lower());
        QString e2 = (caseSensitiveSort ? i->text(col) : i->text(col).lower());
!       return QString::localeAwareCompare(e1, e2);
    }
  }