krusader-commits

[Krusader-commits] krusader_kde3 ChangeLog,1.161,1.162

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

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv32700

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.161
retrieving revision 1.162
diff -C2 -d -r1.161 -r1.162
*** ChangeLog	8 Jan 2004 18:20:08 -0000	1.161
--- ChangeLog	9 Jan 2004 14:12:23 -0000	1.162
***************
*** 21,24 ****
--- 21,25 ----
      FIXED: ftp port limit changed from 999 to 65535
  
+     UPDATED: Japanese translation
      UPDATED: Dutch translation
      UPDATED: Czech translation (thanks to Martin Sixta)

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.52,1.53

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

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv29074/krusader_kde3/krusader

Modified Files:
	krusader.cpp 
Log Message:

FIXED: freeze at modal dialogs and icon tray


Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** krusader.cpp	3 Jan 2004 16:21:58 -0000	1.52
--- krusader.cpp	8 Jan 2004 18:20:08 -0000	1.53
***************
*** 263,275 ****
  void Krusader::showEvent ( QShowEvent *e ) {
    if (showTrayIcon)
      show(); // needed to make sure krusader is removed from
              // the taskbar when minimizing (system tray issue)
    else KParts::MainWindow::showEvent(e);
  }
  
  void Krusader::hideEvent ( QHideEvent *e ) {
!   if (showTrayIcon)
      hide(); // needed to make sure krusader is removed from
              // the taskbar when minimizing (system tray issue)
    else KParts::MainWindow::hideEvent(e);
  }
--- 263,287 ----
  void Krusader::showEvent ( QShowEvent *e ) {
    if (showTrayIcon)
+   {
+     sysTray->hide();
      show(); // needed to make sure krusader is removed from
              // the taskbar when minimizing (system tray issue)
+   }
    else KParts::MainWindow::showEvent(e);
  }
  
  void Krusader::hideEvent ( QHideEvent *e ) {
!   bool isModalTopWidget = false;
! 
!   QWidget *actWnd = qApp->activeWindow();
!   if( actWnd )
!     isModalTopWidget = actWnd->isModal();
!   
!   if (showTrayIcon && !isModalTopWidget && isMinimized() )
!   {
!     sysTray->show();
      hide(); // needed to make sure krusader is removed from
              // the taskbar when minimizing (system tray issue)
+   }
    else KParts::MainWindow::hideEvent(e);
  }

[Krusader-commits] krusader_kde3 ChangeLog,1.160,1.161

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

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv29074/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: freeze at modal dialogs and icon tray


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -C2 -d -r1.160 -r1.161
*** ChangeLog	4 Jan 2004 23:38:03 -0000	1.160
--- ChangeLog	8 Jan 2004 18:20:08 -0000	1.161
***************
*** 4,7 ****
--- 4,8 ----
      ADDED: directory synchronizer
      ADDED: file splitter
+     FIXED: freeze at modal dialogs and icon tray
      FIXED: crash at rename if the directory is refreshed by the watcher
      FIXED: stepping to the file below after delete (heiner)

[Krusader-commits] krusader_kde3/krusader/VFS vfile.cpp,1.7,1.8 vfile.h,1.8,1.9

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

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv1955/krusader_kde3/krusader/VFS

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

FIXED: crash at fish protocol (free memory read)


Index: vfile.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vfile.cpp	19 Sep 2003 22:35:32 -0000	1.7
--- vfile.cpp	7 Jan 2004 20:04:15 -0000	1.8
***************
*** 164,165 ****
--- 164,167 ----
  	return entry;
  }
+ 
+ #include "vfile.moc"
\ No newline at end of file

Index: vfile.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vfile.h	9 Dec 2003 23:05:58 -0000	1.8
--- vfile.h	7 Jan 2004 20:04:15 -0000	1.9
***************
*** 32,35 ****
--- 32,36 ----
  // QT includes
  #include <qstring.h>
+ #include <qobject.h>
  // System includes
  #include <sys/types.h>
***************
*** 43,47 ****
   *  allow the object to give out the needed details about the file.
   */
! class vfile{
  public:
    /**
--- 44,50 ----
   *  allow the object to give out the needed details about the file.
   */
! class vfile : public QObject{
!   Q_OBJECT
!   
  public:
    /**
***************
*** 96,101 ****
  	inline void             vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
  
!   virtual ~vfile(){}
  
  protected:
    // the file information list
--- 99,107 ----
  	inline void             vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
  
!   virtual ~vfile(){emit vfile_destructed();}
  
+ signals:
+   void             vfile_destructed();  /* signal of the destruction */
+     
  protected:
    // the file information list

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.cpp,1.16,1.17 krdetailedviewitem.h,1.9,1.10

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv1955/krusader_kde3/krusader/Panel

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

FIXED: crash at fish protocol (free memory read)


Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** krdetailedviewitem.cpp	19 Sep 2003 22:35:32 -0000	1.16
--- krdetailedviewitem.cpp	7 Jan 2004 20:04:15 -0000	1.17
***************
*** 48,51 ****
--- 48,59 ----
    QObject(parent), KListViewItem(parent, after), KrViewItem(),_vf(vf), _view(parent) {
    repaintItem();
+   if( _vf ) {
+     connect( _vf, SIGNAL( vfile_destructed() ), this, SLOT( remove() ) );
+   }
+ }
+ 
+ void KrDetailedViewItem::remove(){  
+   _vf = 0;
+   _view->takeItem( this );
  }
  

Index: krdetailedviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** krdetailedviewitem.h	19 Sep 2003 22:35:32 -0000	1.9
--- krdetailedviewitem.h	7 Jan 2004 20:04:15 -0000	1.10
***************
*** 72,75 ****
--- 72,78 ----
    void renameCancelled(KrDetailedViewItem *);
  
+ public slots:
+   void remove();
+ 
  protected:
    // text() was made protected in order to catch every place where text(x) is used

[Krusader-commits] krusader_kde3/doc/en commands.sgml,1.5,1.6 index.docbook,1.6,1.7 introduction.sgml,1.6,1.7 krusader-tools.sgml,1.5,1.6 using-krusader.sgml,1.6,1.7

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

Update of /cvsroot/krusader/krusader_kde3/doc/en
In directory sc8-pr-cvs1:/tmp/cvs-serv24643/doc/en

Modified Files:
	commands.sgml index.docbook introduction.sgml 
	krusader-tools.sgml using-krusader.sgml 
Log Message:


Index: commands.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/commands.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** commands.sgml	25 Dec 2003 20:50:18 -0000	1.5
--- commands.sgml	7 Jan 2004 14:42:57 -0000	1.6
***************
*** 383,389 ****
  	</menuchoice></term>
  	<listitem><para>
! 	TODO User menu.
! 	</para>
  	&newfeaturenote;
  	</listitem>
    </varlistentry>
--- 383,394 ----
  	</menuchoice></term>
  	<listitem><para>
!         NOTE: this discription is not yet completed.
  	&newfeaturenote;
+ 	</para>
+ 	<para>
+ 	A very basic user menu is available but still under construction,
+         u can't use the "show only in..." option, and can't use
+         the "accept urls" option yet, but other stuff is working.
+ 	Ideas and feedback are always welcome !</para>
  	</listitem>
    </varlistentry>

Index: index.docbook
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/index.docbook,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.docbook	30 Dec 2003 20:18:08 -0000	1.6
--- index.docbook	7 Jan 2004 14:42:57 -0000	1.7
***************
*** 159,164 ****
  	</copyright>
  	<legalnotice>&FDLNotice;</legalnotice>
! 	<date>30/12/2003</date>
! 	<releaseinfo>1.00.05 a</releaseinfo>
  
     <abstract>
--- 159,164 ----
  	</copyright>
  	<legalnotice>&FDLNotice;</legalnotice>
! 	<date>06/01/2004</date>
! 	<releaseinfo>1.00.05 b</releaseinfo>
  
     <abstract>

Index: introduction.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/introduction.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** introduction.sgml	30 Dec 2003 20:18:08 -0000	1.6
--- introduction.sgml	7 Jan 2004 14:42:57 -0000	1.7
***************
*** 113,116 ****
--- 113,119 ----
  	    <para>&syncdirs_lnk;.</para>
  	</listitem>
+         <listitem>
+ 	    <para>&usermenu_lnk;.</para>
+ 	</listitem>
  	</itemizedlist>
  	</para>

Index: krusader-tools.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/krusader-tools.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** krusader-tools.sgml	25 Dec 2003 20:50:19 -0000	1.5
--- krusader-tools.sgml	7 Jan 2004 14:42:57 -0000	1.6
***************
*** 378,380 ****
--- 378,644 ----
  
  </sect1>
+ 
+ <sect1 id="synchronize_dirs">
+ <title>KruSyncDir: Synchronize Directories</title>
+ 
+     &newfeaturenote;
+ 
+     <para>This function compares the left and the right panel and shows the difference between them.
+     After selecting some options and the compare function you can synchronize the files and directories.
+     Chose <emphasis role="bold"><menuchoice><guimenu>Commands</guimenu>
+     <guimenuitem>Synchronize Directories</guimenuitem></menuchoice></emphasis>
+     or
+     <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo> to start this feature.
+     </para>
+ 
+     <para>Procedure: set the left and the right directory, configure the optional file filter and
+     set the checkbox options. Then click on the <guibutton>Compare</guibutton> button to
+     compare the directories, the results are displayed in the file list.
+     By using the <guilabel>Show options</guilabel>, you can include/exclude some kind of files.
+     Those files, that are not in the list, will be untouched at synchronization.
+     When you agree with the <guibutton>Compare</guibutton> results click on the
+     <guibutton>Synchronize</guibutton> button to show the synchronize dialog.
+     After selection some options and clicking the <guibutton>Start</guibutton> button
+     the synchronization process will start.
+     A detailed explenation of all the functions and buttons is described in the next text.
+     </para>
+ 
+     <para><keycap>COMPARATOR</keycap></para>
+ 
+     <variablelist>
+     <varlistentry><term>Panel elements</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para><guilabel>Left Directory</guilabel>:
+ 	           the left side base directory.</para></listitem>
+     	<listitem><para><guilabel>Right Directory</guilabel>:
+ 	           the left side base directory</para></listitem>
+ 	<listitem><para><guilabel>File Filter</guilabel>:
+ 	           filter the filenames at synchronizing.
+                    <filename>*.png</filename> selects only those files which name's ends with
+ 		   <filename>.png</filename>
+                    Directories will be listed if the directory name ends with <filename>.png</filename> or
+                    if the directory contains files which end with <filename>.png</filename></para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Checkbox options</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para><guilabel>Recurse subdirectories</guilabel>:
+ 	           the Synchronizer walks through on subdirectories at comparing.</para></listitem>
+ 	<listitem><para><guilabel>Follow symlinks</guilabel>:
+ 	           the Synchronizer follows the symbolic links to directories (not the files!).</para></listitem>
+ 	<listitem><para><guilabel>Compare by content</guilabel>:
+ 	           those files which size is equal will be compared by content as well.</para></listitem>
+     	<listitem><para><guilabel>Ignore Date</guilabel>:
+ 	           Ignores the date information (useful for ftp, smb, archive, ... )
+                    the date information is relevant only in the local file system.</para></listitem>
+ 	<listitem><para><guilabel>Asymmetric</guilabel>:
+ 	           The <guilabel>Left Directory</guilabel> is the target directory,
+                    the <guilabel>Right Directory</guilabel> is the source directory.
+                    This functions synchronizes the content of the left directory to the right directory.
+                    <itemizedlist>
+                      <listitem><para>Those files that exists only in the left side will be
+ 		                       deleted.</para></listitem>
+                      <listitem><para>Those ones that exists only in the right side will be copied to
+ 		                       left.</para></listitem>
+                      <listitem><para>Those files that considered to be equal will be untouched.
+ 		                       </para></listitem>
+                      <listitem><para>Those files that considered to be different will be copied to
+ 		                       left.</para></listitem>
+                    </itemizedlist>
+                    This function is useful if the date information is unusable, or at synchronizing the
+                    left directory to the content of a fileserver (like download).</para></listitem>
+ 	<listitem><para><guilabel>Automatic Scrolling</guilabel>:
+ 	           It's for slow FTP servers, ... When the Synchronizer finished
+                    comparing a file, it puts the file into the end of the list at once and
+                    scrolls the window if it is necessary. It is important if one wants to
+                    know what the Synchronizer is doing. If the FTP server is slow, the
+                    comparation of a directory may take a lot of time. By turning this
+                    option on, one can see that the comparator is "alive", but slow.
+                    For fast file systems, it can reduce the speed of comparing
+                    slightly.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     </variablelist>
+ 
+     <para>Now click on the <guibutton>Compare</guibutton> button to compare the directories,
+     the results are displayed in the file list.</para>
+ 
+     <variablelist>
+     <varlistentry><term>The file list</term>
+     <listitem>
+     <para>Left name | Left size | Left time | Task | Right time | Right size | Right name</para>
+     </listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Tasks (&lt;=>)</term>
+     <listitem>
+     <para>This colum will display wich task is planned for the Syncronizer.</para>
+     <itemizedlist>
+     	<listitem><para><guibutton>-></guibutton>:
+ 	           copy from the left side to the right side.
+                    For directories: <command>mkdir</command> in the right side.</para></listitem>
+     	<listitem><para><guibutton>=</guibutton>:
+ 	           the files are the same, don't do anything.</para></listitem>
+ 	<listitem><para><guibutton>!=</guibutton>:
+ 	           the file is excluded, or the Synchronizer does not know what to do.</para></listitem>
+ 	<listitem><para><guibutton>&lt;-</guibutton>:
+ 	           copy from the right side to the left side.
+                    For directories: <command>mkdir</command> in the left side</para></listitem>
+ 	<listitem><para><guibutton>DEL</guibutton>:
+ 	           delete files from the right side.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Show options</term>
+     <listitem>
+     <para>Here you can include/exclude some kind of files.
+     Those files, that are not in the list, will be untouched at synchronization.</para>
+     <itemizedlist>
+     	<listitem><para><guibutton>-></guibutton>:
+ 	           Enable/Disable the copy task from left to right.</para></listitem>
+     	<listitem><para><guibutton>=</guibutton>:
+ 	           Enable/Disable listing the equal files.</para></listitem>
+ 	<listitem><para><guibutton>!=</guibutton>:
+ 	           Enable/Disable listing the excluded / "don't know what to do" files.</para></listitem>
+ 	<listitem><para><guibutton>&lt;-</guibutton>:
+ 	           Enable/Disable the copy task from right to left.</para></listitem>
+ 	<listitem><para><guibutton>Trash</guibutton>:
+ 	           Enable/Disable the file deleting from the left side task.</para></listitem>
+ 	<listitem><para><guibutton>Duplicates</guibutton>:
+ 	           Enable/Disable those files that exist on both side.</para></listitem>
+ 	<listitem><para><guibutton>Singles</guibutton>:
+ 	           Enable/Disable those files that exist only on one side.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Action buttons</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para><guibutton>Compare</guibutton>:
+ 	           compares the directories, the results are displayed in the file list.</para></listitem>
+     	<listitem><para><guibutton>Stop</guibutton>:
+ 	           stops comparing.</para></listitem>
+ 	<listitem><para><guibutton>Synchronize</guibutton>:
+ 	           shows the synchronize dialog.</para></listitem>
+ 	<listitem><para><guibutton>Close</guibutton>:
+ 	           closes the Synchronizer window.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>The Status line may contain</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para>The number of scanned directories at comparing.</para></listitem>
+     	<listitem><para>The filename at comparing by content (for big files).</para></listitem>
+ 	<listitem><para>The number of files in the list otherwise.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Right click menu on the file list</term>
+     <listitem>
+     <para>Here you can change the <guilabel>Task</guilabel> operations
+ 	   determined by the Comparator.
+            The change will be applied on the selection, not only on the right clicked item.
+ 	   If the selected item is a directory, the change will be applied on its
+ 	   files / subdirectories as well.</para>
+     <itemizedlist>
+     	<listitem><para><guibutton>Synchronise Directories</guibutton>:
+ 	           starts synchronization.</para></listitem>
+     	<listitem><para><guibutton>Exclude</guibutton>:
+ 	           excludes a file/dir from synchronization ( task change to != ).</para></listitem>
+ 	<listitem><para><guibutton>Restore original operation</guibutton>:
+ 	           task change to the orig result of comparator.</para></listitem>
+ 	<listitem><para><guibutton>Reverse direction</guibutton>:
+ 	           task change ( -> to &lt;-, and &lt;- to -> ).</para></listitem>
+         <listitem><para><guibutton>Copy from right to left</guibutton>:
+ 	           task change to &lt;-.</para></listitem>
+         <listitem><para><guibutton>Copy from left to right</guibutton>:
+ 	           task change to ->.</para></listitem>
+         <listitem><para><guibutton>Delete ( left single )</guibutton>:
+ 	           task change to DEL.</para></listitem>
+     </itemizedlist>
+     <para>Selection items</para>
+     <itemizedlist>
+         <listitem><para><guibutton>Select items</guibutton>:
+ 	           Opens a dialog which allows you to select items.
+ 		   This is the <guimenuitem>Select Group</guimenuitem> dialog  from the
+ 		   &markmenu_lnk;.</para></listitem>
+         <listitem><para><guibutton>Unselect items</guibutton>:
+ 	           Opens a dialog which allows you to unselect items.
+ 		   This is the <guimenuitem>Unselect Group</guimenuitem> dialog  from the
+ 		   &markmenu_lnk;.</para></listitem>
+         <listitem><para><guibutton>Invert selection</guibutton>:
+ 	           Invert the selection status of all the items.</para></listitem>
+     </itemizedlist>
+     <para>The following operations work on the clicked file not on the selection</para>
+     <itemizedlist>
+         <listitem><para><guibutton>View left file</guibutton>:
+ 	           starts viewer on the left file.</para></listitem>
+         <listitem><para><guibutton>View right file</guibutton>:
+ 	           starts viewer on the right file.</para></listitem>
+         <listitem><para><guibutton>Compare Files</guibutton>:
+ 	           starts the diff utility (ex. kompare) on the files.</para></listitem>
+     </itemizedlist>
+     </listitem>
+     </varlistentry>
+ 
+     </variablelist>
+ 
+ 
+     <para><keycap>SYNCHRONIZER</keycap></para>
+     <para>After pressing the <guibutton>Synchronize</guibutton> button the synchronization dialog appears.</para>
+ 
+     <variablelist>
+     <varlistentry><term>Check boxes</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para><guilabel>Right to left</guilabel>:
+ 	           copy X1 files ( Y1 bytes )
+                    enable / disable the copy from right to left.</para></listitem>
+     	<listitem><para><guilabel>Left to right</guilabel>:
+ 	           copy X2 files ( Y2 bytes )
+                    enable / disable the copy from left to right.</para></listitem>
+ 	<listitem><para><guilabel>Left</guilabel>:
+ 	           delete X3 files ( Y3 bytes )
+                    enable / disable the left side deleting.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Below the checkboxes, there are three status labels</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para><guilabel>Ready</guilabel>:
+ 	           A1/A2 files, B1/B2.
+ 		   This line is changed at synchronizing, showing that synchronizer finished
+                    with A1 files from A2 ( B1 bytes from B2 ).</para></listitem>
+     	<listitem><para><guilabel>Progress bar</guilabel>:
+ 	           Shows the progress on the synchronization (based on bytes).</para></listitem>
+ 	<listitem><para><guilabel>Confirm overwrites</guilabel>:
+ 	           By switching this option on, Krusader will show the well know
+                    rename, skip, overwrite, skip all, overwrite all dialog box,
+                    before overwriting the file.</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     <varlistentry><term>Action buttons</term>
+     <listitem>
+     <itemizedlist>
+     	<listitem><para><guibutton>Start</guibutton>:
+ 	           starts synchronization.</para></listitem>
+     	<listitem><para><guibutton>Pause / Resume</guibutton>:
+ 	           pauses / resumes the synchronization process.</para></listitem>
+ 	<listitem><para><guibutton>Close</guibutton>:
+ 	           closes the synchronization dialog (with stopping synchronization).</para></listitem>
+     </itemizedlist></listitem>
+     </varlistentry>
+ 
+     </variablelist>
+ 
+ </sect1>
+ 
+ 
  </chapter>

Index: using-krusader.sgml
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/en/using-krusader.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** using-krusader.sgml	30 Dec 2003 20:18:08 -0000	1.6
--- using-krusader.sgml	7 Jan 2004 14:42:57 -0000	1.7
***************
*** 243,251 ****
      </screenshot>
  
!     <para>This is a new feature since &krusader; 1.29-beta. With the tabbed browsing bar you can quickly change to another
!     directory by clicking on the tab.
      <itemizedlist>
      <listitem><para>To <keycap>create a tab</keycap>: <keycap>Right-click</keycap> on a
!     directory and select <keycap>open in a new tab</keycap>, or use the middle mouse button, or use
      <keycombo><keycap>Alt</keycap><keycap>Ctrl</keycap><keycap>n</keycap></keycombo>.
      </para></listitem>
--- 243,252 ----
      </screenshot>
  
!     <para>This is a new feature since &krusader; 1.29-beta. With the tabbed browsing bar you can quickly change
!     to another directory by clicking on the tab.
      <itemizedlist>
      <listitem><para>To <keycap>create a tab</keycap>: <keycap>Right-click</keycap> on a
!     directory and select <keycap>open in a new tab</keycap>, or use the <mousebutton>middle</mousebutton>
!     mouse button, or use
      <keycombo><keycap>Alt</keycap><keycap>Ctrl</keycap><keycap>n</keycap></keycombo>.
      </para></listitem>
***************
*** 257,262 ****
  
      <listitem><para>To <keycap>close a tab</keycap> (except the left tab): <keycap>right-click</keycap> on the
!     tab and select <keycap>close tab</keycap>, or use the middle mouse button, or use the Tabbed Browsing red cross
!     button, or use
      <keycombo><keycap>Alt</keycap><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>n</keycap></keycombo>.
      </para></listitem>
--- 258,263 ----
  
      <listitem><para>To <keycap>close a tab</keycap> (except the left tab): <keycap>right-click</keycap> on the
!     tab and select <keycap>close tab</keycap>, or use the <mousebutton>middle</mousebutton> mouse button,
!     or use the Tabbed Browsing red cross button, or use
      <keycombo><keycap>Alt</keycap><keycap>Ctrl</keycap><keycap>Shift</keycap><keycap>n</keycap></keycombo>.
      </para></listitem>
***************
*** 631,713 ****
  
      </sect2>
- 
-     <sect2 id="synchronize_dirs">
-     <title>Synchronize Directories</title>
- 
-     &newfeaturenote;
- 
-     <para>This function compares the left and the right panel and shows the difference between them
-     after choosing <emphasis role="bold"><menuchoice><guimenu>Commands</guimenu>
-     <guimenuitem>Synchronize Directories</guimenuitem></menuchoice></emphasis>
-     or
-     <keycombo action="simul">&Ctrl;<keycap>D</keycap></keycombo>.
-     After the compare function, you can synchronize the files and directories.
-     </para>
- 
-     <para>Procedure: set the left and the right directory, configure the optional file filter and
-     set the checkbox options. Then click on the <guibutton>Compare</guibutton> button, the results
-     are listed below. The listed results can be filtered with the <guilabel>Show options</guilabel> to
-     increase the readability (by default everything is viewed). When you agree with the
-     <guibutton>Compare</guibutton> results click on the <guibutton>Synchronize</guibutton> button
-     to synchronize the files and directories.
-     </para>
- 
-     <para>Checkbox options:
-     <itemizedlist>
-     	<listitem><para><guilabel>Recurse subdirectories</guilabel>:
- 	           compares not only the base directories but their subdirectories as well.</para></listitem>
-     	<listitem><para><guilabel>Ignore Date</guilabel>:
- 	           ignores the date information at comparing (good if the files were fetched from ftp, smb,
- 		   archive, ... file systems).</para></listitem>
- 	<listitem><para><guilabel>Asymmetric</guilabel>:
- 	           The left side is the destination, the right is the source directory.
- 		   The files existed only in the left directory will be deleted, the other differing ones
- 		   will be copied from right to left (useful at updating a directory from a file
- 		   server).</para></listitem>
- 	<listitem><para><guilabel>Compare by content</guilabel>:
- 	           compares the duplicate files with the same size by their content.</para></listitem>
- 	<listitem><para><guilabel>Follow symlinks</guilabel>:
- 	           follows the symbolic links also at comparing.</para></listitem>
- 	<listitem><para><guilabel>Automatic Scrolling</guilabel>:
- 	           scrolls the results of comparing (slow).</para></listitem>
-     </itemizedlist>
-     </para>
- 
-     <para>
-     Show options (in the compare results list):
-     <itemizedlist>
-     	<listitem><para><guibutton>-></guibutton>:
- 	           lists the files marked to copy from left to right.</para></listitem>
-     	<listitem><para><guibutton>=</guibutton>:
- 	           lists the files considered to be identical.</para></listitem>
- 	<listitem><para><guibutton>not =</guibutton>:
- 	           lists the excluded files.</para></listitem>
- 	<listitem><para><guibutton>&lt;-</guibutton>:
- 	           lists the files marked to copy from right to left.</para></listitem>
- 	<listitem><para><guibutton>trash</guibutton>:
- 	           lists the files marked to delete.</para></listitem>
- 	<listitem><para><guibutton>Duplicates</guibutton>:
- 	           lists those files that exist in both sides.</para></listitem>
- 	<listitem><para><guibutton>Singles</guibutton>:
- 	           lists those files that exist only in either side.</para></listitem>
-     </itemizedlist>
-     </para>
- 
-     <para>
-     Action buttons:
-     <itemizedlist>
-     	<listitem><para><guibutton>Compare</guibutton>:
- 	           compares the left and right directories, the results are displayed below.</para></listitem>
-     	<listitem><para><guibutton>Stop</guibutton>:
- 	           stops the compare or synchronize process.</para></listitem>
- 	<listitem><para><guibutton>Synchronize</guibutton>:
- 	           synchronizes the files and directories.</para></listitem>
- 	<listitem><para><guibutton>Close</guibutton>:
- 	           closes the Synchronizer window.</para></listitem>
-     </itemizedlist>
-     </para>
- 
-     </sect2>
- 
  
  </sect1>
--- 632,635 ----

[Krusader-commits] krusader_kde3/doc ChangeLog,1.7,1.8

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

Update of /cvsroot/krusader/krusader_kde3/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv24643/doc

Modified Files:
	ChangeLog 
Log Message:


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/doc/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	30 Dec 2003 20:18:08 -0000	1.7
--- ChangeLog	7 Jan 2004 14:42:57 -0000	1.8
***************
*** 3,10 ****
  
  
! Date:
  
  UPDATED: manpage
! UPDATED: directory synchronisation (using-krusader.sgml)
  UPDATED: From: DocBook XML V4.1-Based Variant V1.0//EN
           To:   DocBook XML V4.1.2-Based Variant V1.1//EN
--- 3,12 ----
  
  
! Date: 06.01.2004
  
+ ADDED:   User Menu (commands.sgml)
  UPDATED: manpage
! UPDATED: directory synchronisation (moved to krusader-tools.sgml)
!          Thanks to Karai Csaba
  UPDATED: From: DocBook XML V4.1-Based Variant V1.0//EN
           To:   DocBook XML V4.1.2-Based Variant V1.1//EN

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.52,1.53

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv14960/krusader_kde3/krusader/Panel

Modified Files:
	krdetailedview.cpp 
Log Message:

FIXED: rename crash at watcher refresh    ADDED: selectall for rename


Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** krdetailedview.cpp	22 Dec 2003 20:32:31 -0000	1.52
--- krdetailedview.cpp	4 Jan 2004 23:38:04 -0000	1.53
***************
*** 347,350 ****
--- 347,351 ----
  
  void KrDetailedView::clear() {
+   emit KListView::selectionChanged(); /* to avoid rename crash at refresh */
    KListView::clear();
    _count = _numSelected = _numDirs = _selectedSize = _countSize = 0;
***************
*** 652,655 ****
--- 653,657 ----
  
     KListView::rename(item, c);
+    renameLineEdit()->selectAll();
  }
  

[Krusader-commits] krusader_kde3 ChangeLog,1.159,1.160

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

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv14960/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: rename crash at watcher refresh    ADDED: selectall for rename


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -C2 -d -r1.159 -r1.160
*** ChangeLog	4 Jan 2004 16:39:01 -0000	1.159
--- ChangeLog	4 Jan 2004 23:38:03 -0000	1.160
***************
*** 1,6 ****
--- 1,8 ----
+     ADDED: selectall at rename
      ADDED: a paritialy working user menu (try alt+~)
      ADDED: new shortcuts to search dialog (heiner)
      ADDED: directory synchronizer
      ADDED: file splitter
+     FIXED: crash at rename if the directory is refreshed by the watcher
      FIXED: stepping to the file below after delete (heiner)
      FIXED: window size and position saving at maximized mode

[Krusader-commits] krusader_kde3/krusader/Panel krview.cpp,1.2,1.3 krview.h,1.8,1.9 listpanel.cpp,1.49,1.50

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv794/krusader_kde3/krusader/Panel

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

FIXED: stepping to the file below after delete (heiner)


Index: krview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krview.cpp	22 Aug 2003 10:03:45 -0000	1.2
--- krview.cpp	4 Jan 2004 16:39:01 -0000	1.3
***************
*** 169,177 ****
  }
  
! QString KrView::firstUnmarkedAboveCurrent() {
!   KrViewItem *iterator=getPrev(getCurrentKrViewItem());
  	while(iterator && iterator->isSelected())
! 	  iterator=getPrev(iterator);
! 	if (!iterator) return QString::null;
!   else return iterator->name();
  }
--- 169,183 ----
  }
  
! QString KrView::firstUnmarkedBelowCurrent() {
!   KrViewItem *iterator=getNext(getCurrentKrViewItem());
  	while(iterator && iterator->isSelected())
! 	  iterator=getNext(iterator);
!   if (!iterator)
!   {
!     iterator=getPrev(getCurrentKrViewItem());
!       while(iterator && iterator->isSelected())
!         iterator=getPrev(iterator);
!   }
!   if (!iterator) return QString::null;
!   return iterator->name();
  }

Index: krview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** krview.h	14 Oct 2003 23:49:18 -0000	1.8
--- krview.h	4 Jan 2004 16:39:01 -0000	1.9
***************
*** 121,125 ****
    virtual QString nameToMakeCurrent() const { return _nameToMakeCurrent; }
    virtual void setNameToMakeCurrent(const QString name) { _nameToMakeCurrent = name; }
!   virtual QString firstUnmarkedAboveCurrent();
    virtual QString statistics();
  
--- 121,125 ----
    virtual QString nameToMakeCurrent() const { return _nameToMakeCurrent; }
    virtual void setNameToMakeCurrent(const QString name) { _nameToMakeCurrent = name; }
!   virtual QString firstUnmarkedBelowCurrent();
    virtual QString statistics();
  

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** listpanel.cpp	2 Jan 2004 16:09:52 -0000	1.49
--- listpanel.cpp	4 Jan 2004 16:39:01 -0000	1.50
***************
*** 705,709 ****
  
  void ListPanel::prepareToDelete() {
!   view->setNameToMakeCurrent( view->firstUnmarkedAboveCurrent() );
  }
  
--- 705,709 ----
  
  void ListPanel::prepareToDelete() {
!   view->setNameToMakeCurrent( view->firstUnmarkedBelowCurrent() );
  }
  

[Krusader-commits] krusader_kde3 ChangeLog,1.158,1.159

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

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv794/krusader_kde3

Modified Files:
	ChangeLog 
Log Message:

FIXED: stepping to the file below after delete (heiner)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** ChangeLog	3 Jan 2004 16:21:35 -0000	1.158
--- ChangeLog	4 Jan 2004 16:39:01 -0000	1.159
***************
*** 3,6 ****
--- 3,7 ----
      ADDED: directory synchronizer
      ADDED: file splitter
+     FIXED: stepping to the file below after delete (heiner)
      FIXED: window size and position saving at maximized mode
      FIXED: more freedom to give FTP proxy URL-s in "New FTP Connection" menu

[Krusader-commits] krusader_kde3/po cs.po,1.2,1.3

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

Update of /cvsroot/krusader/krusader_kde3/po
In directory sc8-pr-cvs1:/tmp/cvs-serv30643/po

Modified Files:
	cs.po 
Log Message:


Index: cs.po
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/po/cs.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cs.po	23 Nov 2003 13:42:57 -0000	1.2
--- cs.po	4 Jan 2004 01:47:27 -0000	1.3
***************
*** 5,16 ****
  # translation of cs.po to
  # translation of cs.po to
! # Copyright (C) 2003 Free Software Foundation, Inc.
! # Martin Sixta <luk...@se...>, 2003.
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: krusader-cvs-2003_11_22\n\n"
! "POT-Creation-Date: 2003-11-23 11:16+0100\n"
! "PO-Revision-Date: 2003-11-23 12:16+0100\n"
[...2806 lines suppressed...]
! #~ msgid "Can't re-enter archive. Going to the nearest path"
! #~ msgstr "Nelze znovu vejít do archívu. Jdu do nejbližšího adresáře"
! 
! #~ msgid "When Packing into archive - you must use the active directory"
! #~ msgstr "Při balení do archívu musíte použít aktivní adresář"
! 
! #~ msgid "When unpacking into archive - you must use the active directory"
! #~ msgstr "Při rozbalování do archívu - musíte použít aktivní adresář"
  
  #~ msgid "Book.Man: Your Bookmark Manager"
***************
*** 2866,2872 ****
  #~ msgid "&Device Manager"
  #~ msgstr "Správce &zařízení"
- 
- #~ msgid "&Executables"
- #~ msgstr "Spustit&elné"
  
  #~ msgid "&Quickview Panel"
--- 3385,3388 ----

[Krusader-commits] krusader_kde3/krusader/Panel krcalcspacedialog.cpp,NONE,1.1 krcalcspacedialog.h,NONE,1.1

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv21065/krusader/Panel

Added Files:
	krcalcspacedialog.cpp krcalcspacedialog.h 
Log Message:


--- NEW FILE: krcalcspacedialog.cpp ---
/***************************************************************************
                          krcalcspacedialog.cpp  -  description
                             -------------------
    begin                : Fri Jan 2 2004
    copyright            : (C) 2004 by Shie Erlich & Rafi Yanai
 e-mail               : kru...@us...
 web site             : http://krusader.sourceforge.net
---------------------------------------------------------------------------
Description
***************************************************************************

A

  db   dD d8888b. db    db .d8888.  .d8b.  d8888b. d88888b d8888b.
  88 ,8P' 88  `8D 88    88 88'  YP d8' `8b 88  `8D 88'     88  `8D
  88,8P   88oobY' 88    88 `8bo.   88ooo88 88   88 88ooooo 88oobY'
  88`8b   88`8b   88    88   `Y8b. 88~~~88 88   88 88~~~~~ 88`8b
  88 `88. 88 `88. 88b  d88 db   8D 88   88 88  .8D 88.     88 `88.
  YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD

                                                  S o u r c e    F i l e

***************************************************************************
*                                                                         *
*   This program is free software; you can redistribute it and/or modify  *
*   it under the terms of the GNU General Public License as published by  *
*   the Free Software Foundation; either version 2 of the License, or     *
*   (at your option) any later version.                                   *
*                                                                         *
***************************************************************************/

// Qt Includes
#include <qtimer.h>
#include <qlayout.h>
#include <qlabel.h>
// KDE Includes
#include <klocale.h>
#include <kcursor.h>
// Krusader Includes
#include "krcalcspacedialog.h"
#include "../krusader.h"

/* --=={ Patch by Heiner <h.e...@gm...> }==-- */
KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names)
	: m_totalSize(0), m_totalFiles(0), m_totalDirs(0), m_names(names), m_files(files), m_parent(parent)
        , m_threadInUse(true), m_stop(false) {}

void KrCalcSpaceDialog::CalcThread::cleanUp(){
	if (m_threadInUse || !finished())
		m_synchronizeUsageAccess.unlock();
	else{
		m_synchronizeUsageAccess.unlock(); // prevents a resource leak
		// otherwise: no one needs this instance any more: delete it
		delete this;
	}
}

void KrCalcSpaceDialog::CalcThread::deleteInstance(){
	// synchronize to avoid race condition.
	m_synchronizeUsageAccess.lock();
	m_threadInUse = false;
	cleanUp();
}

void KrCalcSpaceDialog::CalcThread::run(){
	if ( !m_names.isEmpty() ) // if something to do: do the calculation
	for ( QStringList::ConstIterator name = m_names.begin(); name != m_names.end(); ++name )
		m_files->vfs_calcSpace( *name, &m_totalSize, &m_totalFiles, &m_totalDirs , & m_stop);
	// synchronize to avoid race condition.
	m_synchronizeUsageAccess.lock();
	cleanUp(); // this does not need the instance any more
}

void KrCalcSpaceDialog::CalcThread::stop(){
	// cancel was pressed
	m_stop = true;
}

KrCalcSpaceDialog::KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose) :
	KDialogBase(parent, "KrCalcSpaceDialog", true, "Calculate Occupied Space", Ok|Cancel),
	m_autoClose(autoclose), m_canceled(false), m_timerCounter(0){
	// the dialog: The Ok button is hidden until it is needed
	showButtonOK(false);
	m_thread = new CalcThread(this, files, names);
	m_pollTimer = new QTimer(this);
	QWidget * mainWidget = new QWidget( this );
	setMainWidget(mainWidget);
	QVBoxLayout *topLayout = new QVBoxLayout( mainWidget, 0, spacingHint() );

	m_label = new QLabel( "", mainWidget, "caption" );
	showResult(); // fill m_label with something usefull
	topLayout->addWidget( m_label );
	topLayout->addStretch(10);
}

void KrCalcSpaceDialog::calculationFinished(){
	// close dialog if auto close is true
	if (m_autoClose){
		done(0);
		return;
	}
	// otherwise hide cancel and show ok button
	showButtonCancel(false);
	showButtonOK(true);
	showResult(); // and show final result
}

/* This timer has two jobs: it polls the thread if it is finished. Polling is
  better here as it might finish while the dialog builds up. Secondly it refreshes
  the displayed result.
 */
void KrCalcSpaceDialog::timer(){
	// thread finished?
	if (m_thread->finished()){
		// close dialog or switch buttons
		calculationFinished();
		m_pollTimer->stop(); // stop the polling. No longer needed
		return;
	}

	// Every 10 pollings (1 second) refresh the displayed result
	if (++m_timerCounter > 10){
		m_timerCounter = 0;
		showResult();
	}
}

void KrCalcSpaceDialog::showResult(){
	if (!m_thread) return;
	QString msg;
	QString fileName = ( ( m_thread->getNames().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getNames().first() + "\n" ) : QString( "" ) );
	msg = fileName + i18n( "Total occupied space: %1\nin %2 directories and %3 files" ).
		arg( KIO::convertSize( m_thread->getTotalSize() ) ).arg( m_thread->getTotalDirs() ).arg( m_thread->getTotalFiles() );
	m_label->setText(msg);
}

void KrCalcSpaceDialog::slotCancel(){
	m_thread->stop(); // notify teh thread to stop
	m_canceled = true; // set the cancel flag
	KDialogBase::slotCancel(); // close the dialog
}

KrCalcSpaceDialog::~KrCalcSpaceDialog(){
	CalcThread * tmp = m_thread;
	m_thread = 0; // do not access the thread anymore or core dump if smoe piece of code wrongly does
	tmp->deleteInstance(); // Notify the thread, that the dialog does not need anymore.
}

void KrCalcSpaceDialog::exec(){
	m_thread->start(); // start the thread
	if (m_autoClose){ // autoclose
		// set the cursor to busy mode and wait 3 seconds or until the thread finishes
		krApp->setCursor( KCursor::waitCursor() );
		bool result = m_thread->wait(3000);
		krApp->setCursor( KCursor::arrowCursor() );  // return the cursor to normal mode
		if (result) return;// thread finished: do not show the dialog
		showResult(); // fill the invisible dialog with usefull data
	}
	// prepare and start the poll timer
	connect(m_pollTimer, SIGNAL(timeout()), this, SLOT(timer()));
	m_pollTimer->start(100);
	KDialogBase::exec(); // show the dialog
}
/* --=={ End of patch by Heiner <h.e...@gm...> }==-- */


--- NEW FILE: krcalcspacedialog.h ---
/***************************************************************************
                          krcalcspacedialog.h  -  description
                             -------------------
    begin                : Fri Jan 2 2004
    copyright            : (C) 2004 by Shie Erlich & Rafi Yanai
    e-mail               : kru...@us...
    web site             : http://krusader.sourceforge.net
 ---------------------------------------------------------------------------
  Description
 ***************************************************************************

  A

     db   dD d8888b. db    db .d8888.  .d8b.  d8888b. d88888b d8888b.
     88 ,8P' 88  `8D 88    88 88'  YP d8' `8b 88  `8D 88'     88  `8D
     88,8P   88oobY' 88    88 `8bo.   88ooo88 88   88 88ooooo 88oobY'
     88`8b   88`8b   88    88   `Y8b. 88~~~88 88   88 88~~~~~ 88`8b
     88 `88. 88 `88. 88b  d88 db   8D 88   88 88  .8D 88.     88 `88.
     YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD

                                                     H e a d e r    F i l e

 ***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/

#ifndef KRCALCSPACEDIALOG_H
#define KRCALCSPACEDIALOG_H

/* --=={ Patch by Heiner <h.e...@gm...> }==-- */

// KDE Includes
#include <kdialogbase.h>
#include <kio/jobclasses.h>
// Qt Includes
#include <qthread.h>
// Krusader Includes
#include "../VFS/vfs.h"


/* Dialog calculating showing the number of files and directories and its total size
   in a dialog. If wanted, the dialog appears after 3 seconds of calculation, to
   avoid a short appearence if the result was found quickly. Computes teh result in
   a different thread.
 */
class KrCalcSpaceDialog : public KDialogBase{
	Q_OBJECT
	/* Thread which does the actual calculation. Deletes itself, if no longer
	   needed. Creator must call finished(), if the thread is no longer needed.
	*/
	class CalcThread : public QThread{
		KIO::filesize_t m_totalSize;
		unsigned long m_totalFiles;
		unsigned long m_totalDirs;
		const QStringList m_names;
		vfs * m_files;
		KrCalcSpaceDialog * m_parent;
		QMutex m_synchronizeUsageAccess;
		bool m_threadInUse; // true: caller needs the thread
		bool m_stop;
		void cleanUp(); // Deletes this, if possible
	public:
		KIO::filesize_t getTotalSize() const {return m_totalSize;} // the result
		unsigned long getTotalFiles() const {return m_totalFiles;} // the result
		unsigned long getTotalDirs() const {return m_totalDirs;} // the result
		const QStringList & getNames() const {return m_names;} // list of directories to calculate
		CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names);
		void deleteInstance(); // thread is no longer needed.
		void run(); // start calculation
		void stop(); // stop it. Thread continues until vfs_calcSpace returns
	} * m_thread;
	friend class CalcThread;
	class QTimer * m_pollTimer;
	QLabel * m_label;
	bool m_autoClose; // true: wait 3 sec. before showing the dialog. Close it, when done
	bool m_canceled; // true: cancel was pressed
	int m_timerCounter; // internal counter. The timer runs faster as the rehresh (see comment there)
	void calculationFinished(); // called if the calulation is done
	void showResult(); // show the current result in teh dialog
protected slots:
	void timer(); // poll timer was fired
	void slotCancel(); // cancel was pressed
public:
	// autoclose: wait 3 sec. before showing the dialog. Close it, when done
	KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose);
	~KrCalcSpaceDialog();
	KIO::filesize_t getTotalSize() const {return m_thread->getTotalSize();} // the result
	unsigned long getTotalFiles() const {return m_thread->getTotalFiles();} // the result
	unsigned long getTotalDirs() const {return m_thread->getTotalDirs();} // the result
	bool wasCanceled() const {return m_canceled;} // cancel was pressed; result is probably wrong
public slots:
	void exec(); // start calculation
};
/* End of patch by Heiner <h.e...@gm...> */

#endif

[Krusader-commits] krusader_kde3/krusader/Synchronizer synchronizergui.cpp,1.10,1.11

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv16305/krusader_kde3/krusader/Synchronizer

Modified Files:
	synchronizergui.cpp 
Log Message:

ADDED: synchronizer selection mask operations


Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** synchronizergui.cpp	3 Jan 2004 20:37:15 -0000	1.10
--- synchronizergui.cpp	3 Jan 2004 21:07:54 -0000	1.11
***************
*** 34,37 ****
--- 34,38 ----
  #include "../VFS/krpermhandler.h"
  #include "../KViewer/krviewer.h"
+ #include "../Dialogs/krspwidgets.h"
  #include "synchronizedialog.h"
  #include <qlayout.h>
***************
*** 46,49 ****
--- 47,51 ----
  #include <qeventloop.h>
  #include <qtooltip.h>
+ #include <qregexp.h>
  
  static const char * const right_arrow_button_data[] = {
***************
*** 1054,1057 ****
--- 1056,1062 ----
    #define VIEW_RIGHT_FILE_ID  97
    #define COMPARE_FILES_ID    98
+   #define SELECT_ITEMS_ID     99
+   #define DESELECT_ITEMS_ID   100
+   #define INVERT_SELECTION_ID 101
    //////////////////////////////////////////////////////////
    if (!itemIn)
***************
*** 1097,1100 ****
--- 1102,1114 ----
    popup.setItemEnabled(COMPARE_FILES_ID, !isDir && isDuplicate );
  
+   popup.insertSeparator();
+ 
+   popup.insertItem(i18n("Select items"),SELECT_ITEMS_ID);
+   popup.setItemEnabled(SELECT_ITEMS_ID, true );
+   popup.insertItem(i18n("Deselect items"),DESELECT_ITEMS_ID);
+   popup.setItemEnabled(DESELECT_ITEMS_ID, true );
+   popup.insertItem(i18n("Invert selection"),INVERT_SELECTION_ID);
+   popup.setItemEnabled(INVERT_SELECTION_ID, true );
+ 
    int result=popup.exec(QCursor::pos());
  
***************
*** 1153,1156 ****
--- 1167,1193 ----
      case COMPARE_FILES_ID:
        rightMenuCompareFiles( leftURL, rightURL );
+       break;
+     case SELECT_ITEMS_ID:
+     case DESELECT_ITEMS_ID:
+       {
+         QString mask = KRSpWidgets::getMask( result == SELECT_ITEMS_ID ? i18n("Select items") :
+                                              i18n( "Deselect items" ) );
+         unsigned              ndx = 0;
+         SynchronizerFileItem  *currentItem;
+ 
+         while( ( currentItem = synchronizer.getItemAt( ndx++ ) ) != 0 )
+         {
+           SyncViewItem *viewItem = (SyncViewItem *)currentItem->userData();
+ 
+           if( !viewItem || !viewItem->isVisible() )
+             continue;
+ 
+           if( QRegExp(mask,true,true).exactMatch( currentItem->name() ) )
+             syncList->setSelected( viewItem, result == SELECT_ITEMS_ID );
+         }
+       }
+       break;
+     case INVERT_SELECTION_ID:
+       syncList->invertSelection();
        break;
      case -1 : return;     // the user clicked outside of the menu

[Krusader-commits] krusader_kde3/krusader/Synchronizer synchronizergui.cpp,1.9,1.10 synchronizergui.h,1.5,1.6

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer
In directory sc8-pr-cvs1:/tmp/cvs-serv9983/krusader_kde3/krusader/Synchronizer

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

ADDED: Synchronizer : F3 + Shift F3 shortkeys for viewing the file


Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** synchronizergui.cpp	28 Dec 2003 17:11:48 -0000	1.9
--- synchronizergui.cpp	3 Jan 2004 20:37:15 -0000	1.10
***************
*** 1425,1426 ****
--- 1425,1459 ----
    if( tmp2 != url2.path() ) KIO::NetAccess::removeTempFile( tmp2 );
  }
+ 
+ void SynchronizerGUI::keyPressEvent( QKeyEvent *e )
+ {
+   switch ( e->key() )
+   {
+   case Key_F3 :
+     QListViewItem *listItem =  syncList->currentItem();
+     if( listItem == 0 )
+       break;
+ 
+     SynchronizerFileItem *item = ((SyncViewItem *)listItem)->synchronizerItemRef();
+     QString dirName    = item->directory().isEmpty() ? "" : item->directory() + "/";
+ 
+     if( item->isDir() )
+       return;
+     
+     if ( e->state() == ShiftButton && item->existsInRight() )
+     {
+       KURL rightURL = vfs::fromPathOrURL( synchronizer.rightBaseDirectory() + dirName + item->name() );
+       KrViewer::view( rightURL ); // view the file
+       return;
+     }
+     else if ( e->state() == 0 && item->existsInLeft() )
+     {
+       KURL leftURL  = vfs::fromPathOrURL( synchronizer.leftBaseDirectory()  + dirName + item->name() );
+       KrViewer::view( leftURL ); // view the file
+       return;
+     }
+     break;
+   }  
+ 
+   QDialog::keyPressEvent( e );
+ }

Index: synchronizergui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** synchronizergui.h	21 Dec 2003 19:04:45 -0000	1.5
--- synchronizergui.h	3 Jan 2004 20:37:15 -0000	1.6
***************
*** 113,116 ****
--- 113,118 ----
  
  protected:
+   virtual void keyPressEvent( QKeyEvent * );
+ 
    KHistoryCombo *leftLocation;
    KHistoryCombo *rightLocation;

[Krusader-commits] krusader_kde3/krusader/UserMenu usermenu.h,1.10,1.11

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

Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1461/krusader/UserMenu

Modified Files:
	usermenu.h 
Log Message:
 

Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** usermenu.h	3 Jan 2004 15:47:19 -0000	1.10
--- usermenu.h	3 Jan 2004 16:28:34 -0000	1.11
***************
*** 83,86 ****
--- 83,87 ----
        void addEntry( QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
                       bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0 );
+       void createMenu();
  
     private:
***************
*** 135,143 ****
  
  
!       static const int numOfExps = 1;
        static UMCmd expressions[ numOfExps ];
  
     protected:
!       static QString expPath( const QString& str );
  
     private:
--- 136,147 ----
  
  
!       static const int numOfExps = 4;
        static UMCmd expressions[ numOfExps ];
  
     protected:
!       static QString exp_p( const QString& str );
!       static QString exp_anf( const QString& str );
!       static QString exp_and( const QString& str );
!       static QString exp_an( const QString& str );
  
     private:

[Krusader-commits] krusader_kde3/krusader/UserMenu usermenu.cpp,1.11,1.12

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

Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv1426/krusader/UserMenu

Modified Files:
	usermenu.cpp 
Log Message:
 

Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** usermenu.cpp	3 Jan 2004 15:46:29 -0000	1.11
--- usermenu.cpp	3 Jan 2004 16:28:18 -0000	1.12
***************
*** 40,43 ****
--- 40,47 ----
  
  %_p%    - panel path
+ %_anf%  - number of files
+ %_and%  - number of folders
+ %_an%   - number of files and folders
+ 
  %_c%    - current file (or folder). Note: current != selected
  %_s%    - selected files and folders
***************
*** 46,68 ****
  %_af%   - all files (not including folders)
  %_ad%   - all folders (not including files)
- %_an%   - number of files and folders
- %_anf%  - number of files
- %_and%  - number of folders
  %_fm%   - filter mask (for example: *, *.cpp, *.h etc.)
  
  */
  UMCmd UserMenu::expressions[ UserMenu::numOfExps ] = {
!          {"%_p%", "panel's path", expPath}
        };
  
! #define ACTIVE  krApp->mainView->activePanel
! #define OTHER   krApp->mainView->activePanel->otherPanel
  
! QString UserMenu::expPath( const QString& str ) {
!    if ( str.lower() == "%ap%" ) {
!       return ACTIVE->virtualPath;
!    } else if ( str.lower() == "%op%" ) {
!       return OTHER->virtualPath;
!    } else return QString::null;
  }
  
--- 50,81 ----
  %_af%   - all files (not including folders)
  %_ad%   - all folders (not including files)
  %_fm%   - filter mask (for example: *, *.cpp, *.h etc.)
  
  */
  UMCmd UserMenu::expressions[ UserMenu::numOfExps ] = {
!          {"%_p%", "panel's path", exp_p},
!          {"%_anf%", "no. of files", exp_anf},
!          {"%_and%", "no. of folders", exp_and},
!          {"%_an%", "no. of files and folders", exp_an}
        };
  
! #define ACTIVE    krApp->mainView->activePanel
! #define OTHER     krApp->mainView->activePanel->otherPanel
! #define GETPANEL  (str.lower()[1]=='a' ? ACTIVE : OTHER)
  
! QString UserMenu::exp_p( const QString& str ) {
!    return GETPANEL->virtualPath;
! }
! 
! QString UserMenu::exp_anf( const QString& str ) {
!    return QString("%1").arg(GETPANEL->view->numFiles());
! }
! 
! QString UserMenu::exp_and( const QString& str ) {
!    return QString("%1").arg(GETPANEL->view->numDirs());
! }
! 
! QString UserMenu::exp_an( const QString& str ) {
!    return QString("%1").arg(GETPANEL->view->numDirs()+GETPANEL->view->numFiles());
  }
  
***************
*** 143,151 ****
     sidx = eidx+1;
     eidx = data.find(',', sidx);
!    execType = data.mid(sidx, eidx-sidx).toInt();
     // separateStderr
     sidx = eidx+1;
     eidx = data.find(',', sidx);
!    execType = data.mid(sidx, eidx-sidx).toInt();
     // acceptUrls
     sidx = eidx+1;
--- 156,164 ----
     sidx = eidx+1;
     eidx = data.find(',', sidx);
!    execType = (UserMenuProc::ExecType)data.mid(sidx, eidx-sidx).toInt();
     // separateStderr
     sidx = eidx+1;
     eidx = data.find(',', sidx);
!    separateStderr = data.mid(sidx, eidx-sidx).toInt();
     // acceptUrls
     sidx = eidx+1;
***************
*** 171,174 ****
--- 184,197 ----
  
  UserMenuGui::UserMenuGui( UserMenu *menu, QWidget * parent ) : KPopupMenu( parent ) {
+    createMenu();
+ 
+    // create the 'add entry' gui
+    _addgui = new UserMenuAddImpl(menu, this);
+    connect(_addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )),
+                this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )));
+ }
+ 
+ void UserMenuGui::createMenu() {
+    clear();
     insertTitle( "User Menu" );
  
***************
*** 179,188 ****
     insertSeparator();
     insertItem( "Add new entry", 0 );
- 
-    // create the 'add entry' gui
-    _addgui = new UserMenuAddImpl(menu, this);
-    connect(_addgui, SIGNAL(newEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )),
-                this, SLOT(addEntry(QString, QString, UserMenuProc::ExecType, bool, bool, bool, bool, QStringList )));
- 
  }
  
--- 202,205 ----
***************
*** 243,246 ****
--- 260,265 ----
        file.close();
     }
+    // update the menu, by re-reading the entries
+    createMenu();
  }
  

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.51,1.52

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

Update of /cvsroot/krusader/krusader_kde3/krusader
In directory sc8-pr-cvs1:/tmp/cvs-serv32483/krusader

Modified Files:
	krusader.cpp 
Log Message:
fixed: user menu key changed to alt-~ 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** krusader.cpp	30 Dec 2003 07:42:49 -0000	1.51
--- krusader.cpp	3 Jan 2004 16:21:58 -0000	1.52
***************
*** 444,448 ****
    actCloseTab = new KAction(i18n("Close tab"), ALT+CTRL+Key_C, SLOTS,
                            SLOT(closeTab()), actionCollection(), "close tab");
!   actUserMenu = new KAction(i18n("User Menu"), ALT+CTRL+Key_U, SLOTS,
                            SLOT(userMenu()), actionCollection(), "user menu");
    // and at last we can set the tool-tips
--- 444,448 ----
    actCloseTab = new KAction(i18n("Close tab"), ALT+CTRL+Key_C, SLOTS,
                            SLOT(closeTab()), actionCollection(), "close tab");
!   actUserMenu = new KAction(i18n("User Menu"), ALT+Key_QuoteLeft, SLOTS,
                            SLOT(userMenu()), actionCollection(), "user menu");
    // and at last we can set the tool-tips

[Krusader-commits] krusader_kde3 ChangeLog,1.157,1.158

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

Update of /cvsroot/krusader/krusader_kde3
In directory sc8-pr-cvs1:/tmp/cvs-serv32436

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** ChangeLog	30 Dec 2003 20:21:43 -0000	1.157
--- ChangeLog	3 Jan 2004 16:21:35 -0000	1.158
***************
*** 1,2 ****
--- 1,4 ----
+     ADDED: a paritialy working user menu (try alt+~)
+     ADDED: new shortcuts to search dialog (heiner)
      ADDED: directory synchronizer
      ADDED: file splitter

[Krusader-commits] krusader_kde3/krusader/UserMenu usermenuaddimpl.cpp,1.3,1.4

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

Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv26907/krusader/UserMenu

Modified Files:
	usermenuaddimpl.cpp 
Log Message:
basic user menu is working 

Index: usermenuaddimpl.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuaddimpl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** usermenuaddimpl.cpp	27 Dec 2003 13:22:51 -0000	1.3
--- usermenuaddimpl.cpp	3 Jan 2004 15:47:39 -0000	1.4
***************
*** 24,27 ****
--- 24,28 ----
  #include <qcheckbox.h>
  #include <qradiobutton.h>
+ #include <kdebug.h>
  
  #define ACTIVE_MASK     0x1000
***************
*** 64,68 ****
                       type, separateStderr->isChecked(), acceptLocalURLs->isChecked() || acceptRemote->isChecked(),
                       acceptRemote->isChecked(), showEverywhere->isChecked(),
!                      QStringList::split(';', showOnlyIn->text().simplifyWhiteSpace()));
     }
     UserMenuAdd::accept();
--- 65,69 ----
                       type, separateStderr->isChecked(), acceptLocalURLs->isChecked() || acceptRemote->isChecked(),
                       acceptRemote->isChecked(), showEverywhere->isChecked(),
!                      QStringList::split(';', showIn->text().simplifyWhiteSpace()));
     }
     UserMenuAdd::accept();

[Krusader-commits] krusader_kde3/krusader/UserMenu usermenu.h,1.9,1.10

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

Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv26882/krusader/UserMenu

Modified Files:
	usermenu.h 
Log Message:
basic user menu is working 

Index: usermenu.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** usermenu.h	27 Dec 2003 13:22:15 -0000	1.9
--- usermenu.h	3 Jan 2004 15:47:19 -0000	1.10
***************
*** 26,33 ****
--- 26,35 ----
  #include <kdialogbase.h>
  #include <qtextedit.h>
+ #include <qvaluelist.h>
  
  class KDialogBase;
  class UserMenuAddImpl;
  class UserMenu;
+ class UserMenuEntry;
  
  class UserMenuProcDlg: public KDialogBase {
***************
*** 73,77 ****
     public:
        UserMenuGui( UserMenu* menu, QWidget *parent = 0 );
!       QString run();
  
     protected:
--- 75,79 ----
     public:
        UserMenuGui( UserMenu* menu, QWidget *parent = 0 );
!       UserMenuEntry run();
  
     protected:
***************
*** 83,87 ****
  
     private:
!       QStringList _entries;
        UserMenuAddImpl *_addgui;
  };
--- 85,89 ----
  
     private:
!       QValueList<UserMenuEntry> _entries;
        UserMenuAddImpl *_addgui;
  };
***************
*** 98,103 ****
     QString description;
     EXPANDER expFunc;
! }
! UMCmd;
  
  class UserMenu : public QWidget {
--- 100,119 ----
     QString description;
     EXPANDER expFunc;
! } UMCmd;
! 
! class UserMenuEntry {
! public:
!    QString name;
!    QString cmdline;
!    UserMenuProc::ExecType execType;
!    bool separateStderr;
!    bool acceptURLs;
!    bool acceptRemote;
!    bool showEverywhere;
!    QStringList showIn;
! 
!    UserMenuEntry(QString data);
!    UserMenuEntry(): name(0), cmdline(0) {}
! };
  
  class UserMenu : public QWidget {

[Krusader-commits] krusader_kde3/krusader/UserMenu usermenu.cpp,1.10,1.11

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

Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv26738/krusader/UserMenu

Modified Files:
	usermenu.cpp 
Log Message:
basic user menu is working 

Index: usermenu.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenu.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** usermenu.cpp	27 Dec 2003 13:22:34 -0000	1.10
--- usermenu.cpp	3 Jan 2004 15:46:29 -0000	1.11
***************
*** 69,76 ****
  void UserMenu::exec() {
     // execute menu and wait for selection
!    QString cmd = _popup->run();
  
     // replace %% and prepare string
!    cmd = expand( cmd );
     //kdWarning() << cmd << endl;
  
--- 69,76 ----
  void UserMenu::exec() {
     // execute menu and wait for selection
!    UserMenuEntry cmd = _popup->run();
  
     // replace %% and prepare string
!    cmd = expand( cmd.cmdline );
     //kdWarning() << cmd << endl;
  
***************
*** 85,89 ****
  
     UserMenuProc *proc = new UserMenuProc( UserMenuProc::Terminal, true );
!    proc->start( cmd );
     //===> chdir( save.local8Bit() ); // chdir back
  }
--- 85,89 ----
  
     UserMenuProc *proc = new UserMenuProc( UserMenuProc::Terminal, true );
!    proc->start( cmd.cmdline );
     //===> chdir( save.local8Bit() ); // chdir back
  }
***************
*** 129,132 ****
--- 129,173 ----
  //////////////////////////////////////////////////////////////////////////////////////////////////////
  
+ UserMenuEntry::UserMenuEntry(QString data) {
+    // the data should look like:
+    // {name,cmdline,execType,separateStderr,acceptURLs,acceptRemote,showEverywhere,showIn}
+    // name
+    int sidx = data.find('{') + 1;
+    int eidx = data.find(',', sidx);
+    name = data.mid(sidx, eidx-sidx);
+    // cmdline
+    sidx = eidx+1;
+    eidx = data.find(',', sidx);
+    cmdline = data.mid(sidx, eidx-sidx);
+    // execType
+    sidx = eidx+1;
+    eidx = data.find(',', sidx);
+    execType = data.mid(sidx, eidx-sidx).toInt();
+    // separateStderr
+    sidx = eidx+1;
+    eidx = data.find(',', sidx);
+    execType = data.mid(sidx, eidx-sidx).toInt();
+    // acceptUrls
+    sidx = eidx+1;
+    eidx = data.find(',', sidx);
+    acceptURLs = data.mid(sidx, eidx-sidx).toInt();
+    // acceptRemote
+    sidx = eidx+1;
+    eidx = data.find(',', sidx);
+    acceptRemote = data.mid(sidx, eidx-sidx).toInt();
+    // showEverywhere
+    sidx = eidx+1;
+    eidx = data.find(',', sidx);
+    showEverywhere = data.mid(sidx, eidx-sidx).toInt();
+    // showIn
+    sidx = eidx+1;
+    eidx = data.find('}', sidx);
+    showIn = QStringList::split(";", data.mid(sidx, eidx-sidx));
+ }
+ 
+ //////////////////////////////////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////////////////////////////////
+ //////////////////////////////////////////////////////////////////////////////////////////////////////
+ 
  UserMenuGui::UserMenuGui( UserMenu *menu, QWidget * parent ) : KPopupMenu( parent ) {
     insertTitle( "User Menu" );
***************
*** 135,148 ****
     readEntries();
  
- 
-    // fill popup menu. Note: this code assumes that the _entries list contains pairs
-    // of {descripion, command}. If this is not the case, the code will fail.
-    // However, it should have been checked above (read entries from file)
-    int idx = 1;
-    for ( QStringList::Iterator it = _entries.begin(); it != _entries.end(); ++it ) {
-       insertItem( *it, idx++ );
-       ++it;
-    }
- 
     // add the "add new entry" command
     insertSeparator();
--- 176,179 ----
***************
*** 160,164 ****
     // available. It is used by the "add new entry" command.
     QString filename = locateLocal( "data", "krusader/krusermenu.dat" );
!    int i = 0;
  
     QFile file( filename );
--- 191,196 ----
     // available. It is used by the "add new entry" command.
     QString filename = locateLocal( "data", "krusader/krusermenu.dat" );
!    _entries.clear();
!    int idx = 1;
  
     QFile file( filename );
***************
*** 169,183 ****
        while ( !stream.atEnd() ) {
           line = stream.readLine();
!          _entries += line;
!          ++i;
        }
        file.close();
     }
-    // do we need to remove last entry?
-    if ( i > 0 && i % 2 != 0 ) _entries.pop_back();
- 
  }
  
! QString UserMenuGui::run() {
     int idx = exec();
     if ( idx == -1 ) return QString::null; // nothing was selected
--- 201,213 ----
        while ( !stream.atEnd() ) {
           line = stream.readLine();
!          if (!line.simplifyWhiteSpace().isEmpty())
!             _entries.append(UserMenuEntry(line));
!             insertItem( _entries.last().name, idx++ );
        }
        file.close();
     }
  }
  
! UserMenuEntry UserMenuGui::run() {
     int idx = exec();
     if ( idx == -1 ) return QString::null; // nothing was selected
***************
*** 190,199 ****
     // so, normalize idx to _entries, and add 1 since we want
     // the command part of the {description,command} pair
!    return _entries[ ( idx -1 ) * 2 + 1 ];
  }
  
  void UserMenuGui::addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
!                   bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn = 0) {
!    kdWarning() << "UserMenuGui::addEntry" << endl;
  }
  
--- 220,246 ----
     // so, normalize idx to _entries, and add 1 since we want
     // the command part of the {description,command} pair
!    return _entries[idx-1];
  }
  
  void UserMenuGui::addEntry(QString name, QString cmdline, UserMenuProc::ExecType execType, bool separateStderr,
!                   bool acceptURLs, bool acceptRemote, bool showEverywhere, QStringList showIn) {
!    // save a new entry in the following form:
!    // {"name","cmdline",execType,separateStderr,acceptURLs,acceptRemote,showEverywhere,showIn}
!    QString filename = locateLocal( "data", "krusader/krusermenu.dat" );
! 
!    QFile file( filename );
!    if ( file.open( IO_WriteOnly | IO_Append ) ) {
!       QTextStream stream( &file );
!       QString line = QString("{%1,%2,%3,%4,%5,%6,%7,%8}").arg(name)
!                                                       .arg(cmdline)
!                                                       .arg(execType)
!                                                       .arg(separateStderr)
!                                                       .arg(acceptURLs)
!                                                       .arg(acceptRemote)
!                                                       .arg(showEverywhere)
!                                                       .arg(showIn.join(";"));
!       stream << line << endl;
!       file.close();
!    }
  }
  

[Krusader-commits] krusader_kde3/krusader/UserMenu usermenuadd.ui,1.3,1.4

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

Update of /cvsroot/krusader/krusader_kde3/krusader/UserMenu
In directory sc8-pr-cvs1:/tmp/cvs-serv13636/krusader/UserMenu

Modified Files:
	usermenuadd.ui 
Log Message:
fixed: tab ordering 

Index: usermenuadd.ui
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/UserMenu/usermenuadd.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** usermenuadd.ui	3 Jan 2004 13:36:24 -0000	1.3
--- usermenuadd.ui	3 Jan 2004 14:24:49 -0000	1.4
***************
*** 336,339 ****
--- 336,350 ----
      </connection>
  </connections>
+ <tabstops>
+     <tabstop>cmdName</tabstop>
+     <tabstop>cmdLine</tabstop>
+     <tabstop>runInTerminal</tabstop>
+     <tabstop>separateStderr</tabstop>
+     <tabstop>acceptLocals</tabstop>
+     <tabstop>showEverywhere</tabstop>
+     <tabstop>showIn</tabstop>
+     <tabstop>okButton</tabstop>
+     <tabstop>cancelButton</tabstop>
+ </tabstops>
  <slots>
      <slot>popupAddMenu()</slot>

[Krusader-commits] krusader_kde3/krusader/Panel panelfunc.cpp,1.50,1.51

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv8646/krusader/Panel

Modified Files:
	panelfunc.cpp 
Log Message:
fixed: accidently deleted csaba's delayOpenUrl 

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** panelfunc.cpp	3 Jan 2004 13:36:24 -0000	1.50
--- panelfunc.cpp	3 Jan 2004 13:53:03 -0000	1.51
***************
*** 73,76 ****
--- 73,78 ----
  panel( parent ), inRefresh( false ), vfsP(0){
    urlStack.push( "file:/" );
+ 
+   connect( &delayTimer, SIGNAL(timeout()), this, SLOT(doOpenUrl()));
  }
  
***************
*** 130,133 ****
--- 132,143 ----
  }
  
+ void ListPanelFunc::delayedOpenUrl( const KURL& url ) {
+    delayURL = url;               /* this function is useful for FTP url-s and bookmarks */
+    delayTimer.start( 0, true );  /* to avoid qApp->processEvents() deadlock situaltion */
+ }
+ 
+ void ListPanelFunc::doOpenUrl() {
+    openUrl( delayURL );
+ }
  
  void ListPanelFunc::refresh( const KURL& url ) {

[Krusader-commits] krusader_kde3/krusader/Panel panelfunc.h,1.19,1.20

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

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv8610/krusader/Panel

Modified Files:
	panelfunc.h 
Log Message:
fixed: accidently deleted csaba's delayOpenUrl 

Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** panelfunc.h	3 Jan 2004 13:36:24 -0000	1.19
--- panelfunc.h	3 Jan 2004 13:52:32 -0000	1.20
***************
*** 36,39 ****
--- 36,40 ----
  #include <qobject.h>
  #include <qvaluestack.h>
+ #include <qtimer.h>
  
  class ListPanelFunc : public QObject{
***************
*** 44,47 ****
--- 45,50 ----
  	void openUrl(const KURL& path, const QString& nameToMakeCurrent = QString::null);
  	void openUrl(const QString& path, const QString& nameToMakeCurrent = QString::null);
+    void delayedOpenUrl( const KURL& path);
+    void doOpenUrl();
  	void refresh(){ refresh(panel->virtualPath); } // re-read the files
  	void rename(const QString &oldname, const QString &newname);
***************
*** 87,90 ****
--- 90,95 ----
  	bool                 inRefresh; // true when we are in refresh()
  	vfs*                 vfsP;      // pointer to vfs.
+    QTimer               delayTimer;
+    KURL                 delayURL;
  };