summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp65
1 files changed, 50 insertions, 15 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index faa03dc..bd513c0 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -834,7 +834,6 @@ void AdvancedFm::localDelete()
834 break; 834 break;
835 }; 835 };
836 } 836 }
837
838 } 837 }
839} 838}
840 839
@@ -1140,8 +1139,14 @@ void AdvancedFm::copy()
1140 if (TabWidget->currentPageIndex() == 0) { 1139 if (TabWidget->currentPageIndex() == 0) {
1141 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 1140 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
1142 1141
1143 QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it); 1142 QString destFile = currentRemoteDir.canonicalPath();
1144 curFile = currentDir.canonicalPath()+"/"+(*it); 1143 if(destFile.right(1).find("/",0,TRUE) == -1)
1144 destFile+="/";
1145 destFile +=(*it);
1146 curFile = currentDir.canonicalPath();
1147 if(curFile.right(1).find("/",0,TRUE) == -1)
1148 curFile +="/";
1149 curFile +=(*it);
1145 QFile f(destFile); 1150 QFile f(destFile);
1146 if( f.exists()) 1151 if( f.exists())
1147 f.remove(); 1152 f.remove();
@@ -1154,8 +1159,14 @@ void AdvancedFm::copy()
1154 } else { 1159 } else {
1155 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 1160 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
1156 1161
1157 QString destFile = currentDir.canonicalPath()+"/"+(*it); 1162 QString destFile = currentDir.canonicalPath();
1158 curFile = currentRemoteDir.canonicalPath()+"/"+(*it); 1163 if(destFile.right(1).find("/",0,TRUE) == -1)
1164 destFile+="/";
1165 destFile +=(*it);
1166 curFile = currentRemoteDir.canonicalPath();
1167 if(curFile.right(1).find("/",0,TRUE) == -1)
1168 curFile +="/";
1169 curFile +=(*it);
1159 QFile f(destFile); 1170 QFile f(destFile);
1160 if( f.exists()) 1171 if( f.exists())
1161 f.remove(); 1172 f.remove();
@@ -1176,15 +1187,21 @@ void AdvancedFm::copyAs()
1176 1187
1177 if (TabWidget->currentPageIndex() == 0) { 1188 if (TabWidget->currentPageIndex() == 0) {
1178 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 1189 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
1179 QString destFile = *it; 1190 QString destFile;
1180 curFile = currentDir.canonicalPath()+"/"+(*it); 1191 curFile = currentDir.canonicalPath();
1192 if(curFile.right(1).find("/",0,TRUE) == -1)
1193 curFile +="/";
1194 curFile+=(*it);
1181// InputDialog *fileDlg; 1195// InputDialog *fileDlg;
1182// fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0); 1196// fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
1183 fileDlg->setInputText((const QString &) destFile ); 1197 fileDlg->setInputText((const QString &) destFile );
1184 fileDlg->exec(); 1198 fileDlg->exec();
1185 if( fileDlg->result() == 1 ) { 1199 if( fileDlg->result() == 1 ) {
1186 QString filename = fileDlg->LineEdit1->text(); 1200 QString filename = fileDlg->LineEdit1->text();
1187 destFile = currentRemoteDir.canonicalPath()+"/"+destFile; 1201 destFile = currentRemoteDir.canonicalPath();
1202 if(destFile.right(1).find("/",0,TRUE) == -1)
1203 destFile+="/";
1204 destFile +=(*it);
1188 1205
1189 QFile f(destFile); 1206 QFile f(destFile);
1190 if( f.exists()) 1207 if( f.exists())
@@ -1200,13 +1217,19 @@ void AdvancedFm::copyAs()
1200 if (TabWidget->currentPageIndex() == 0) { 1217 if (TabWidget->currentPageIndex() == 0) {
1201 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 1218 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
1202 1219
1203 curFile = currentDir.canonicalPath()+"/"+(*it); 1220 curFile = currentDir.canonicalPath();
1204 QString destFile = *it; 1221 if(curFile.right(1).find("/",0,TRUE) == -1)
1222 curFile +="/";
1223 curFile+=(*it);
1224 QString destFile;
1205 fileDlg->setInputText((const QString &) destFile); 1225 fileDlg->setInputText((const QString &) destFile);
1206 fileDlg->exec(); 1226 fileDlg->exec();
1207 if( fileDlg->result() == 1 ) { 1227 if( fileDlg->result() == 1 ) {
1208 QString filename = fileDlg->LineEdit1->text(); 1228 QString filename = fileDlg->LineEdit1->text();
1209 destFile = currentDir.canonicalPath()+"/"+destFile; 1229 destFile = currentDir.canonicalPath();
1230 if(destFile.right(1).find("/",0,TRUE) == -1)
1231 destFile+="/";
1232 destFile +=(*it);
1210 1233
1211 QFile f(destFile); 1234 QFile f(destFile);
1212 if( f.exists()) 1235 if( f.exists())
@@ -1230,9 +1253,15 @@ void AdvancedFm::move() {
1230 1253
1231 if (TabWidget->currentPageIndex() == 0) { 1254 if (TabWidget->currentPageIndex() == 0) {
1232 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 1255 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
1233 QString destFile = currentRemoteDir.canonicalPath() + "/" + *it; 1256 QString destFile = currentRemoteDir.canonicalPath();
1234 curFile = currentDir.canonicalPath()+"/"+(*it); 1257 if(destFile.right(1).find("/",0,TRUE) == -1)
1258 destFile+="/";
1259 destFile +=(*it);
1260 curFile = currentDir.canonicalPath();
1235 qDebug("Destination file is "+destFile); 1261 qDebug("Destination file is "+destFile);
1262 if(curFile.right(1).find("/",0,TRUE) == -1)
1263 curFile +="/";
1264 curFile+=(*it);
1236 1265
1237 QFile f(destFile); 1266 QFile f(destFile);
1238 if( f.exists()) 1267 if( f.exists())
@@ -1246,9 +1275,15 @@ void AdvancedFm::move() {
1246 TabWidget->setCurrentPage(1); 1275 TabWidget->setCurrentPage(1);
1247 } else { 1276 } else {
1248 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { 1277 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
1249 QString destFile = currentRemoteDir.canonicalPath() + "/" + *it; 1278 QString destFile = currentRemoteDir.canonicalPath();
1279 if(destFile.right(1).find("/",0,TRUE) == -1)
1280 destFile+="/";
1281 destFile +=(*it);
1250 qDebug("Destination file is "+destFile); 1282 qDebug("Destination file is "+destFile);
1251 curFile = currentDir.canonicalPath()+"/"+(*it); 1283 curFile = currentDir.canonicalPath();
1284 if(curFile.right(1).find("/",0,TRUE) == -1)
1285 curFile +="/";
1286 curFile+=(*it);
1252 1287
1253 QFile f(destFile); 1288 QFile f(destFile);
1254 if( f.exists()) 1289 if( f.exists())