[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 19:20:44
Message-ID: 1199042444.885075.1227.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 754800 by sngeorgaras:
adding locationbar_erase.png, fixing misc stuff
M +31 -26 dirsdata.cpp
M +1 -0 dirsdata.h
M +29 -2 inputdir.ui
M +3 -0 inputdir.ui.h
M +5 -0 main.cpp
M +13 -2 rename.ui.h
--- trunk/playground/utils/gwenrename/dirsdata.cpp #754799:754800
@@ -134,31 +134,35 @@
ren=new newFile[numOfFiles];
if(ren==NULL) return -1;
for(int k=0;k<numOfFiles;k++){
- ren[k].oldFileName=files[k].filePath();
- ren[k].newFileName=files[k].filePath();
- ren[k].oldName=files[k].baseName(TRUE);
- ren[k].oldExtension=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;
+ resetFileNames(k);
ren[k].selected=select;
}
}
return 0;
}
//================================
+void dirsData::resetFileNames(int k){
+ ren[k].oldFileName=files[k].filePath();
+ ren[k].newFileName=files[k].filePath();
+ ren[k].oldName=files[k].baseName(TRUE);
+ ren[k].oldExtension=files[k].extension(FALSE);
+// qWarning("dirsData::resetFileNames() - ren[k].oldFileName = \
%s",ren[k].oldFileName.latin1()); +// qWarning("dirsData::resetFileNames() - \
ren[k].oldName = %s",ren[k].oldName.latin1()); +// \
qWarning("dirsData::resetFileNames() - ren[k].oldExtension = \
%s",ren[k].oldExtension.latin1()); +// qWarning("dirsData::resetFileNames() - \
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::resetFileNames() - fixed ren[k].oldExtension = \
%s",ren[k].oldExtension.latin1()); +// qWarning("dirsData::resetFileNames() - 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;
+}
+//================================
int dirsData::getSorted(int i){
if(sortID) return sort[i]; //return i; //return sort[i];
return i;
@@ -178,14 +182,15 @@
return -1;
}
for(int i=0;i<items();i++) sort[i]=i;
- for(int i=0,l=0;i<items();i++) if(ren[i].selected){
- int j=ren[i].oldName.length();
- if(max<j){
- max=j;
- maxID=l;
+ for(int i=0,l=0;i<items();i++)
+ if(ren[i].selected){
+ int j=ren[i].oldName.length();
+ if(max<j){
+ max=j;
+ maxID=l;
+ }
+ l++;
}
- l++;
- }
while(max>k){
for(int i=0,l=0;i<items();i++) if(ren[i].selected){
isEqual=TRUE;
--- trunk/playground/utils/gwenrename/dirsdata.h #754799:754800
@@ -65,6 +65,7 @@
newFile * ren;
int setLink(filesData * b);
int setFilesInDir(bool select);
+ void resetFileNames(int k);
int numOfDigits;
int getSorted(int i);
int setSortValue(bool state);
--- trunk/playground/utils/gwenrename/inputdir.ui #754799:754800
@@ -82,12 +82,32 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>layout5</cstring>
</property>
<hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
+ <widget class="QToolButton">
+ <property name="name">
+ <cstring>eraseLocBar</cstring>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>30</width>
+ <height>30</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>30</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ </widget>
<widget class="QLabel">
<property name="name">
<cstring>textLabel1</cstring>
@@ -156,7 +176,7 @@
</property>
<property name="sizeHint">
<size>
- <width>31</width>
+ <width>200</width>
<height>20</height>
</size>
</property>
@@ -274,6 +294,12 @@
<receiver>InputDir</receiver>
<slot>openDirSelectionDialog()</slot>
</connection>
+ <connection>
+ <sender>eraseLocBar</sender>
+ <signal>clicked()</signal>
+ <receiver>InputDir</receiver>
+ <slot>eraseLocationBar()</slot>
+ </connection>
</connections>
<includes>
<include location="global" impldecl="in declaration">kfiledialog.h</include>
@@ -290,6 +316,7 @@
<slot access="private">openDirSelectionDialog()</slot>
<slot access="private">textHasChanged( const QString & txt )</slot>
<slot access="private">buttonOkClicked()</slot>
+ <slot access="private">eraseLocationBar()</slot>
</slots>
<functions>
<function access="private">init()</function>
--- trunk/playground/utils/gwenrename/inputdir.ui.h #754799:754800
@@ -83,3 +83,6 @@
accept();
}
+void InputDir::eraseLocationBar(){
+ dir->setCurrentText(QString::null);
+}
--- trunk/playground/utils/gwenrename/main.cpp #754799:754800
@@ -94,11 +94,15 @@
picture=QStringList("16x16/filesystems/folder.png");
picture+="gwenrename/icons/hicolor/16x16/actions/folder.png";
dialogsIcons.loadIcon(picture,1);
+ picture=QStringList("16x16/actions/locationbar_erase.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png";
+ dialogsIcons.loadIcon(picture,2);
if(argc<2){
inp=new InputDir();
inp->pix->setPixmap(dialogsIcons.Icon(0));
inp->btOpen->setPixmap(dialogsIcons.Icon(1));
+ inp->eraseLocBar->setPixmap(dialogsIcons.Icon(2));
if(inp->exec()){
askDir=inp->dir->currentText();
askResult=1;
@@ -116,6 +120,7 @@
inp=new InputDir();
inp->pix->setPixmap(dialogsIcons.Icon(0));
inp->btOpen->setPixmap(dialogsIcons.Icon(1));
+ inp->eraseLocBar->setPixmap(dialogsIcons.Icon(2));
if(inp->exec()){
askDir=inp->dir->currentText();
askResult=1;
--- trunk/playground/utils/gwenrename/rename.ui.h #754799:754800
@@ -2509,8 +2509,15 @@
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);
+ filesSelectedType=-2;
+ for(int k=0;k<g.numOfFiles;k++)
+ if(g.ren[k].selected){
+ filesSelectedType=g.whatType(k);
+ break;
+ }
+// qWarning(" - filesSelectedType = %d",filesSelectedType);
-// qWarning("filesSelectedType = %d",filesSelectedType);
if(filesSelectedType==2){
if(rShuffle->isChecked()) reRandomize->setEnabled(TRUE);
rSelExt->setEnabled(FALSE);
@@ -2524,7 +2531,9 @@
rUExt->setEnabled(TRUE);
extBox->setEnabled(TRUE);
}
-
+ for(int k=0;k<g.numOfFiles;k++)
+ if(g.ren[k].selected)
+ g.resetFileNames(k);
if(itemsSkipped<itemsToManipulate) updateAfterSelection();
}
@@ -2532,6 +2541,8 @@
void GwenRename::updateAfterSelection( void ){
int allSelected=0;
+ g.resetHasbeenSorted();
+ sortToggled(sort->isChecked());
for(int k=0;k<g.numOfFiles;k++)
if(g.ren[k].selected) allSelected++;
lSelected->setText(QString(i18n("%1/%2 items \
selected")).arg(allSelected).arg(g.numOfFiles));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic