[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-01-04 19:25:50
Message-ID: 1199474750.877926.29288.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 757350 by sngeorgaras:
fixing conflict presentation, using own icons for listview, adding icon for future \
use
M +4 -0 Makefile.am
M +6 -0 dirsdata.cpp
M +1 -0 dirsdata.h
M +67 -118 rename.ui.h
AM stop.png
--- trunk/playground/utils/gwenrename/Makefile.am #757349:757350
@@ -46,6 +46,8 @@
$(INSTALL_DATA) $(srcdir)/pencil.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/pencil.png $(INSTALL_DATA) \
$(srcdir)/redo.png $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/redo.png \
$(INSTALL_DATA) $(srcdir)/folder.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/folder.png + $(INSTALL_DATA) \
$(srcdir)/locationbar_erase.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png \
+ $(INSTALL_DATA) $(srcdir)/stop.png \
$(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/stop.png
uninstall-local:
-rm -f $(kde_datadir)/konqueror/servicemenus/konqgwenrename.desktop
@@ -61,6 +63,8 @@
-rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/pencil.png
-rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/redo.png
-rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/folder.png
+ -rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png
+ -rm -f $(kde_datadir)/gwenrename/icons/hicolor/16x16/actions/stop.png
# this is where the desktop file will go
shelldesktopdir = $(kde_appsdir)/Utilities
--- trunk/playground/utils/gwenrename/dirsdata.cpp #757349:757350
@@ -118,8 +118,10 @@
if(!ren[k].selected){
if(b->files[i].filePath()==ren[k].oldFileName){
ren[k].selected=TRUE;
+ ren[k].iconID=0;
}else{
ren[k].selected=FALSE;
+ ren[k].iconID=-1;
}
}
}
@@ -136,6 +138,10 @@
for(int k=0;k<numOfFiles;k++){
resetFileNames(k);
ren[k].selected=select;
+ if(select)
+ ren[k].iconID=0;
+ else
+ ren[k].iconID=-1;
}
}
return 0;
--- trunk/playground/utils/gwenrename/dirsdata.h #757349:757350
@@ -50,6 +50,7 @@
QString Suffix;
QString newSuffix;
QString Prefix;
+ int iconID;
int inc;
int randomNum;
bool selected;
--- trunk/playground/utils/gwenrename/rename.ui.h #757349:757350
@@ -127,43 +127,24 @@
filesSelectedType=-2;
cmbExt->setDuplicatesEnabled(FALSE);
activeExtension=0;
-// countEnable->setText(countEnable->text()+" >>");
loadIcons();
popT = new KPopupMenu();
-// popT->setKeyboardShortcutsEnabled(true);
popT->insertTitle(i18n("Multiple file selection"));
popT->insertItem(i18n("All items"),this,SLOT(mnuSelectAll()));
itemsOfSelectedType=popT->insertItem(i18n("All items of selected \
type"),this,SLOT(mnuSelectByType()));
-// popT->setAccel(META + Key_F2,itemsOfSelectedType);
popT->insertSeparator();
popT->insertItem(i18n("Invert current selection"),this,SLOT(mnuInvertSelection()));
popT->insertSeparator();
popT->insertItem(i18n("Items containing a \
string"),this,SLOT(mnuShowSelectionDialog()));
-
popM= new KPopupMenu();
popM->insertTitle(i18n("Manage files"));
-// popM->insertItem(ic.Icon(11),1,1);
-// popM->changeItem(1,i18n("Add to list"));
addToListID=popM->insertItem(i18n("Add to list"),this,SLOT(AddToList()));
- //popM->setAccel( Qt::UNICODE_ACCEL | CTRL + Key_A, addToListID );
-// popM->changeItem(1,ic.Icon(11));
popM->insertItem(i18n("Remove from list"),this,SLOT(RemoveFromList()));
-// popM->changeItem(2,ic.Icon(12));
popM->insertSeparator();
-
-
-
-
- //popM->insertItem(i18n("Multiple file \
selection"),this,SLOT(selectMultipleFiles())); \
selectMenuID=popM->insertItem(i18n("Multiple file selection"),popT);
-
-
-
-// popM->insertSeparator();
-// popM->insertItem(i18n("Adjust part of the original \
name"),this,SLOT(AdjustPartName()));
-// popM->changeItem(4,ic.Icon(10));
+
setIcon(ic.Icon(9));
rName->setSizeLimit(HISTORY_ITEMS+1);
nPref->setSizeLimit(HISTORY_ITEMS+1);
@@ -175,14 +156,13 @@
prLoad->setPixmap(ic.Icon(3));
prNew->setPixmap(ic.Icon(4));
prEdit->setPixmap(ic.Icon(5));
- prSave->setPixmap(ic.Icon(6));
- prDelete->setPixmap(ic.Icon(7));
+ prSave->setPixmap(ic.Icon(12));
+ prDelete->setPixmap(ic.Icon(13));
reRandomize->setPixmap(ic.Icon(8));
partName->setPixmap(ic.Icon(10));
-
btNewExt->setPixmap(ic.Icon(4));
- btSaveExt->setPixmap(ic.Icon(6));
- btDelExt->setPixmap(ic.Icon(7));
+ btSaveExt->setPixmap(ic.Icon(12));
+ btDelExt->setPixmap(ic.Icon(13));
View->addColumn( "",35);
View->header()->setResizeEnabled( FALSE, View->header()->count() - 1 );
@@ -203,29 +183,11 @@
cmbProfile->setDuplicatesEnabled(FALSE);
cmbProfile->insertItem( "GwenRename" );
pr.oldName=QString::null;
-// QRect rect=geometry();
-// rect.setRight(10);
-// rect.setHeight(10);
-// setGeometry(rect);
readConfig();
lSelected->setText(QString(i18n("%1/%2 items \
selected")).arg(f.items(),0,10).arg(g.numOfFiles,0,10)); if(f.Type==2){
rShuffle->setEnabled(TRUE);
-// if(f.items()==g.numOfFiles){
-// rShow->setText(i18n("Show all folders"));
-// lSelected->setText(QString(i18n("%1/%2 folders \
selected")).arg(f.items(),0,10).arg(g.numOfFiles,0,10));
-// }else{
-// rShow->setText(i18n("Show all items"));
-// lSelected->setText(QString(i18n("%1/%2 items \
selected")).arg(f.items(),0,10).arg(g.numOfFiles,0,10));
-// }
}else{
-// if(f.items()==g.numOfFiles){
-// rShow->setText(i18n("Show all files"));
-// lSelected->setText(QString(i18n("%1/%2 files \
selected")).arg(f.items(),0,10).arg(g.numOfFiles,0,10));
-// }else{
-// rShow->setText(i18n("Show all items"));
-// lSelected->setText(QString(i18n("%1/%2 items \
selected")).arg(f.items(),0,10).arg(g.numOfFiles,0,10));
-// }
rShuffle->setEnabled(FALSE);
reRandomize->setEnabled(FALSE);
}
@@ -719,32 +681,33 @@
for(int i=0,k=0;i<g.numOfFiles;i++){
if(g.ren[g.getSorted(i)].selected){
QString firstColumn, secondColumn;
- int icon=-1;
if(k!=0) item = new KListViewItem( View, item );
k++;
if(g.ren[g.getSorted(i)].isDir){
- if(rShow->isEnabled() && rShow->isChecked()){
firstColumn="/"+g.ren[g.getSorted(i)].oldName;
secondColumn="/"+g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i)].newSuffix;
- }else{
- firstColumn=g.ren[g.getSorted(i)].oldName;
- secondColumn=g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i)].newSuffix;
- }
}else{
- if(g.ren[g.getSorted(i)].oldExtension.isEmpty()) \
firstColumn=g.ren[g.getSorted(i)].oldName;
- else firstColumn=g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension;
- if(!g.ren[g.getSorted(i)].newExtension.isEmpty()) \
secondColumn=g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i)].newSuffix+"."+g.ren[g.getSorted(i)].newExtension;
- else secondColumn=g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i)].newSuffix;
+ firstColumn=g.files[g.getSorted(i)].fileName();
+ if(!g.ren[g.getSorted(i)].newExtension.isEmpty())
+ secondColumn=g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i)].newSuffix+"."+g.ren[g.getSorted(i)].newExtension;
+ else
+ secondColumn=g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i)].newSuffix;
}
+
// fix icon
- if(g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i \
)].newSuffix+"."+g.ren[g.getSorted(i)].newExtension==g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension) \
icon=pix_invalid;
- else if(g.ren[g.getSorted(i)].newFileName==f.files[0].dirPath() + "/" || \
g.ren[g.getSorted(i)].newFileName==f.files[0].dirPath() + "/." + \
g.ren[g.getSorted(i)].newExtension) icon=7;
- else icon=pix_valid;
+ if(g.ren[g.getSorted(i)].newName+g.ren[g.getSorted(i)].Counter+g.ren[g.getSorted(i \
)].newSuffix+"."+g.ren[g.getSorted(i)].newExtension==g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension)
+ g.ren[g.getSorted(i)].iconID=pix_invalid;
+ else if(g.ren[g.getSorted(i)].newFileName==f.files[0].dirPath() + "/" || \
g.ren[g.getSorted(i)].newFileName==f.files[0].dirPath() + "/." + \
g.ren[g.getSorted(i)].newExtension) + g.ren[g.getSorted(i)].iconID=7;
+ else
+ g.ren[g.getSorted(i)].iconID=pix_valid;
+ noDoubleNewName();
// load them to the list
item->setText( 1, firstColumn);
item->setText( 2, secondColumn);
- if(icon!=-1){
- item->setPixmap(0,ic.Icon(icon));
+ if(g.ren[g.getSorted(i)].iconID!=-1){
+// g.ren[g.getSorted(i)].iconID=icon;
+ item->setPixmap(0,ic.Icon(g.ren[g.getSorted(i)].iconID));
item->setText( 0," ");
}
if(!VisibleItemSet){
@@ -755,42 +718,12 @@
if(val!=0){
if(k!=0) item = new KListViewItem( View, item );
k++;
-
-
- QString toItem1,toItem2;
-
- if(g.ren[g.getSorted(i)].oldExtension.isEmpty()){
- toItem1=g.ren[g.getSorted(i)].oldName;
- toItem2=g.ren[g.getSorted(i)].oldName;
- }else{
- toItem1=g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension;
- toItem2=g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension;
- }
-
- if(g.ren[g.getSorted(i)].isDir){
+ QString toItem1;
+ toItem1=g.files[g.getSorted(i)].fileName();
+ if(g.ren[g.getSorted(i)].isDir)
toItem1.prepend("/");
- toItem2.prepend("/");
- }
item->setText( 1, toItem1);
- item->setText( 2, toItem2);
-
-// if(g.ren[g.getSorted(i)].isDir){
-// if(g.ren[g.getSorted(i)].oldExtension.isEmpty()){
-// item->setText( 1,"/"+g.ren[g.getSorted(i)].oldName);
-// item->setText( 2,"/"+g.ren[g.getSorted(i)].oldName);
-// }else{
-// item->setText( \
1,"/"+g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension);
-// item->setText( \
2,"/"+g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension);
-// }
-// }else{
-// if(g.ren[g.getSorted(i)].oldExtension.isEmpty()){
-// item->setText( 1,g.ren[g.getSorted(i)].oldName);
-// item->setText( 2,g.ren[g.getSorted(i)].oldName);
-// }else{
-// item->setText( \
1,g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension);
-// item->setText( \
2,g.ren[g.getSorted(i)].oldName+"."+g.ren[g.getSorted(i)].oldExtension);
-// }
-// }
+ item->setText( 2, toItem1);
}
}
}
@@ -1369,10 +1302,11 @@
//================================
void GwenRename::fixbuttonOk(){
buttonOk->setEnabled(FALSE);
+ for(int k=0;k<g.numOfFiles;k++)
+ if(g.ren[k].selected && g.ren[k].iconID==7)
+ return;
if(getSameNewName()!=-1)
return;
- if(noDoubleNewName()!=-1)
- return;
for(int i=0;i<g.numOfFiles;i++){
if(g.ren[g.getSorted(i)].selected){
if(g.ren[g.getSorted(i)].oldFileName!=g.ren[g.getSorted(i)].newFileName){
@@ -1385,25 +1319,25 @@
}
//================================
int GwenRename::noDoubleNewName(){
- QListViewItemIterator it( View );
- for ( ; it.current(); ++it ){
- if(it.current()->pixmap(0)){ // item is selected for remaming
- // search in list
- QString thisItem=it.current()->text(2);
- QListViewItemIterator ch( View );
- for ( ; ch.current(); ++ch ){
- if(!ch.current()->pixmap(0)){ // item is NOT selected for remaming
- if(ch.current()->text(1)==thisItem){
- it.current()->setPixmap(0,ic.Icon(7));
-// qWarning("returning 1");
- return 1;
+ QString thisItem;
+ int res=-1;
+ for (int i=0;i<g.numOfFiles;i++)
+ if(g.ren[i].selected){ // item is selected for remaming
+// firstColumn=g.files[g.getSorted(i)].fileName();
+ if(!g.ren[i].newExtension.isEmpty())
+ thisItem=g.ren[i].newName+g.ren[i].Counter+g.ren[i].newSuffix+"."+g.ren[i].newExtension;
+ else
+ thisItem=g.ren[g.getSorted(i)].newName+g.ren[i].Counter+g.ren[i].newSuffix;
+ for(int k=0;k<g.numOfFiles;k++)
+ if(!g.ren[k].selected){ // item is NOT selected for remaming
+ if(thisItem==g.files[k].fileName()){
+ g.ren[i].iconID=7;
+ res=1;
+ break;
+ }
}
- }
- }
}
- }
-// qWarning("returning -1");
- return -1;
+ return res;
}
//================================
int GwenRename::getRandom(){
@@ -2283,12 +2217,12 @@
picture+="16x16/actions/color_line.png";
picture+="gwenrename/icons/hicolor/16x16/actions/pencil.png";
if(ic.loadIcon(picture,5)==-1) errorExists++;
- picture=QStringList("16x16/actions/button_ok.png");
+ picture=QStringList("gwenrename/icons/hicolor/16x16/actions/button_ok.png");
+ picture+="16x16/actions/button_ok.png";
picture+="16x16/actions/apply.png";
- picture+="gwenrename/icons/hicolor/16x16/actions/button_ok.png";
if(ic.loadIcon(picture,6)==-1) errorExists++;
- picture=QStringList("16x16/actions/button_cancel.png");
- picture+="gwenrename/icons/hicolor/16x16/actions/button_cancel.png";
+ picture=QStringList("gwenrename/icons/hicolor/16x16/actions/button_cancel.png");
+ picture+="16x16/actions/button_cancel.png";
if( ic.loadIcon(picture,7)==-1) errorExists++;
picture=QStringList("16x16/actions/redo.png");
picture+="gwenrename/icons/hicolor/16x16/actions/redo.png";
@@ -2301,6 +2235,16 @@
picture=QStringList("16x16/actions/locationbar_erase.png");
picture+="gwenrename/icons/hicolor/16x16/actions/locationbar_erase.png";
if(ic.loadIcon(picture,11)==-1) errorExists++;
+ picture=QStringList("16x16/actions/button_ok.png");
+ picture+="16x16/actions/apply.png";
+ picture+="gwenrename/icons/hicolor/16x16/actions/button_ok.png";
+ if(ic.loadIcon(picture,12)==-1) errorExists++;
+ picture=QStringList("16x16/actions/button_cancel.png");
+ picture+="gwenrename/icons/hicolor/16x16/actions/button_cancel.png";
+ if( ic.loadIcon(picture,13)==-1) errorExists++;
+ picture=QStringList("gwenrename/icons/hicolor/16x16/actions/stop.png");
+ picture+="16x16/actions/stop.png";
+ if( ic.loadIcon(picture,14)==-1) errorExists++;
// picture=QStringList("16x16/actions/add.png");
// if(ic.loadIcon(picture,11)==-1) errorExists++;
// picture=QStringList("16x16/actions/remove.png");
@@ -2424,8 +2368,10 @@
if (rShow->isChecked()){
popM->setItemEnabled(addToListID,true);
popM->setItemEnabled(selectMenuID,true);
- if(filesSelectedType==-2) popT->setItemEnabled(itemsOfSelectedType,false);
- else popT->setItemEnabled(itemsOfSelectedType,true);
+ if(filesSelectedType==-2)
+ popT->setItemEnabled(itemsOfSelectedType,false);
+ else
+ popT->setItemEnabled(itemsOfSelectedType,true);
}else{
popM->setItemEnabled(addToListID,false);
popM->setItemEnabled(selectMenuID,false);
@@ -2584,13 +2530,16 @@
void GwenRename::setNewFileData( int id, bool state ){
g.ren[id].selected=state;
- if(!state){
+ if(state)
+ g.ren[id].iconID=0;
+ else{
// reset this item
g.ren[id].newFileName=QString::null;
g.ren[id].newTmpFileName=QString::null;
g.ren[id].newName=QString::null;
g.ren[id].newTmpName=QString::null;
g.ren[id].newExtension=QString::null;
+ g.ren[id].iconID=-1;
}
}
** trunk/playground/utils/gwenrename/stop.png #property svn:mime-type
+ application/octet-stream
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic