CVS commit by jahrens:
Changed drag'n'drop popup menues to make them look like other kde applications
CCMAIL: digikam-devel@...
M +14 -10 albumfolderview.cpp 1.15
M +6 -4 albumiconview.cpp 1.53
--- kdeextragear-3/digikam/digikam/albumfolderview.cpp #1.14:1.15
@@ -1088,6 +1088,8 @@ void AlbumFolderView::phyAlbumDropEvent(
QPopupMenu popMenu(this);
- popMenu.insertItem( i18n("&Copy"), 10 );
- popMenu.insertItem( i18n("&Move"), 11 );
+ popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
+ popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertSeparator(-1);
+ popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
popMenu.setMouseTracking(true);
@@ -1103,5 +1105,5 @@ void AlbumFolderView::phyAlbumDropEvent(
AlbumFileCopyMove* io = new AlbumFileCopyMove(srcAlbum, destAlbum,
- fileList, false);
+ fileList, true);
break;
}
@@ -1114,5 +1116,5 @@ void AlbumFolderView::phyAlbumDropEvent(
AlbumFileCopyMove* io = new AlbumFileCopyMove(srcAlbum, destAlbum,
- fileList, true);
+ fileList, false);
break;
}
@@ -1132,6 +1134,8 @@ void AlbumFolderView::phyAlbumDropEvent(
QPopupMenu popMenu(this);
- popMenu.insertItem( i18n("&Copy"), 10 );
- popMenu.insertItem( i18n("&Move"), 11 );
+ popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
+ popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertSeparator(-1);
+ popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
popMenu.setMouseTracking(true);
@@ -1139,9 +1143,9 @@ void AlbumFolderView::phyAlbumDropEvent(
switch(id) {
case 10: {
- KIO::copy(srcURLs,destURL,true);
+ KIO::move(srcURLs,destURL,true);
break;
}
case 11: {
- KIO::move(srcURLs,destURL,true);
+ KIO::copy(srcURLs,destURL,true);
break;
}
--- kdeextragear-3/digikam/digikam/albumiconview.cpp #1.52:1.53
@@ -1151,6 +1151,8 @@ void AlbumIconView::contentsDropEvent(QD
QPopupMenu popMenu(this);
- popMenu.insertItem( i18n("&Copy"), 10 );
- popMenu.insertItem( i18n("&Move"), 11 );
+ popMenu.insertItem( SmallIcon("goto"), i18n("&Move Here"), 10 );
+ popMenu.insertItem( SmallIcon("editcopy"), i18n("&Copy Here"), 11 );
+ popMenu.insertSeparator(-1);
+ popMenu.insertItem( SmallIcon("cancel"), i18n("C&ancel") );
popMenu.setMouseTracking(true);
@@ -1158,9 +1160,9 @@ void AlbumIconView::contentsDropEvent(QD
switch(id) {
case 10: {
- KIO::copy(srcURLs,destURL,true);
+ KIO::move(srcURLs,destURL,true);
break;
}
case 11: {
- KIO::move(srcURLs,destURL,true);
+ KIO::copy(srcURLs,destURL,true);
break;
}
|