[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/gwenrename
From:       Spiros Georgaras <sngeorgaras () otenet ! gr>
Date:       2008-03-01 15:08:34
Message-ID: 1204384114.661244.14540.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780889 by sngeorgaras:

fixing list inversion type calculation and updating docs


 M  +1 -1      dirsdata.cpp  
 M  +13 -10    doc/en/index.docbook  
 M  +5 -7      rename.ui.h  


--- trunk/playground/utils/gwenrename/dirsdata.cpp #780888:780889
@@ -199,7 +199,7 @@
 				if(tchar[maxID].isDigit() && !toTwo) toRef[1].append(tchar[maxID]);
 				else{
 					toRef[adding].append(tchar[maxID]);
-					toTwo=TRUE;	
+					toTwo=TRUE;
 				}
 			}
 			k++;
--- trunk/playground/utils/gwenrename/doc/en/index.docbook #780888:780889
@@ -31,8 +31,8 @@
 
 <legalnotice>&FDLNotice;</legalnotice>
 
-<date>2008-02-29</date>
-<releaseinfo>0.5</releaseinfo>
+<date>2008-03-01</date>
+<releaseinfo>0.6</releaseinfo>
 
 <abstract>
 <para>
@@ -279,7 +279,7 @@
 </itemizedlist>
 
 <sect3 id="context-menu"><title>Context menu</title>
-<para>By right clicking on the Items list, the context menu is available to the \
user. When <guimenu>Show all items</guimenu> is not checked, a reduced version of the \
menu is displayed.</para> +<para>By right clicking on the Items List, the context \
menu is available to the user. When <guimenu>Show all items</guimenu> is not checked, \
a reduced version of the menu is displayed.</para>  <mediaobject>
 <imageobject>
 <imagedata fileref="context.png" format="PNG" />
@@ -289,27 +289,30 @@
 <para>The functions available through the context menu are:</para>
 
 <sect4 id="lm3"><title>List management</title>
+<para>These menu entries modify the current <link linkend="items-management">Items \
List</link></para>  <itemizedlist>
 <listitem>
 <para><guimenu>Add to list</guimenu></para>
-<para>Adds the selectded items to the Items list</para>
+<para>Adds the selectded items (items in the Selection List) to the Items \
List</para>  </listitem>
 <listitem>
 <para><guimenu>Remove from list</guimenu></para>
-<para>Removes the selectded items from the Items list</para>
+<para>Removes the selectded items (items in the Selection List) from the Items \
List</para>  </listitem>
 <listitem>
 <para><guimenu>Invert list</guimenu></para>
-<para>Inverts the Items list. <!--If both files and folders are to be inserted to \
the Items list,--> </para> +<para>Removes from the Items List all items that were \
contained within, and inserts all items that were not.</para> +<para>If the target \
folder contains files and sub-folders, a type inversion accrues when all items of one \
type are selected. For example, when all folders are already in the Items List, they \
will be removed after its execution, and all files will be inserted to the it.</para> \
</listitem>  <listitem>
 <para><guimenu>Create list from selection</guimenu></para>
-<para>Replaces the Items list with the selected items</para>
+<para>Replaces the Items List with the selected items (items in the Selection \
List)</para>  </listitem>
 </itemizedlist>
 
 </sect4>
 <sect4 id="sel3"><title>Selection management</title>
+<para>These menu entries modify the current <link \
linkend="items-management">Selection List</link></para>  <itemizedlist>
 <listitem>
 <para><guimenu>All items</guimenu></para>
@@ -317,15 +320,15 @@
 </listitem>
 <listitem>
 <para><guimenu>All items of selected type</guimenu></para>
-<para>Selects all items of selected type</para>
+<para>Selects all items of selected type, that is all files or all folders</para>
 </listitem>
 <listitem>
 <para><guimenu>Invert current selection</guimenu></para>
-<para>Inverts the currently selected items</para>
+<para>Selects all items that were not selected previously, and deselects all items \
that were</para>  </listitem>
 <listitem>
 <para><guimenu>Create selection from list</guimenu></para>
-<para>Selects all items from the Items list</para>
+<para>Selects all items contained in the Items List</para>
 </listitem>
 <listitem>
 <para><guimenu>Items containing a string</guimenu></para>
--- trunk/playground/utils/gwenrename/rename.ui.h #780888:780889
@@ -2954,26 +2954,24 @@
 			filesFound++;
 		else
 			dirsFound++;
-		if(!g.ren[k].selected){
+		if(!g.ren[k].selected)
 			itemsToManipulate++;
+		else
 			if(g.whatType(k)==1)
 				filesSelected++;
 			else
 				dirsSelected++;
-		}
 	}
-	if(filesFound==filesSelected && dirsFound>0)
+	if((filesFound==filesSelected && dirsFound>0) || dirsSelected!=0)
 		filesSelectedType=2;
-	else if(dirsFound==dirsSelected && filesFound>0)
+	else if((dirsFound==dirsSelected && filesFound>0) || filesSelected!=0)
 		filesSelectedType=1;
-	else{
+	else
 		if(filesFound>dirsFound)
 			filesSelectedType=1;
 		else if(filesFound<dirsFound)
 			filesSelectedType=2;
-	}
 	for(int k=0;k<g.numOfFiles;k++){
-// 		g.resetFileName(k);
 		g.ren[k].selected=!g.ren[k].selected;
 		if(g.ren[k].selected){
 			readName=g.ren[k].oldFileName;


[prev in list] [next in list] [prev in thread] [next in thread]