[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:       2007-12-30 17:29:40
Message-ID: 1199035780.649155.29060.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 754759 by sngeorgaras:

fixing directory extension error

 M  +26 -4     dirsdata.cpp  
 M  +22 -2     rename.ui.h  


--- trunk/playground/utils/gwenrename/dirsdata.cpp #754758:754759
@@ -95,9 +95,20 @@
 			ren[k].oldFileName=files[k].filePath();
 			ren[k].newFileName=files[k].filePath();
 			ren[k].oldName=files[k].baseName(TRUE);
-			ren[k].newName=files[k].baseName(TRUE);
 			ren[k].oldExtension=files[k].extension(FALSE);
-			ren[k].newExtension=files[k].extension(FALSE);
+// 			qWarning("dirsData::setLink() - ren[k].oldFileName = \
%s",ren[k].oldFileName.latin1()); +// 			qWarning("dirsData::setLink() - \
ren[k].oldName = %s",ren[k].oldName.latin1()); +// 			qWarning("dirsData::setLink() - \
ren[k].oldExtension = %s",ren[k].oldExtension.latin1()); +// \
qWarning("dirsData::setLink() - b->getType() = %d",b->getType()); \
+			if(b->getType()==2) +				if(!ren[k].oldExtension.isEmpty()){
+					ren[k].oldName=ren[k].oldName+"."+ren[k].oldExtension;
+					ren[k].oldExtension=QString::null;
+			}
+// 			qWarning("dirsData::setLink() - fixed ren[k].oldExtension = \
%s",ren[k].oldExtension.latin1()); +// 			qWarning("dirsData::setLink() - fixed \
ren[k].oldName = %s",ren[k].oldName.latin1()); +			ren[k].newName=ren[k].oldName;
+			ren[k].newExtension=ren[k].oldExtension;
 			if(files[k].isDir()) ren[k].isDir=TRUE;
 			else ren[k].isDir=FALSE;
 			ren[k].selected=FALSE;
@@ -126,9 +137,20 @@
 			ren[k].oldFileName=files[k].filePath();
 			ren[k].newFileName=files[k].filePath();
 			ren[k].oldName=files[k].baseName(TRUE);
-			ren[k].newName=files[k].baseName(TRUE);
 			ren[k].oldExtension=files[k].extension(FALSE);
-			ren[k].newExtension=files[k].extension(FALSE);
+// 			qWarning("dirsData::setFilesInDir() - ren[k].oldFileName = \
%s",ren[k].oldFileName.latin1()); +// 			qWarning("dirsData::setFilesInDir() - \
ren[k].oldName = %s",ren[k].oldName.latin1()); +// \
qWarning("dirsData::setFilesInDir() - ren[k].oldExtension = \
%s",ren[k].oldExtension.latin1()); +// 			qWarning("dirsData::setFilesInDir() - \
b->getType() = %d",getType()); +			if(files[k].isDir())
+				if(!ren[k].oldExtension.isEmpty()){
+					ren[k].oldName=ren[k].oldName+"."+ren[k].oldExtension;
+					ren[k].oldExtension=QString::null;
+			}
+// 			qWarning("dirsData::setFilesInDir() - fixed ren[k].oldExtension = \
%s",ren[k].oldExtension.latin1()); +// 			qWarning("dirsData::setFilesInDir() - fixed \
ren[k].oldName = %s",ren[k].oldName.latin1()); +			ren[k].newName=ren[k].oldName;
+			ren[k].newExtension=ren[k].oldExtension;
 			if(files[k].isDir()) ren[k].isDir=TRUE;
 			else ren[k].isDir=FALSE;
 			ren[k].selected=select;
--- trunk/playground/utils/gwenrename/rename.ui.h #754758:754759
@@ -691,8 +691,10 @@
 		else rLExt->setFocus();
 		for(int i=0;i<g.numOfFiles;i++){
 			if(g.ren[g.getSorted(i)].selected){
-				if(rLExt->isChecked()) \
                g.ren[g.getSorted(i)].newExtension=g.ren[g.getSorted(i)].oldExtension.lower();
                
-				else if(rUExt->isChecked()) \
g.ren[g.getSorted(i)].newExtension=g.ren[g.getSorted(i)].oldExtension.upper(); \
+				if(rLExt->isChecked()) \
+					g.ren[g.getSorted(i)].newExtension=g.ren[g.getSorted(i)].oldExtension.lower(); \
+				else if(rUExt->isChecked()) \
                +					g.ren[g.getSorted(i)].newExtension=g.ren[g.getSorted(i)].oldExtension.upper();
                
 				else g.ren[g.getSorted(i)].newExtension=g.ren[g.getSorted(i)].oldExtension;
 			}
 		}
@@ -1208,6 +1210,8 @@
 }
 //================================
 void GwenRename::updateCounterView(){
+	if(lSelected->text().startsWith("0"))
+		return;
 	if(countEnable->isChecked())
 		frmCounter->setEnabled(TRUE);
 	else
@@ -2505,6 +2509,22 @@
 			msg="<p>"+i18n("The following problems \
occured:")+"</p><ol>"+msg+"</ol><p>"+i18n("Items present in this list will not be \
available for renaming!!!")+"</p>";  \
KMessageBox::information(this,msg,QString::null,QString::null,KMessageBox::AllowLink);
  }
+	
+// 	qWarning("filesSelectedType = %d",filesSelectedType);
+	if(filesSelectedType==2){
+		if(rShuffle->isChecked()) reRandomize->setEnabled(TRUE);
+		rSelExt->setEnabled(FALSE);
+		rLExt->setEnabled(FALSE);
+		rUExt->setEnabled(FALSE);
+		extBox->setEnabled(FALSE);
+	}else{
+		reRandomize->setEnabled(FALSE);
+		rSelExt->setEnabled(TRUE);
+		rLExt->setEnabled(TRUE);
+		rUExt->setEnabled(TRUE);
+		extBox->setEnabled(TRUE);
+	}
+	
 	if(itemsSkipped<itemsToManipulate) updateAfterSelection();
 }
 


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